cleanups; use sys_clone()
[util-vserver.git] / util-vserver / src / Makefile-files
index 940f747..ee136a9 100644 (file)
@@ -1,6 +1,6 @@
 ## $Id$  -*- makefile -*-
 
-## Copyright (C) 2003 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
+## Copyright (C) 2003,2004 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
 ##  
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 ##  
 
-src_sbin_CXX_X_PROGS   =  src/vfiles
-src_pkglib_CXX_X_PROGS =  src/vunify src/vbuild src/vcheck
+src_sbin_CXX_PROGS =   src/vfiles
+src_pkglib_CXX_PROGS = src/vbuild src/vcheck
+
+src_pkglib_C99_PROGS = src/vunify
+
 
 src_OPTIONS_EXEMPT     =  src/parserpmdump \
                           src/readlink \
@@ -27,7 +30,6 @@ src_OPTIONS_EXEMPT    =  src/parserpmdump \
                           src/vcheck \
                           src/vreboot \
                           src/save_ctxinfo \
-                          src/vunify \
                           src/mask2prefix \
                           src/pipe-sync \
                           src/capchroot \
@@ -35,7 +37,6 @@ src_OPTIONS_EXEMPT    =  src/parserpmdump \
                           src/filetime \
                           src/ifspec \
                           src/chbind \
-                          src/chcontext \
                           src/rebootmgr \
                           src/reducecap \
                           src/vlimit \
@@ -46,6 +47,7 @@ src_OPTIONS_EXEMPT    =  src/parserpmdump \
 
 
 src_DIETPROGS =                src/new-namespace \
+                       src/chcontext \
                        src/secure-mount \
                        src/save_ctxinfo \
                        src/mask2prefix \
@@ -55,45 +57,51 @@ src_DIETPROGS =             src/new-namespace \
                        src/fakerunlevel \
                        src/pipe-sync \
                        src/exec-ulimit \
+                       src/vps \
                        src/lsxid \
                        src/chxid \
                        src/showattr \
                        src/setattr \
                        src/vlimit \
                        src/vunify \
+                       src/vuname \
                        src/rpm-fake-resolver \
                        src/vkill \
+                       src/vrsetup \
                        src/vserver-stat \
                        src/vserver-info
 
 src_HDRS =             src/vutil.h src/vutil.p src/util.h \
-                       src/wrappers.h src/wrappers-vserver.h \
+                       src/fstool.h \
                        src/compat-pivot_root.h \
                        src/stack-start.h \
                        src/vunify-matchlist.h \
-                       src/vunify-operations.h \
-                       src/wrappers-dirent.h \
+                       src/vunify.h \
+                       src/vunify-compare.hc \
+                       src/vunify-doit.hc \
+                       src/vunify-init.hc \
                        src/vserver.hh
 
 src_pkglib_SCRPTS =
-src_pkglib_PRGS                =  src/capchroot \
-                          src/chroot-cat \
-                          src/chroot-rm \
-                          src/fakerunlevel \
-                          src/filetime \
-                          src/ifspec \
-                          src/listdevip \
-                          src/parserpmdump \
-                          src/readlink \
-                          src/showperm \
-                          src/vreboot \
-                          src/save_ctxinfo \
-                          src/secure-mount \
-                          src/mask2prefix \
-                          src/pipe-sync \
-                          src/exec-ulimit \
-                          src/rpm-fake-resolver \
-                          $(src_pkglib_CXX_PROGS)
+src_pkglib_PRGS =      src/capchroot \
+                       src/chroot-cat \
+                       src/chroot-rm \
+                       src/fakerunlevel \
+                       src/filetime \
+                       src/ifspec \
+                       src/listdevip \
+                       src/parserpmdump \
+                       src/readlink \
+                       src/showperm \
+                       src/vreboot \
+                       src/save_ctxinfo \
+                       src/secure-mount \
+                       src/mask2prefix \
+                       src/pipe-sync \
+                       src/exec-ulimit \
+                       src/rpm-fake-resolver \
+                       $(src_pkglib_C99_X_PROGS) \
+                       $(src_pkglib_CXX_X_PROGS)
 
 src_pkglib_LTLIBS      =  src/rpm-fake.la
 src_lib_LTLIBS         =
@@ -104,6 +112,7 @@ src_sbin_PRGS =             src/chbind \
                        src/exec-cd \
                        src/lsxid \
                        src/chxid \
+                       src/vps \
                        src/showattr \
                        src/setattr \
                        src/rebootmgr \
@@ -112,9 +121,11 @@ src_sbin_PRGS =            src/chbind \
                        src/new-namespace \
                        src/vlimit \
                        src/vkill \
+                       src/vrsetup \
                        src/vserver-stat \
                        src/vserver-info \
-                       $(src_sbin_CXX_PROGS)
+                       src/vuname \
+                       $(src_sbin_CXX_X_PROGS)
 
 src_capchroot_SOURCES          =  src/capchroot.c
 src_capchroot_LDADD            =  lib/libvserver.la
@@ -124,7 +135,7 @@ src_chbind_SOURCES          =  src/chbind.c
 src_chbind_LDADD               =  lib/libvserver.la
 src_chbind_LDFLAGS             =  $(VSERVER_LDFLAGS)
 
-src_chcontext_SOURCES          =  src/chcontext.c
+src_chcontext_SOURCES          =  src/chcontext.c src/util-exitlikeprocess.c
 src_chcontext_LDADD            =  lib/libvserver.la
 src_chcontext_LDFLAGS          =  $(VSERVER_LDFLAGS)
 
@@ -158,10 +169,11 @@ src_save_ctxinfo_SOURCES  =  src/save_ctxinfo.c
 src_save_ctxinfo_LDADD         =  lib/libvserver.la
 src_save_ctxinfo_LDFLAGS       =  $(VSERVER_LDFLAGS)
 
-src_vdu_SOURCES                        =  src/vdu.c
-src_vreboot_SOURCES            =  src/vreboot.c
-src_new_namespace_SOURCES      =  src/new-namespace.c
-src_secure_mount_SOURCES       =  src/secure-mount.c
+src_vdu_SOURCES =              src/vdu.c
+src_vreboot_SOURCES =          src/vreboot.c
+src_new_namespace_SOURCES =    src/new-namespace.c \
+                               src/util-exitlikeprocess.c
+src_secure_mount_SOURCES =     src/secure-mount.c
 
 src_rpm_fake_resolver_SOURCES  =  src/rpm-fake-resolver.c
 src_rpm_fake_resolver_LDADD    =  lib/libvserver.la
@@ -169,12 +181,16 @@ src_rpm_fake_resolver_LDFLAGS     =  $(VSERVER_LDFLAGS)
 
 src_mask2prefix_SOURCES                =  src/mask2prefix.c
 
+src_vps_SOURCES                        =  src/vps.c src/util-exitlikeprocess.c
+src_vps_LDADD                  =  lib/libvserver.la
+src_vps_LDFLAGS                        =  $(VSERVER_LDFLAGS)
+
 src_vserver_info_SOURCES       =  src/vserver-info.c
 src_vserver_info_LDADD         =  lib/libvserver.la
 src_vserver_info_LDFLAGS       =  $(VSERVER_LDFLAGS)
 
 src_vserver_stat_SOURCES       =  src/vserver-stat.c
-src_vserver_stat_LDADD         =  lib/libvserver.la
+src_vserver_stat_LDADD         =  lib/libvserver.la libensc_vector.a
 src_vserver_stat_LDFLAGS       =  $(VSERVER_LDFLAGS)
 
 src_vfiles_SOURCES             =  src/vfiles.cc src/vutil.cc src/vserver.cc
@@ -182,8 +198,8 @@ src_vbuild_SOURCES          =  src/vbuild.cc src/vutil.cc src/vserver.cc
 src_vcheck_SOURCES             =  src/vcheck.cc src/vutil.cc src/vserver.cc
 
 src_lsxid_SOURCES              =  src/fstool.c src/util-safechdir.c src/lsxid.c
-src_lsxid_LDADD                        =  lib/libvserver.la
-src_lsxid_LDFLAGS              =  $(VSERVER_LDFLAGS)
+src_lsxid_LDADD                        =  lib/libvserver.la libensc_vector.a
+src_lsxid_LDFLAGS              =  $(VSERVER_LDFLAGS) 
 
 src_chxid_SOURCES              =  src/fstool.c src/util-safechdir.c \
                                   src/fstool-resolvectx.c src/chxid.c
@@ -199,10 +215,16 @@ src_setattr_LDADD         =  lib/libvserver.la
 src_setattr_LDFLAGS            =  $(VSERVER_LDFLAGS)
 
 
-src_vunify_SOURCES             =  src/vunify.c \
-                                  src/util-safechdir.c \
-                                  src/vunify-matchlist.c \
-                                  src/vunify-operations.c
+src_vunify_SOURCES =           src/vunify.c \
+                               src/util-safechdir.c \
+                               src/vunify-matchlist.c \
+                               src/vunify-debug.c
+src_vunify_LDADD =             lib/libvserver.la
+src_vunify_LDFLAGS =           $(VSERVER_LDFLAGS)
+
+src_vuname_SOURCES =           src/vuname.c
+src_vuname_LDADD =             lib/libvserver.la
+src_vuname_LDFLAGS =           $(VSERVER_LDFLAGS)
 
 src_rpm_fake_la_SOURCES                =  src/rpm-fake.c
 src_rpm_fake_la_CFLAGS         =  $(AM_CFLAGS)
@@ -214,16 +236,24 @@ src_check_SCRPTS          =  $(src_testsuite_check_SCRPTS)
 src_TSTS                       =  $(src_testsuite_TSTS)
 src_XTRAS                      =  $(src_testsuite_XTRAS)
 
-src_EXTRA_PROGS                        =  $(src_sbin_CXX_X_PROGS) $(src_pkglib_CXX_X_PROGS)
+src_EXTRA_PROGS                        =  $(src_sbin_CXX_PROGS) $(src_pkglib_CXX_PROGS)
 
 src_TESTS_ENV                  =  srctestsuitedir=$(top_builddir)/src/testsuite
 
+if ENSC_HAVE_C99_COMPILER
+src_sbin_C99_X_PROGS =         $(src_sbin_C99_PROGS)
+src_pkglib_C99_X_PROGS =       $(src_pkglib_C99_PROGS)
+else
+src_sbin_C99_X_PROGS =
+src_pkglib_C99_X_PROGS =  
+endif
+
 if ENSC_HAVE_CXX_COMPILER
-src_sbin_CXX_PROGS             =  $(src_sbin_CXX_X_PROGS)
-src_pkglib_CXX_PROGS           =  $(src_pkglib_CXX_X_PROGS)
+src_sbin_CXX_X_PROGS =         $(src_sbin_CXX_PROGS)
+src_pkglib_CXX_X_PROGS =       $(src_pkglib_CXX_PROGS)
 else
-src_sbin__PROGS                        =
-src_pkglib_CXX_PROGS           =  
+src_sbin_CXX_X_PROGS =
+src_pkglib_CXX_X_PROGS =  
 endif
 
 install-exec-hook:             src_install_exec_hook