X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile.am;h=7e13419d73795f31a11f6d286569c540513f887d;hb=f32150a8d8f040c1bad1fb98833bb6e0f45ea298;hp=32d01931005147841e2052fe7e75b5d9204afb77;hpb=73929cd988b29cc673ff12945fc921957bd3ce78;p=util-vserver-pl.git

diff --git a/Makefile.am b/Makefile.am
index 32d0193..7e13419 100644
--- 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 
 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,10 +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
-
-noinst_HEADERS =		src/planetlab.h
+src_vsh_SOURCES =		src/vsh.c
 
 man_MANS =			man/vsh.8
 
@@ -40,20 +37,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_SCRIPTS =			sysv/vip6-autod
+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