use config.h to define the lxcpath and co

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

diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am
index eea1c79b3a0d8b45ed8c9d21dd08e535f113b2d0..0e5fa24be175dc95c58bc05bdc48e690bab7389a 100644 (file)
--- a/src/lxc/Makefile.am
+++ b/src/lxc/Makefile.am
@@ -1,9 +1,9 @@
-INCLUDES= -I$(top_srcdir)/src -DLXCPATH="\"$(localstatedir)/lxc\"" \
-         -DLXCBINDIR="\"$(bindir)\"" \
-         -DLXCLIBEXECDIR="\"$(libexecdir)\""
-AM_LDFLAGS= -lutil
+AM_CFLAGS= -I$(top_srcdir)/src
+
 lib_LTLIBRARIES = liblxc.la
 pkginclude_HEADERS = \
+               start.h \
+               error.h \
                monitor.h \
                utils.h \
                namespace.h \
@@ -11,12 +11,14 @@ pkginclude_HEADERS = \
                lxc.h \
                cgroup.h \
                conf.h \
-               lxc_list.h \
-               lxc_log.h \
-               lxc_state.h
+               list.h \
+               log.h \
+               state.h
 
 
 liblxc_la_SOURCES = \
+       arguments.c arguments.h \
+       commands.c commands.h \
        create.c \
        destroy.c \
        start.c \
@@ -26,18 +28,18 @@ liblxc_la_SOURCES = \
        freezer.c \
        checkpoint.c \
        restart.c \
-       version.c \
        error.h error.c \
        parse.c parse.h \
        cgroup.c cgroup.h \
        lxc.h \
-       lxc_utils.h \
+       utils.c utils.h \
        lock.c lock.h \
-       namespace.h \
+       namespace.h namespace.c \
        conf.c conf.h \
-       lxc_list.h \
-       lxc_state.c lxc_state.h \
-       lxc_log.c lxc_log.h \
+       confile.c confile.h \
+       list.h \
+       state.c state.h \
+       log.c log.h \
        \
        network.c network.h \
         nl.c nl.h \
@@ -50,13 +52,15 @@ liblxc_la_SOURCES = \
        cr_plugin_columbia.c lxc_plugin.h
 
 liblxc_la_LDFLAGS = -release @PACKAGE_VERSION@
+liblxc_la_LIBADD = -lutil
 
 bin_SCRIPTS = \
        lxc-ps \
        lxc-netstat \
        lxc-ls \
        lxc-checkconfig \
-       lxc-setcap
+       lxc-setcap \
+       lxc-version
 
 bin_PROGRAMS = \
        lxc-unshare \
@@ -73,8 +77,7 @@ bin_PROGRAMS = \
        lxc-cgroup \
        lxc-unfreeze \
        lxc-checkpoint \
-       lxc-restart \
-       lxc-version
+       lxc-restart
 
 libexec_PROGRAMS = \
        lxc-init
@@ -85,7 +88,7 @@ lxc_unshare_LDADD = liblxc.la
 lxc_init_SOURCES = lxc_init.c
 lxc_init_LDADD = liblxc.la
 
-lxc_create_SOURCES = lxc_create.c lxc_config.c lxc_config.h
+lxc_create_SOURCES = lxc_create.c
 lxc_create_LDADD = liblxc.la
 
 lxc_destroy_SOURCES = lxc_destroy.c
@@ -97,7 +100,7 @@ lxc_start_LDADD = liblxc.la
 lxc_stop_SOURCES = lxc_stop.c
 lxc_stop_LDADD = liblxc.la
 
-lxc_execute_SOURCES = lxc_execute.c lxc_config.c lxc_config.h
+lxc_execute_SOURCES = lxc_execute.c
 lxc_execute_LDADD = liblxc.la
 
 lxc_monitor_SOURCES = lxc_monitor.c
@@ -126,10 +129,3 @@ lxc_checkpoint_LDADD = liblxc.la
 
 lxc_restart_SOURCES = lxc_restart.c
 lxc_restart_LDADD = liblxc.la
-
-lxc_version_SOURCES = lxc_version.c
-lxc_version_LDADD = liblxc.la
-
-install-exec-local:
-       @mkdir -p $(localstatedir) && mkdir -p $(prefix)/var/lxc && \
-       chmod ugo+rw $(prefix)/var/lxc