From 96f3e4ebd4c232776e35ae85a88f25b206e280af Mon Sep 17 00:00:00 2001 From: dlezcano Date: Thu, 4 Sep 2008 08:14:59 +0000 Subject: [PATCH] Joined lxc and liblxc directories --- configure.in | 1 - lxc.spec.in | 2 -- src/Makefile.am | 2 +- src/lxc/Makefile.am | 36 ++++++++++++------------------------ test/Makefile.am | 39 +++++++++++++++++++-------------------- test/conf.c | 4 ++-- test/confile.c | 5 ++--- test/dev.c | 2 +- test/forward.c | 2 +- test/ipv4_add.c | 2 +- test/ipv6_add.c | 2 +- test/lxc_create.c | 2 +- test/lxc_destroy.c | 3 ++- test/lxc_low_monitor.c | 2 +- test/lxc_monitor.c | 2 +- test/lxc_start.c | 2 +- test/lxc_state.c | 2 +- test/lxc_stop.c | 2 +- test/macvlan.c | 2 +- test/movedev.c | 2 +- test/proxy.c | 2 +- test/tst_list.c | 2 +- test/veth.c | 2 +- 23 files changed, 53 insertions(+), 69 deletions(-) diff --git a/configure.in b/configure.in index 078d9ea8e..655b97d62 100644 --- a/configure.in +++ b/configure.in @@ -24,7 +24,6 @@ AC_CONFIG_FILES([ lxc.spec config/Makefile src/Makefile - src/liblxc/Makefile src/lxc/Makefile src/lxc/lxc-ps etc/Makefile diff --git a/lxc.spec.in b/lxc.spec.in index 773f73112..dd6a5be71 100644 --- a/lxc.spec.in +++ b/lxc.spec.in @@ -91,8 +91,6 @@ rm -rf %{buildroot} %{_libdir}/*.a %post devel -ln -sf %{_includedir}/%{name} %{_includedir}/liblxc - %changelog * Sun Aug 3 2008 Daniel Lezcano diff --git a/src/Makefile.am b/src/Makefile.am index f762d9930..7dd344abc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1 +1 @@ -SUBDIRS = liblxc lxc +SUBDIRS = lxc diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am index a38c64d7a..c91057313 100644 --- a/src/lxc/Makefile.am +++ b/src/lxc/Makefile.am @@ -56,49 +56,37 @@ bin_PROGRAMS = \ lxc-priority lxc_create_SOURCES = lxc_create.c lxc_config.c lxc_config.h -lxc_create_LDADD = \ - $(top_builddir)/src/lxc/liblxc.la +lxc_create_LDADD = liblxc.la lxc_destroy_SOURCES = lxc_destroy.c -lxc_destroy_LDADD = \ - $(top_builddir)/src/lxc/liblxc.la +lxc_destroy_LDADD = liblxc.la lxc_start_SOURCES = lxc_start.c -lxc_start_LDADD = \ - $(top_builddir)/src/lxc/liblxc.la +lxc_start_LDADD = liblxc.la lxc_stop_SOURCES = lxc_stop.c -lxc_stop_LDADD = \ - $(top_builddir)/src/lxc/liblxc.la +lxc_stop_LDADD = liblxc.la lxc_execute_SOURCES = lxc_execute.c -lxc_execute_LDADD = \ - $(top_builddir)/src/lxc/liblxc.la +lxc_execute_LDADD = liblxc.la lxc_monitor_SOURCES = lxc_monitor.c -lxc_monitor_LDADD = \ - $(top_builddir)/src/lxc/liblxc.la +lxc_monitor_LDADD = liblxc.la lxc_console_SOURCES = lxc_console.c -lxc_console_LDADD = \ - $(top_builddir)/src/lxc/liblxc.la +lxc_console_LDADD = liblxc.la lxc_info_SOURCES = lxc_info.c -lxc_info_LDADD = \ - $(top_builddir)/src/lxc/liblxc.la +lxc_info_LDADD = liblxc.la lxc_kill_SOURCES = lxc_kill.c -lxc_kill_LDADD = \ - $(top_builddir)/src/lxc/liblxc.la +lxc_kill_LDADD = liblxc.la lxc_freeze_SOURCES = lxc_freeze.c -lxc_freeze_LDADD = \ - $(top_builddir)/src/lxc/liblxc.la +lxc_freeze_LDADD = liblxc.la lxc_unfreeze_SOURCES = lxc_unfreeze.c -lxc_unfreeze_LDADD = \ - $(top_builddir)/src/lxc/liblxc.la +lxc_unfreeze_LDADD = liblxc.la lxc_priority_SOURCES = lxc_priority.c -lxc_priority_LDADD = \ - $(top_builddir)/src/lxc/liblxc.la +lxc_priority_LDADD = liblxc.la diff --git a/test/Makefile.am b/test/Makefile.am index 8fc922054..e6188db9c 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES= -I$(top_srcdir)/src/liblxc -I$(top_srcdir)/src +INCLUDES= -I$(top_srcdir)/src noinst_PROGRAMS = \ tst_list \ @@ -21,76 +21,75 @@ noinst_PROGRAMS = \ lxc_low_monitor \ lxc_state - tst_list_SOURCES = tst_list.c tst_list_LDADD = \ - $(top_builddir)/src/liblxc/liblxc.la + $(top_builddir)/src/lxc/liblxc.la confile_SOURCES = confile.c confile_LDADD = \ $(top_builddir)/src/lxc/lxc_config.o \ - $(top_builddir)/src/liblxc/liblxc.la + $(top_builddir)/src/lxc/liblxc.la conf_SOURCES = conf.c conf_LDADD = \ - $(top_builddir)/src/liblxc/liblxc.la + $(top_builddir)/src/lxc/liblxc.la movedev_SOURCES = movedev.c movedev_LDADD = \ - $(top_builddir)/src/liblxc/liblxc.la + $(top_builddir)/src/lxc/liblxc.la dev_SOURCES = dev.c dev_LDADD = \ - $(top_builddir)/src/liblxc/liblxc.la + $(top_builddir)/src/lxc/liblxc.la forward_SOURCES = forward.c forward_LDADD = \ - $(top_builddir)/src/liblxc/liblxc.la + $(top_builddir)/src/lxc/liblxc.la proxy_SOURCES = proxy.c proxy_LDADD = \ - $(top_builddir)/src/liblxc/liblxc.la + $(top_builddir)/src/lxc/liblxc.la veth_SOURCES = veth.c veth_LDADD = \ - $(top_builddir)/src/liblxc/liblxc.la + $(top_builddir)/src/lxc/liblxc.la macvlan_SOURCES = macvlan.c macvlan_LDADD = \ - $(top_builddir)/src/liblxc/liblxc.la + $(top_builddir)/src/lxc/liblxc.la ipv4_add_SOURCES = ipv4_add.c ipv4_add_LDADD = \ - $(top_builddir)/src/liblxc/liblxc.la + $(top_builddir)/src/lxc/liblxc.la ipv6_add_SOURCES = ipv6_add.c ipv6_add_LDADD = \ - $(top_builddir)/src/liblxc/liblxc.la + $(top_builddir)/src/lxc/liblxc.la lxc_create_SOURCES = lxc_create.c lxc_create_LDADD = \ - $(top_builddir)/src/liblxc/liblxc.la + $(top_builddir)/src/lxc/liblxc.la lxc_destroy_SOURCES = lxc_destroy.c lxc_destroy_LDADD = \ - $(top_builddir)/src/liblxc/liblxc.la + $(top_builddir)/src/lxc/liblxc.la lxc_start_SOURCES = lxc_start.c lxc_start_LDADD = \ - $(top_builddir)/src/liblxc/liblxc.la + $(top_builddir)/src/lxc/liblxc.la lxc_stop_SOURCES = lxc_stop.c lxc_stop_LDADD = \ - $(top_builddir)/src/liblxc/liblxc.la + $(top_builddir)/src/lxc/liblxc.la lxc_monitor_SOURCES = lxc_monitor.c lxc_monitor_LDADD = \ - $(top_builddir)/src/liblxc/liblxc.la + $(top_builddir)/src/lxc/liblxc.la lxc_low_monitor_SOURCES = lxc_low_monitor.c lxc_low_monitor_LDADD = \ - $(top_builddir)/src/liblxc/liblxc.la + $(top_builddir)/src/lxc/liblxc.la lxc_state_SOURCES = lxc_state.c lxc_state_LDADD = \ - $(top_builddir)/src/liblxc/liblxc.la + $(top_builddir)/src/lxc/liblxc.la diff --git a/test/conf.c b/test/conf.c index ac1f929ba..441e3413c 100644 --- a/test/conf.c +++ b/test/conf.c @@ -27,8 +27,8 @@ #include #include -#include -#include +#include +#include /* * I want to setup a container with a veth attached on a bridge, diff --git a/test/confile.c b/test/confile.c index 34f597b0d..af82bf99d 100644 --- a/test/confile.c +++ b/test/confile.c @@ -30,9 +30,8 @@ #include #include -#include - -#include "../src/lxc/lxc_config.h" +#include +#include static void usage(const char *cmd) { diff --git a/test/dev.c b/test/dev.c index b56328841..82752369c 100644 --- a/test/dev.c +++ b/test/dev.c @@ -28,7 +28,7 @@ #include #include -#include +#include void usage(char *cmd) { diff --git a/test/forward.c b/test/forward.c index a14336105..81fead528 100644 --- a/test/forward.c +++ b/test/forward.c @@ -27,7 +27,7 @@ #include #include -#include +#include void usage(const char *cmd) { diff --git a/test/ipv4_add.c b/test/ipv4_add.c index 402f55655..bcd0cf9d4 100644 --- a/test/ipv4_add.c +++ b/test/ipv4_add.c @@ -27,7 +27,7 @@ #include #include -#include +#include void usage(char *cmd) { diff --git a/test/ipv6_add.c b/test/ipv6_add.c index d68b5f536..20fc098c9 100644 --- a/test/ipv6_add.c +++ b/test/ipv6_add.c @@ -27,7 +27,7 @@ #include #include -#include +#include void usage(char *cmd) { diff --git a/test/lxc_create.c b/test/lxc_create.c index 36761538e..6d156dd61 100644 --- a/test/lxc_create.c +++ b/test/lxc_create.c @@ -30,7 +30,7 @@ #include #include -#include +#include static void usage(const char *cmd) { diff --git a/test/lxc_destroy.c b/test/lxc_destroy.c index a652f9ea3..a15ec02f9 100644 --- a/test/lxc_destroy.c +++ b/test/lxc_destroy.c @@ -22,7 +22,8 @@ */ #include #include -#include + +#include static void usage(const char *cmd) { diff --git a/test/lxc_low_monitor.c b/test/lxc_low_monitor.c index 41db55338..02267d5ac 100644 --- a/test/lxc_low_monitor.c +++ b/test/lxc_low_monitor.c @@ -25,7 +25,7 @@ #include #include -#include +#include void usage(char *cmd) { diff --git a/test/lxc_monitor.c b/test/lxc_monitor.c index 41e35b832..a5a3f4a71 100644 --- a/test/lxc_monitor.c +++ b/test/lxc_monitor.c @@ -25,7 +25,7 @@ #include #include -#include +#include void usage(char *cmd) { diff --git a/test/lxc_start.c b/test/lxc_start.c index d1f2e93fc..5159192a4 100644 --- a/test/lxc_start.c +++ b/test/lxc_start.c @@ -33,7 +33,7 @@ #include #include -#include +#include void usage(char *cmd) { diff --git a/test/lxc_state.c b/test/lxc_state.c index a412bc9c1..017cdcc43 100644 --- a/test/lxc_state.c +++ b/test/lxc_state.c @@ -25,7 +25,7 @@ #include #include -#include +#include void usage(char *cmd) { diff --git a/test/lxc_stop.c b/test/lxc_stop.c index f38e9efc0..44bbd0f1b 100644 --- a/test/lxc_stop.c +++ b/test/lxc_stop.c @@ -25,7 +25,7 @@ #include #include -#include +#include void usage(char *cmd) { diff --git a/test/macvlan.c b/test/macvlan.c index a29a68741..4401d4f36 100644 --- a/test/macvlan.c +++ b/test/macvlan.c @@ -27,7 +27,7 @@ #include #include -#include +#include void usage(const char *cmd) { diff --git a/test/movedev.c b/test/movedev.c index 662eba017..592434a12 100644 --- a/test/movedev.c +++ b/test/movedev.c @@ -26,7 +26,7 @@ #include #include -#include +#include void usage(const char *cmd) { diff --git a/test/proxy.c b/test/proxy.c index fbd4f2d4f..f82f492c2 100644 --- a/test/proxy.c +++ b/test/proxy.c @@ -27,7 +27,7 @@ #include #include -#include +#include void usage(const char *cmd) { diff --git a/test/tst_list.c b/test/tst_list.c index 7bd8c58ab..933b692bb 100644 --- a/test/tst_list.c +++ b/test/tst_list.c @@ -1,6 +1,6 @@ #include #include -#include +#include int main(int argc, char *argv[]) { diff --git a/test/veth.c b/test/veth.c index 0ada151b5..58a784c4d 100644 --- a/test/veth.c +++ b/test/veth.c @@ -27,7 +27,7 @@ #include #include -#include +#include void usage(const char *cmd) {