Add more capabilities

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

diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am
index c099c250cd481e8b72087e496169a2d706b2016c..c02d811190997a878dd1001bcc03ead71ed285b8 100644 (file)
--- a/src/lxc/Makefile.am
+++ b/src/lxc/Makefile.am
@@ -1,4 +1,5 @@
 INCLUDES= -I$(top_srcdir)/src -DLXCPATH="\"$(localstatedir)/lxc\"" -DLXCBINDIR="\"$(bindir)\""
+AM_LDFLAGS= -lutil
 lib_LTLIBRARIES = liblxc.la
 pkginclude_HEADERS = \
                monitor.h \
@@ -18,11 +19,12 @@ liblxc_la_SOURCES = \
        start.c \
        stop.c \
        monitor.c monitor.h \
-       kill.c \
+       console.c \
        freezer.c \
        checkpoint.c \
        restart.c \
        version.c \
+       error.h error.c \
        cgroup.c cgroup.h \
        lxc.h \
        lxc_utils.h \
@@ -36,15 +38,23 @@ liblxc_la_SOURCES = \
        network.c network.h \
         nl.c nl.h \
         rtnl.c rtnl.h \
-        genl.c genl.h
+        genl.c genl.h \
+       \
+       mainloop.c mainloop.h \
+       af_unix.c af_unix.h \
+       \
+       cr_plugin_columbia.c lxc_plugin.h
 
 liblxc_la_LDFLAGS = -release @PACKAGE_VERSION@
 
 bin_SCRIPTS = \
        lxc-ps \
+       lxc-netstat \
+       lxc-ls \
        lxc-checkconfig
 
 bin_PROGRAMS = \
+       lxc-unshare \
        lxc-init \
        lxc-create \
        lxc-destroy \
@@ -54,7 +64,6 @@ bin_PROGRAMS = \
        lxc-monitor \
        lxc-wait \
        lxc-console \
-       lxc-kill \
        lxc-freeze \
        lxc-info \
        lxc-cgroup \
@@ -63,6 +72,9 @@ bin_PROGRAMS = \
        lxc-restart \
        lxc-version
 
+lxc_unshare_SOURCES = lxc_unshare.c
+lxc_unshare_LDADD = liblxc.la
+
 lxc_init_SOURCES = lxc_init.c
 lxc_init_LDADD = liblxc.la
 
@@ -93,9 +105,6 @@ lxc_console_LDADD = liblxc.la
 lxc_info_SOURCES = lxc_info.c
 lxc_info_LDADD = liblxc.la
 
-lxc_kill_SOURCES = lxc_kill.c
-lxc_kill_LDADD = liblxc.la
-
 lxc_freeze_SOURCES = lxc_freeze.c
 lxc_freeze_LDADD = liblxc.la
 
@@ -116,12 +125,30 @@ lxc_version_LDADD = liblxc.la
 
 install-exec-local:
        -@export PATH=$$PATH:/sbin:/usr/sbin && \
-        setcap cap_setpcap,cap_net_admin,cap_net_raw,cap_sys_admin,cap_dac_override=ep $(bindir)/lxc-execute && \
-       setcap cap_setpcap,cap_net_admin,cap_net_raw,cap_sys_admin,cap_dac_override=ep $(bindir)/lxc-start && \
-       setcap cap_net_admin,cap_net_raw,cap_sys_admin,cap_dac_override=ep $(bindir)/lxc-restart && \
-       setcap cap_sys_admin=ep $(bindir)/lxc-init && \
-       mkdir -p $(prefix)/var/lxc && \
-       chmod ugo+rw $(prefix)/var/lxc || \
+        mkdir -p $(localstatedir) && \
+               \
+        setcap cap_sys_admin=ep $(bindir)/lxc-create && \
+               \
+        setcap cap_sys_chroot,cap_setpcap,cap_net_admin,cap_net_raw,cap_sys_admin,cap_dac_override=ep \
+               $(bindir)/lxc-execute && \
+               \
+        setcap cap_sys_chroot,cap_setpcap,cap_net_admin,cap_net_raw,cap_sys_admin,cap_dac_override=ep \
+               $(bindir)/lxc-start && \
+               \
+        setcap cap_net_admin,cap_net_raw,cap_sys_admin,cap_dac_override=ep \
+               $(bindir)/lxc-restart && \
+               \
+        setcap cap_net_admin,cap_net_raw,cap_sys_admin,cap_dac_override=ep \
+               $(bindir)/lxc-unshare && \
+               \
+        setcap cap_sys_admin=ep \
+               $(bindir)/lxc-init && \
+               \
+        setcap cap_sys_admin=ep \
+               $(bindir)/lxc-netstat && \
+               \
+        mkdir -p $(prefix)/var/lxc && \
+        chmod ugo+rw $(prefix)/var/lxc || \
        (echo && echo && \
         echo "*****************************************************************" && \
         echo "*                                                               *" && \