merge with 0.30.213

[util-vserver.git] / src / Makefile-files

diff --git a/src/Makefile-files b/src/Makefile-files
index fcbb9e7..05d4809 100644 (file)
--- a/src/Makefile-files
+++ b/src/Makefile-files
@@ -1,4 +1,4 @@
-## $Id: Makefile-files 2385 2006-11-20 00:23:13Z dhozac $  -*- makefile -*-
+## $Id: Makefile-files 2491 2007-02-05 20:59:03Z dhozac $  -*- makefile -*-
 
 ## Copyright (C) 2003,2004 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
 ##  
@@ -18,15 +18,13 @@
 ##  
 
 src_sbin_CXX_PROGS =   
-src_pkglib_CXX_PROGS = src/vbuild
 
-src_pkglib_C99_PROGS = src/vunify src/vcopy
+src_pkglib_C99_PROGS = src/vunify src/vcopy src/vclone
 
 
 AM_INSTALLCHECK_STD_OPTIONS_EXEMPT += \
                        src/parserpmdump \
                        src/showperm \
-                       src/vbuild \
                        src/vcheck \
                        src/vreboot \
                        src/save_ctxinfo \
@@ -78,8 +76,10 @@ DIETPROGS +=         src/chcontext-compat \
                        src/vwait \
                        src/ncontext \
                        src/nattribute \
-                       src/naddress
-
+                       src/naddress \
+                       src/vdevmap \
+                       src/vsysctl \
+                       src/vclone
 
 if ENSC_CAN_BEECRYPT_WITH_DIETLIBC
 DIETPROGS +=           src/vhashify
@@ -116,6 +116,7 @@ pkglib_PROGRAMS +=  src/capchroot \
                        src/vshelper-sync \
                        src/sigexec \
                        src/chbind-compat \
+                       src/vsysctl \
                        $(src_pkglib_C99_X_PROGS) \
                        $(src_pkglib_CXX_X_PROGS)
 
@@ -157,6 +158,7 @@ sbin_PROGRAMS +=    src/exec-cd \
                        src/ncontext \
                        src/nattribute \
                        src/naddress \
+                       src/vdevmap \
                        $(src_sbin_CXX_X_PROGS)
 
 if ENSC_HAVE_C99_COMPILER
@@ -208,7 +210,7 @@ src_reducecap_LDFLAGS               =  $(VSERVER_LDFLGS)
 
 src_vkill_SOURCES              =  src/vkill.c
 src_vkill_LDADD                        =  $(VSERVER_LDADDS)
-src_vkill_LDFLAGS              =  $(VSERVER_LDFLGS)
+src_vkill_LDFLAGS              =  $(VSERVER_LDFLGS) $(LIBINTERNAL)
 src_vkill_CPPFLAGS             =  $(AM_CPPFLAGS) -DLEGACYDIR=\"$(legacydir)\"
 
 src_vlimit_SOURCES             =  src/vlimit.c
@@ -255,8 +257,6 @@ src_vserver_stat_SOURCES    =  src/vserver-stat.c
 src_vserver_stat_LDADD         =  $(LIBINTERNAL) $(VSERVER_LDADDS) $(LIBENSCVECTOR)
 src_vserver_stat_LDFLAGS       =  $(VSERVER_LDFLGS)
 
-src_vbuild_SOURCES              =  src/vbuild.cc src/vutil.cc src/vserver.cc
-
 src_lsxid_SOURCES              =  src/fstool.c src/lsxid.c
 src_lsxid_LDADD                        =  $(LIBINTERNAL) $(VSERVER_LDADDS) $(LIBENSCVECTOR)
 src_lsxid_LDFLAGS              =  $(VSERVER_LDFLGS) 
@@ -328,6 +328,18 @@ src_naddress_SOURCES               = src/naddress.c
 src_naddress_LDADD             = $(VSERVER_LDADDS) $(LIBINTERNAL)
 src_naddress_LDFLAGS           = $(VSERVER_LDFLGS)
 
+src_vdevmap_SOURCES            = src/vdevmap.c
+src_vdevmap_LDADD              = $(VSERVER_LDADDS) $(LIBINTERNAL)
+src_vdevmap_LDFLAGS            = $(VSERVER_LDFLGS)
+
+src_vsysctl_SOURCES            = src/vsysctl.c
+src_vsysctl_LDADD              = $(VSERVER_LDADDS)
+src_vsysctl_LDFLAGS            = $(VSERVER_LDFLGS)
+
+src_vclone_SOURCES             = src/vclone.c
+src_vclone_LDADD               = $(LIBINTERNAL) $(VSERVER_LDADDS)
+src_vclone_LDFLAGS             = $(VSERVER_LDLFGS)
+
 EXTRA_PROGRAMS +=              $(src_sbin_CXX_PROGS) $(src_pkglib_CXX_PROGS)
 
 TESTS_ENVIRONMENT +=           srctestsuitedir=$(top_builddir)/src/testsuite