removed CHROOT_*
[util-vserver.git] / util-vserver / src / Makefile-files
index cd9c39f..813d344 100644 (file)
@@ -31,18 +31,16 @@ AM_INSTALLCHECK_STD_OPTIONS_EXEMPT += \
                        src/vreboot \
                        src/save_ctxinfo \
                        src/mask2prefix \
-                       src/chroot-cat \
                        src/ifspec \
                        src/rebootmgr \
                        src/vdu \
                        src/vfiles
 
-
-
 DIETPROGS +=           src/chcontext-compat \
                        src/capchroot \
                        src/chain-echo \
                        src/check-unixfile \
+                       src/chroot-sh \
                        src/filetime \
                        src/lockfile \
                        src/readlink \
@@ -50,8 +48,6 @@ DIETPROGS +=          src/chcontext-compat \
                        src/save_ctxinfo \
                        src/mask2prefix \
                        src/chbind \
-                       src/chroot-cat \
-                       src/chroot-rm \
                        src/exec-cd \
                        src/fakerunlevel \
                        src/keep-ctx-alive \
@@ -77,7 +73,12 @@ DIETPROGS +=         src/chcontext-compat \
                        src/vrsetup \
                        src/vserver-stat \
                        src/vserver-info \
-                       src/vdlimit
+                       src/vdlimit \
+                       src/vwait
+
+if ENSC_CAN_BEECRYPT_WITH_DIETLIBC
+DIETPROGS +=           src/vhashify
+endif
 
 noinst_HEADERS +=      src/vutil.h src/vutil.p \
                        src/capability-compat.h \
@@ -88,6 +89,8 @@ noinst_HEADERS +=     src/vutil.h src/vutil.p \
                        src/vcopy-init.hc \
                        src/vunify.h \
                        src/vunify-init.hc \
+                       src/vhashify.h \
+                       src/vhashify-init.hc \
                        src/vserver-visitdir.hc \
                        src/context-sync.hc \
                        src/vserver.hh
@@ -96,8 +99,7 @@ pkglib_PROGRAMS +=    src/capchroot \
                        src/chain-echo \
                        src/chcontext-compat \
                        src/check-unixfile \
-                       src/chroot-cat \
-                       src/chroot-rm \
+                       src/chroot-sh \
                        src/fakerunlevel \
                        src/filetime \
                        src/keep-ctx-alive \
@@ -113,6 +115,12 @@ pkglib_PROGRAMS += src/capchroot \
                        $(src_pkglib_C99_X_PROGS) \
                        $(src_pkglib_CXX_X_PROGS)
 
+if ENSC_HAVE_C99_COMPILER
+if ENSC_HAVE_BEECRYPT
+pkglib_PROGRAMS +=     src/vhashify
+endif ENSC_HAVE_BEECRYPT
+endif ENSC_HAVE_C99_COMPILER
+
 legacy_PROGRAMS +=     src/ifspec \
                        src/listdevip \
                        src/parserpmdump \
@@ -133,7 +141,6 @@ sbin_PROGRAMS +=    src/chbind \
                        src/vdu \
                        src/vattribute \
                        src/vcontext \
-                       src/vdlimit \
                        src/vlimit \
                        src/vkill \
                        src/vnamespace \
@@ -142,8 +149,14 @@ sbin_PROGRAMS +=   src/chbind \
                        src/vserver-stat \
                        src/vserver-info \
                        src/vuname \
+                       src/vwait \
                        $(src_sbin_CXX_X_PROGS)
 
+if ENSC_HAVE_C99_COMPILER
+sbin_PROGRAMS +=       src/vdlimit
+endif
+
+
 src_capchroot_SOURCES =                src/capchroot.c
 src_capchroot_LDADD =          $(VSERVER_LDADDS)
 src_capchroot_LDFLAGS =                $(VSERVER_LDFLGS)
@@ -153,11 +166,11 @@ src_chbind_LDADD =                $(VSERVER_LDADDS)
 src_chbind_LDFLAGS =           $(VSERVER_LDFLGS)
 
 src_chcontext_compat_SOURCES = src/chcontext.c
-src_chcontext_compat_LDADD =   $(VSERVER_LDADDS) lib_internal/libinternal.a
+src_chcontext_compat_LDADD =   $(VSERVER_LDADDS) $(LIBINTERNAL)
 src_chcontext_compat_LDFLAGS = $(VSERVER_LDFLGS)
 
 src_vcontext_SOURCES           =  src/vcontext.c
-src_vcontext_LDADD             =  $(VSERVER_LDADDS) lib_internal/libinternal.a
+src_vcontext_LDADD             =  $(VSERVER_LDADDS) $(LIBINTERNAL)
 src_vcontext_LDFLAGS           =  $(VSERVER_LDFLGS)
 
 src_vsched_SOURCES             =  src/vsched.c
@@ -169,8 +182,7 @@ src_filetime_LDADD          =  $(VSERVER_LDADDS)
 src_filetime_LDFLAGS           =  $(VSERVER_LDFLGS)
 
 src_chain_echo_SOURCES         =  src/chain-echo.c
-src_chroot_cat_SOURCES         =  src/chroot-cat.c
-src_chroot_rm_SOURCES          =  src/chroot-rm.c
+src_chroot_sh_SOURCES          =  src/chroot-sh.c
 src_exec_cd_SOURCES            =  src/exec-cd.c
 src_fakerunlevel_SOURCES       =  src/fakerunlevel.c
 src_ifspec_SOURCES             =  src/ifspec.c
@@ -211,7 +223,7 @@ src_vattribute_LDADD =              $(VSERVER_LDADDS)
 src_vattribute_LDFLAGS =       $(VSERVER_LDFLGS)
 
 src_vnamespace_SOURCES =       src/vnamespace.c
-src_vnamespace_LDADD =         $(VSERVER_LDADDS) lib_internal/libinternal.a
+src_vnamespace_LDADD =         $(VSERVER_LDADDS) $(LIBINTERNAL)
 src_vnamespace_LDFLAGS =       $(VSERVER_LDFLGS)
 
 src_rpm_fake_resolver_SOURCES  =  src/rpm-fake-resolver.c
@@ -221,15 +233,15 @@ src_rpm_fake_resolver_LDFLAGS     =  $(VSERVER_LDFLGS)
 src_mask2prefix_SOURCES                =  src/mask2prefix.c
 
 src_vps_SOURCES                        =  src/vps.c
-src_vps_LDADD                  =  lib_internal/libinternal.a $(VSERVER_LDADDS)
+src_vps_LDADD                  =  $(LIBINTERNAL) $(VSERVER_LDADDS)
 src_vps_LDFLAGS                        =  $(VSERVER_LDFLGS)
 
 src_vserver_info_SOURCES       =  src/vserver-info.c
-src_vserver_info_LDADD         =  lib_internal/libinternal.a $(VSERVER_LDADDS)
+src_vserver_info_LDADD         =  $(LIBINTERNAL) $(VSERVER_LDADDS)
 src_vserver_info_LDFLAGS       =  $(VSERVER_LDFLGS)
 
 src_vserver_stat_SOURCES       =  src/vserver-stat.c
-src_vserver_stat_LDADD         =  lib_internal/libinternal.a $(VSERVER_LDADDS) libensc_vector.a
+src_vserver_stat_LDADD         =  $(LIBINTERNAL) $(VSERVER_LDADDS) $(LIBENSCVECTOR)
 src_vserver_stat_LDFLAGS       =  $(VSERVER_LDFLGS)
 
 src_vfiles_SOURCES             =  src/vfiles.cc src/vutil.cc src/vserver.cc
@@ -237,19 +249,19 @@ 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/lsxid.c
-src_lsxid_LDADD                        =  lib_internal/libinternal.a $(VSERVER_LDADDS) libensc_vector.a
+src_lsxid_LDADD                        =  $(LIBINTERNAL) $(VSERVER_LDADDS) $(LIBENSCVECTOR)
 src_lsxid_LDFLAGS              =  $(VSERVER_LDFLGS) 
 
 src_chxid_SOURCES              =  src/fstool.c src/chxid.c
-src_chxid_LDADD                        =  lib_internal/libinternal.a $(VSERVER_LDADDS)
+src_chxid_LDADD                        =  $(LIBINTERNAL) $(VSERVER_LDADDS)
 src_chxid_LDFLAGS              =  $(VSERVER_LDFLGS)
 
 src_showattr_SOURCES           =  src/fstool.c src/showattr.c
-src_showattr_LDADD             =  lib_internal/libinternal.a $(VSERVER_LDADDS)
+src_showattr_LDADD             =  $(LIBINTERNAL) $(VSERVER_LDADDS)
 src_showattr_LDFLAGS           =  $(VSERVER_LDFLGS)
 
 src_setattr_SOURCES            =  src/fstool.c src/setattr.c
-src_setattr_LDADD              =  lib_internal/libinternal.a $(VSERVER_LDADDS)
+src_setattr_LDADD              =  $(LIBINTERNAL) $(VSERVER_LDADDS)
 src_setattr_LDFLAGS            =  $(VSERVER_LDFLGS)
 
 src_keep_ctx_alive_SOURCES =   src/keep-ctx-alive.c
@@ -258,13 +270,22 @@ src_keep_ctx_alive_LDFLAGS =      $(VSERVER_LDFLGS)
 
 
 src_vcopy_SOURCES =            src/vcopy.c
-src_vcopy_LDADD =              lib_internal/libinternal.a $(VSERVER_LDADDS)
+src_vcopy_LDADD =              $(LIBINTERNAL) $(VSERVER_LDADDS)
 src_vcopy_LDFLAGS =            $(VSERVER_LDFLGS)
 
 src_vunify_SOURCES =           src/vunify.c
-src_vunify_LDADD =             lib_internal/libinternal.a $(VSERVER_LDADDS)
+src_vunify_LDADD =             $(LIBINTERNAL) $(VSERVER_LDADDS)
 src_vunify_LDFLAGS =           $(VSERVER_LDFLGS)
 
+src_vhashify_SOURCES =         src/vhashify.c
+if ENSC_CAN_BEECRYPT_WITH_DIETLIBC
+src_vhashify_LDADD =           $(LIBINTERNAL) $(LIBENSCVECTOR) -lbeecrypt $(VSERVER_LDADDS)
+src_vhashify_LDFLAGS =         $(VSERVER_LDFLGS)
+else
+src_vhashify_LDADD =           $(LIBINTERNAL_GLIBC) $(LIBENSCVECTOR_GLIBC) $(LIBVSERVER_GLIBC) -lbeecrypt
+src_vhashify_LDFLAGS =
+endif
+
 src_vuname_SOURCES =           src/vuname.c
 src_vuname_LDADD =             $(VSERVER_LDADDS)
 src_vuname_LDFLAGS =           $(VSERVER_LDFLGS)
@@ -272,12 +293,16 @@ src_vuname_LDFLAGS =              $(VSERVER_LDFLGS)
 src_rpm_fake_la_SOURCES                =  src/rpm-fake.c
 src_rpm_fake_la_CFLAGS         =  $(AM_CFLAGS)
 src_rpm_fake_la_LDFLAGS                =  -module -avoid-version -rpath $(pkglibdir)
-src_rpm_fake_la_LIBADD         =  lib/libvserver.la -ldl
+src_rpm_fake_la_LIBADD         =  $(LIBVSERVER_GLIBC) -ldl
 
 src_vdlimit_SOURCES            = src/vdlimit.c
 src_vdlimit_LDADD              = $(VSERVER_LDADDS)
 src_vdlimit_LDFLAGS            = $(VSERVER_LDFLGS)
 
+src_vwait_SOURCES              = src/vwait.c
+src_vwait_LDADD                        = $(VSERVER_LDADDS)
+src_vwait_LDFLAGS              = $(VSERVER_LDFLGS)
+
 EXTRA_PROGRAMS +=              $(src_sbin_CXX_PROGS) $(src_pkglib_CXX_PROGS)
 
 TESTS_ENVIRONMENT +=           srctestsuitedir=$(top_builddir)/src/testsuite