merge rev17211 (Need to print the exception string as part of the self.log, or else...

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

diff --git a/Makefile.am b/Makefile.am
index b5b55db..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 
+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,6 +25,8 @@ 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
+
 noinst_HEADERS =               src/planetlab.h
 
 man_MANS =                     man/vsh.8
@@ -38,10 +40,9 @@ pyexec_DATA =                        python/vserver.py \
 sbin_SCRIPTS =                 python/bwlimit \
                                python/disklimit \
                                scripts/vuseradd \
-                               scripts/vuserdel \
-                               scripts/vsh
+                               scripts/vuserdel
 
-sbin_PROGRAMS =                        
+sbin_PROGRAMS =                        src/vsh 
 
 sysv_SCRIPTS =