Joined lxc and liblxc directories

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

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 <dlezcano@fr.ibm.com>

src/Makefile.am

-SUBDIRS = liblxc lxc 
+SUBDIRS = lxc 

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

test/Makefile.am

-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

test/conf.c

@@ -27,8 +27,8 @@
 #include <netinet/in.h>
 #include <net/if.h>
 
-#include <lxc_list.h>
-#include <lxc_conf.h>
+#include <lxc/lxc_list.h>
+#include <lxc/lxc_conf.h>
 
 /*
  * I want to setup a container with a veth attached on a bridge, 

test/confile.c

@@ -30,9 +30,8 @@
 #include <netinet/in.h>
 #include <net/if.h>
 
-#include <lxc.h>
-
-#include "../src/lxc/lxc_config.h"
+#include <lxc/lxc.h>
+#include <lxc/lxc_config.h>
 
 static void usage(const char *cmd)
 {

test/dev.c

@@ -28,7 +28,7 @@
 #include <sys/socket.h>
 #include <sys/types.h>
 
-#include <network.h>
+#include <lxc/network.h>
 
 void usage(char *cmd)
 {

test/forward.c

@@ -27,7 +27,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
-#include <network.h>
+#include <lxc/network.h>
 
 void usage(const char *cmd)
 {

test/ipv4_add.c

@@ -27,7 +27,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
-#include <network.h>
+#include <lxc/network.h>
 
 void usage(char *cmd)
 {

test/ipv6_add.c

@@ -27,7 +27,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
-#include <network.h>
+#include <lxc/network.h>
 
 void usage(char *cmd)
 {

test/lxc_create.c

@@ -30,7 +30,7 @@
 #include <netinet/in.h>
 #include <net/if.h>
 
-#include <lxc.h>
+#include <lxc/lxc.h>
 
 static void usage(const char *cmd)
 {

test/lxc_destroy.c

@@ -22,7 +22,8 @@
  */
 #include <stdio.h>
 #include <unistd.h>
-#include <lxc.h>
+
+#include <lxc/lxc.h>
 
 static void usage(const char *cmd)
 {

test/lxc_low_monitor.c

@@ -25,7 +25,7 @@
 #include <string.h>
 #include <libgen.h>
 
-#include <lxc.h>
+#include <lxc/lxc.h>
 
 void usage(char *cmd)
 {

test/lxc_monitor.c

@@ -25,7 +25,7 @@
 #include <string.h>
 #include <libgen.h>
 
-#include <lxc.h>
+#include <lxc/lxc.h>
 
 void usage(char *cmd)
 {

test/lxc_start.c

@@ -33,7 +33,7 @@
 #include <netinet/in.h>
 #include <net/if.h>
 
-#include <lxc.h>
+#include <lxc/lxc.h>
 
 void usage(char *cmd)
 {

test/lxc_state.c

@@ -25,7 +25,7 @@
 #include <string.h>
 #include <libgen.h>
 
-#include <lxc.h>
+#include <lxc/lxc.h>
 
 void usage(char *cmd)
 {

test/lxc_stop.c

@@ -25,7 +25,7 @@
 #include <string.h>
 #include <libgen.h>
 
-#include <lxc.h>
+#include <lxc/lxc.h>
 
 void usage(char *cmd)
 {

test/macvlan.c

@@ -27,7 +27,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
-#include <network.h>
+#include <lxc/network.h>
 
 void usage(const char *cmd)
 {

test/movedev.c

@@ -26,7 +26,7 @@
 #include <sys/socket.h>
 #include <sys/types.h>
 
-#include <network.h>
+#include <lxc/network.h>
 
 void usage(const char *cmd)
 {

test/proxy.c

@@ -27,7 +27,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
-#include <network.h>
+#include <lxc/network.h>
 
 void usage(const char *cmd)
 {

test/tst_list.c

 #include <stdio.h>
 #include <string.h>
-#include <lxc_list.h>
+#include <lxc/lxc_list.h>
 
 int main(int argc, char *argv[])
 {

test/veth.c

@@ -27,7 +27,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
-#include <network.h>
+#include <lxc/network.h>
 
 void usage(const char *cmd)
 {