removed everything an include <lib_internal/util.h> only
[util-vserver.git] / util-vserver / src / Makefile-files
index d317fbd..df906f8 100644 (file)
@@ -20,7 +20,7 @@
 src_sbin_CXX_PROGS =   src/vfiles
 src_pkglib_CXX_PROGS = src/vbuild src/vcheck
 
-src_pkglib_C99_PROGS = src/vunify
+src_pkglib_C99_PROGS = src/vunify src/vcopy
 
 
 src_OPTIONS_EXEMPT     =  src/parserpmdump \
@@ -36,9 +36,7 @@ src_OPTIONS_EXEMPT    =  src/parserpmdump \
                           src/chroot-cat \
                           src/filetime \
                           src/ifspec \
-                          src/chbind \
                           src/rebootmgr \
-                          src/reducecap \
                           src/vlimit \
                           src/vdu \
                           src/vfiles \
@@ -51,8 +49,11 @@ src_DIETPROGS =              src/new-namespace \
                        src/secure-mount \
                        src/save_ctxinfo \
                        src/mask2prefix \
+                       src/chbind \
                        src/chroot-cat \
                        src/chroot-rm \
+                       src/clearenv \
+                       src/enter-namespace \
                        src/exec-cd \
                        src/fakerunlevel \
                        src/pipe-sync \
@@ -60,32 +61,37 @@ src_DIETPROGS =             src/new-namespace \
                        src/vps \
                        src/lsxid \
                        src/chxid \
+                       src/reducecap \
                        src/showattr \
                        src/setattr \
                        src/vlimit \
                        src/vunify \
                        src/vuname \
                        src/rpm-fake-resolver \
+                       src/vcontext \
+                       src/vcopy \
                        src/vkill \
                        src/vrsetup \
                        src/vserver-stat \
                        src/vserver-info
 
-src_HDRS =             src/vutil.h src/vutil.p src/util.h \
+src_HDRS =             src/vutil.h src/vutil.p \
+                       src/util.h \
                        src/fstool.h \
                        src/compat-pivot_root.h \
                        src/stack-start.h \
-                       src/vunify-matchlist.h \
+                       src/sys_clone.h \
+                       src/vcopy-init.hc \
                        src/vunify.h \
-                       src/vunify-compare.hc \
-                       src/vunify-doit.hc \
                        src/vunify-init.hc \
+                       src/vserver-visitdir.hc \
                        src/vserver.hh
 
 src_pkglib_SCRPTS =
 src_pkglib_PRGS =      src/capchroot \
                        src/chroot-cat \
                        src/chroot-rm \
+                       src/clearenv \
                        src/fakerunlevel \
                        src/filetime \
                        src/ifspec \
@@ -118,7 +124,9 @@ src_sbin_PRGS =             src/chbind \
                        src/rebootmgr \
                        src/reducecap \
                        src/vdu \
+                       src/enter-namespace \
                        src/new-namespace \
+                       src/vcontext \
                        src/vlimit \
                        src/vkill \
                        src/vrsetup \
@@ -129,18 +137,22 @@ src_sbin_PRGS =           src/chbind \
 
 src_capchroot_SOURCES          =  src/capchroot.c
 src_capchroot_LDADD            =  lib/libvserver.la
-src_capchroot_LDFLAGS          =  $(VSERVER_LDFLAGS)
 
 src_chbind_SOURCES             =  src/chbind.c
-src_chbind_LDADD               =  lib/libvserver.la
+src_chbind_LDADD               =  $(VSERVER_LDADDS)
 src_chbind_LDFLAGS             =  $(VSERVER_LDFLAGS)
 
-src_chcontext_SOURCES          =  src/chcontext.c src/util-exitlikeprocess.c
-src_chcontext_LDADD            =  lib/libvserver.la
+src_chcontext_SOURCES          =  src/chcontext.c
+src_chcontext_LDADD            =  $(VSERVER_LDADDS) lib_internal/libinternal.a
 src_chcontext_LDFLAGS          =  $(VSERVER_LDFLAGS)
 
+src_vcontext_SOURCES           =  src/vcontext.c
+src_vcontext_LDADD             =  $(VSERVER_LDADDS) lib_internal/libinternal.a
+src_vcontext_LDFLAGS           =  $(VSERVER_LDFLAGS)
+
 src_chroot_cat_SOURCES         =  src/chroot-cat.c
 src_chroot_rm_SOURCES          =  src/chroot-rm.c
+src_clearenv_SOURCES           =  src/clearenv.c
 src_exec_cd_SOURCES            =  src/exec-cd.c
 src_fakerunlevel_SOURCES       =  src/fakerunlevel.c
 src_filetime_SOURCES           =  src/filetime.c
@@ -153,76 +165,82 @@ src_pipe_sync_SOURCES             =  src/pipe-sync.c
 src_exec_ulimit_SOURCES                =  src/exec-ulimit.c
 
 src_reducecap_SOURCES          =  src/reducecap.c
-src_reducecap_LDADD            =  lib/libvserver.la
+src_reducecap_LDADD            =  $(VSERVER_LDADDS)
 src_reducecap_LDFLAGS          =  $(VSERVER_LDFLAGS)
 
 src_vkill_SOURCES              =  src/vkill.c
-src_vkill_LDADD                        =  lib/libvserver.la
+src_vkill_LDADD                        =  $(VSERVER_LDADDS)
 src_vkill_LDFLAGS              =  $(VSERVER_LDFLAGS)
 src_vkill_CPPFLAGS             =  $(AM_CPPFLAGS) -DLEGACYDIR=\"$(legacydir)\"
 
 src_vlimit_SOURCES             =  src/vlimit.c
-src_vlimit_LDADD               =  lib/libvserver.la
+src_vlimit_LDADD               =  $(VSERVER_LDADDS)
 src_vlimit_LDFLAGS             =  $(VSERVER_LDFLAGS)
 
 src_save_ctxinfo_SOURCES       =  src/save_ctxinfo.c
-src_save_ctxinfo_LDADD         =  lib/libvserver.la
+src_save_ctxinfo_LDADD         =  $(VSERVER_LDADDS)
 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_secure_mount_SOURCES =     src/secure-mount.c
+
+src_enter_namespace_SOURCES =  src/enter-namespace.c
+src_enter_namespace_LDADD =    $(VSERVER_LDADDS)
+src_enter_namespace_LDFLAGS =  $(VSERVER_LDFLAGS)
+
+src_new_namespace_SOURCES =    src/new-namespace.c
+src_new_namespace_LDADD =      $(DIET_COMPAT_LDADDS) lib_internal/libinternal.a
 
 src_rpm_fake_resolver_SOURCES  =  src/rpm-fake-resolver.c
-src_rpm_fake_resolver_LDADD    =  lib/libvserver.la
+src_rpm_fake_resolver_LDADD    =  $(VSERVER_LDADDS)
 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_SOURCES                        =  src/vps.c
+src_vps_LDADD                  =  $(VSERVER_LDADDS) lib_internal/libinternal.a
 src_vps_LDFLAGS                        =  $(VSERVER_LDFLAGS)
 
 src_vserver_info_SOURCES       =  src/vserver-info.c
-src_vserver_info_LDADD         =  lib/libvserver.la
+src_vserver_info_LDADD         =  $(VSERVER_LDADDS)
 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         =  $(VSERVER_LDADDS) libensc_vector.a
 src_vserver_stat_LDFLAGS       =  $(VSERVER_LDFLAGS)
 
 src_vfiles_SOURCES             =  src/vfiles.cc src/vutil.cc src/vserver.cc
 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 libensc_vector.a
+src_lsxid_SOURCES              =  src/fstool.c src/lsxid.c
+src_lsxid_LDADD                        =  lib_internal/libinternal.a $(VSERVER_LDADDS) libensc_vector.a
 src_lsxid_LDFLAGS              =  $(VSERVER_LDFLAGS) 
 
-src_chxid_SOURCES              =  src/fstool.c src/util-safechdir.c \
+src_chxid_SOURCES              =  src/fstool.c \
                                   src/fstool-resolvectx.c src/chxid.c
-src_chxid_LDADD                        =  lib/libvserver.la
+src_chxid_LDADD                        =  lib_internal/libinternal.a $(VSERVER_LDADDS)
 src_chxid_LDFLAGS              =  $(VSERVER_LDFLAGS)
 
-src_showattr_SOURCES           =  src/fstool.c src/util-safechdir.c src/showattr.c
-src_showattr_LDADD             =  lib/libvserver.la
+src_showattr_SOURCES           =  src/fstool.c src/showattr.c
+src_showattr_LDADD             =  lib_internal/libinternal.a $(VSERVER_LDADDS)
 src_showattr_LDFLAGS           =  $(VSERVER_LDFLAGS)
 
-src_setattr_SOURCES            =  src/fstool.c src/util-safechdir.c src/setattr.c
-src_setattr_LDADD              =  lib/libvserver.la
+src_setattr_SOURCES            =  src/fstool.c src/setattr.c
+src_setattr_LDADD              =  lib_internal/libinternal.a $(VSERVER_LDADDS)
 src_setattr_LDFLAGS            =  $(VSERVER_LDFLAGS)
 
+src_vcopy_SOURCES =            src/vcopy.c
+src_vcopy_LDADD =              lib_internal/libinternal.a $(VSERVER_LDADDS)
+src_vcopy_LDFLAGS =            $(VSERVER_LDFLAGS)
 
-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_SOURCES =           src/vunify.c
+src_vunify_LDADD =             lib_internal/libinternal.a $(VSERVER_LDADDS)
 src_vunify_LDFLAGS =           $(VSERVER_LDFLAGS)
 
 src_vuname_SOURCES =           src/vuname.c
-src_vuname_LDADD =             lib/libvserver.la
+src_vuname_LDADD =             $(VSERVER_LDADDS)
 src_vuname_LDFLAGS =           $(VSERVER_LDFLAGS)
 
 src_rpm_fake_la_SOURCES                =  src/rpm-fake.c