merge trellis branch to trunk.

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

diff --git a/Makefile.am b/Makefile.am
index bcc0c23..4cb1e63 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -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/netns.c
-src_vsh_LDADD =                        -lvserver
+src_vsh_SOURCES =              src/vsh.c
 
 noinst_HEADERS =               src/planetlab.h
 
@@ -43,7 +42,8 @@ sbin_SCRIPTS =                        python/bwlimit \
                                scripts/vuseradd \
                                scripts/vuserdel
 
-sbin_PROGRAMS =                        src/vsh
+sbin_PROGRAMS =                        src/vsh 
+
 sysv_SCRIPTS =                 
 
 if ENSC_HAVE_LIBNL