X-Git-Url: http://git.onelab.eu/?p=util-vserver-pl.git;a=blobdiff_plain;f=Makefile.am;h=d4f6f50b2e95477cb50f375d1d75a58d7f548a33;hp=950d4895fcf1908145afd29dac93f19e80780021;hb=HEAD;hpb=8031466ca085072b4bae958ddba3c422d80b1ffc

diff --git a/Makefile.am b/Makefile.am
index 950d489..d4f6f50 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,3 @@
-## $Id$
-
 # Copyright (C) 2003,2004,2005,2006 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
 #  
 # This program is free software; you can redistribute it and/or modify
@@ -17,7 +15,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,31 +23,28 @@ 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
 
 pyexec_LTLIBRARIES =		python/vserverimpl.la
 
 pyexec_DATA =			python/vserver.py \
-				python/bwlimit.py \
 				python/cpulimit.py
 
-sbin_SCRIPTS =			python/bwlimit \
-				python/disklimit \
+sbin_SCRIPTS =			python/disklimit \
 				scripts/vuseradd \
 				scripts/vuserdel
 
-#sbin_PROGRAMS =			src/vip6-autod \
-#				src/vsh
-sbin_PROGRAMS =			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
 
 logrotatedir =			$(sysconfdir)/logrotate.d