Joined liblxc and lxc directory

[mirror_lxc.git] / src / lxc / Makefile.am

diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am
index 5a7c481f0b413b2fe2af2d7d8e26b5946cf581aa..a38c64d7a0d1740b1372615a708d940476adbf56 100644 (file)
--- a/src/lxc/Makefile.am
+++ b/src/lxc/Makefile.am
@@ -1,4 +1,42 @@
-INCLUDES= -I$(top_srcdir)/src/liblxc -I$(top_srcdir)/src
+INCLUDES= -I$(top_srcdir)/src
+
+lib_LTLIBRARIES = liblxc.la
+pkginclude_HEADERS = \
+               lxc.h \
+               lxc_cgroup.h \
+               lxc_conf.h \
+               lxc_list.h \
+               lxc_lock.h \
+               lxc_log.h \
+               lxc_namespace.h \
+               lxc_state.h \
+               lxc_utils.h
+
+liblxc_la_SOURCES = \
+       create.c \
+       destroy.c \
+       start.c \
+       stop.c \
+       execute.c \
+       monitor.c monitor.h \
+       kill.c \
+       freezer.c \
+       lxc_cgroup.c lxc_cgroup.h \
+       lxc.h \
+       lxc_utils.h \
+       lxc_lock.c lxc_lock.h \
+       lxc_namespace.h \
+       lxc_conf.c lxc_conf.h \
+       lxc_list.h \
+       lxc_state.c lxc_state.h \
+       lxc_log.c lxc_log.h \
+       \
+       network.c network.h \
+        nl.c nl.h \
+        rtnl.c rtnl.h \
+        genl.c genl.h
+
+liblxc_la_LDFLAGS = -release @PACKAGE_VERSION@
 
 bin_SCRIPTS = \
        lxc-ps
@@ -11,56 +49,56 @@ bin_PROGRAMS = \
        lxc-execute \
        lxc-monitor \
        lxc-console \
-       lxc-state \
        lxc-kill \
        lxc-freeze \
+       lxc-info \
        lxc-unfreeze \
        lxc-priority
 
 lxc_create_SOURCES = lxc_create.c lxc_config.c lxc_config.h
 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_execute_SOURCES = lxc_execute.c
 lxc_execute_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_console_SOURCES = lxc_console.c
 lxc_console_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
+lxc_info_SOURCES = lxc_info.c
+lxc_info_LDADD = \
+       $(top_builddir)/src/lxc/liblxc.la
 
 lxc_kill_SOURCES = lxc_kill.c
 lxc_kill_LDADD = \
-        $(top_builddir)/src/liblxc/liblxc.la
+        $(top_builddir)/src/lxc/liblxc.la
 
 lxc_freeze_SOURCES = lxc_freeze.c
 lxc_freeze_LDADD = \
-        $(top_builddir)/src/liblxc/liblxc.la
+        $(top_builddir)/src/lxc/liblxc.la
 
 lxc_unfreeze_SOURCES = lxc_unfreeze.c
 lxc_unfreeze_LDADD = \
-        $(top_builddir)/src/liblxc/liblxc.la
+        $(top_builddir)/src/lxc/liblxc.la
 
 lxc_priority_SOURCES = lxc_priority.c
 lxc_priority_LDADD = \
-        $(top_builddir)/src/liblxc/liblxc.la
+        $(top_builddir)/src/lxc/liblxc.la