Setting tag util-vserver-pl-0.4-15

[util-vserver-pl.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 32d0193..4cb1e63 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #  
 
-python_vserverimpl_la_SOURCES =        python/vserverimpl.c src/planetlab.c
+python_vserverimpl_la_SOURCES =        python/vserverimpl.c src/planetlab.c src/netns.c
 python_vserverimpl_la_LIBADD = -lvserver
 python_vserverimpl_la_CFLAGS = -Wno-redundant-decls -I$(top_srcdir)/src $(PYTHON_INCLUDES)
 python_vserverimpl_la_LDFLAGS =        -module -avoid-version
@@ -25,8 +25,7 @@ python_vserverimpl_la_LDFLAGS =       -module -avoid-version
 src_vip6_autod_SOURCES =       src/vip6-autod.c
 src_vip6_autod_LDADD =         -lvserver -lnl
 
-src_vsh_SOURCES =              src/vsh.c src/planetlab.c
-src_vsh_LDADD =                        -lvserver
+src_vsh_SOURCES =              src/vsh.c
 
 noinst_HEADERS =               src/planetlab.h
 
@@ -40,20 +39,21 @@ pyexec_DATA =                       python/vserver.py \
 
 sbin_SCRIPTS =                 python/bwlimit \
                                python/disklimit \
-                               scripts/vcached \
                                scripts/vuseradd \
                                scripts/vuserdel
 
-sbin_PROGRAMS =                        src/vip6-autod \
-                               src/vsh
+sbin_PROGRAMS =                        src/vsh 
 
-sysv_SCRIPTS =                 sysv/vip6-autod
+sysv_SCRIPTS =                 
+
+if ENSC_HAVE_LIBNL
+sbin_PROGRAMS +=               src/vip6-autod
+sysv_SCRIPTS +=                        sysv/vip6-autod
+endif
 
 crondir =                      $(sysconfdir)/cron.d
-cron_DATA =                    scripts/vcached.cron
 
 logrotatedir =                 $(sysconfdir)/logrotate.d
-logrotate_DATA =               scripts/vcached.logrotate
 
 install-data-hook: install-fix-script-paths