X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile.am;h=4cb1e6354dec5f739fdb20cab42bdfd80aef036d;hb=289a5b5d7a75dcef7f4cc6ef1ee258e3938311ea;hp=b06f63d58cd5fac5ea8200734f6d851bb8099b88;hpb=64f6ac4e0d88a99c687249d3d7d923f6e2d3f4a8;p=util-vserver-pl.git

diff --git a/Makefile.am b/Makefile.am
index b06f63d..4cb1e63 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 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
 
@@ -43,10 +42,14 @@ sbin_SCRIPTS =			python/bwlimit \
 				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