X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fsrc%2FMakefile-files;h=79f768291c536c9770fb5a96b74d02edacacaf8a;hb=557d2996ed86689c11dcf0b528dc0b254e9b76d2;hp=7365f772e1fb2e18ae8612419d43de7780e9d6db;hpb=c43b5bda3d5aa6dcd799ba9e19e798a5a57674d2;p=util-vserver.git diff --git a/util-vserver/src/Makefile-files b/util-vserver/src/Makefile-files index 7365f77..79f7682 100644 --- a/util-vserver/src/Makefile-files +++ b/util-vserver/src/Makefile-files @@ -31,17 +31,15 @@ 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/filetime \ src/lockfile \ src/readlink \ @@ -75,17 +73,25 @@ DIETPROGS += src/chcontext-compat \ src/vshelper-sync \ src/vrsetup \ src/vserver-stat \ - src/vserver-info + src/vserver-info \ + 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 \ src/util.h \ src/fstool.h \ src/compat-pivot_root.h \ src/stack-start.h \ - src/sys_clone.h \ 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 @@ -93,6 +99,7 @@ noinst_HEADERS += src/vutil.h src/vutil.p \ pkglib_PROGRAMS += src/capchroot \ src/chain-echo \ src/chcontext-compat \ + src/check-unixfile \ src/chroot-cat \ src/chroot-rm \ src/fakerunlevel \ @@ -110,6 +117,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 \ @@ -138,31 +151,37 @@ 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_LDFLAGS) +src_capchroot_LDFLAGS = $(VSERVER_LDFLGS) src_chbind_SOURCES = src/chbind.c src_chbind_LDADD = $(VSERVER_LDADDS) -src_chbind_LDFLAGS = $(VSERVER_LDFLAGS) +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_LDFLAGS = $(VSERVER_LDFLAGS) +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_LDFLAGS = $(VSERVER_LDFLAGS) +src_vcontext_LDADD = $(VSERVER_LDADDS) $(LIBINTERNAL) +src_vcontext_LDFLAGS = $(VSERVER_LDFLGS) src_vsched_SOURCES = src/vsched.c src_vsched_LDADD = $(VSERVER_LDADDS) -src_vsched_LDFLAGS = $(VSERVER_LDFLAGS) +src_vsched_LDFLAGS = $(VSERVER_LDFLGS) src_filetime_SOURCES = src/filetime.c src_filetime_LDADD = $(VSERVER_LDADDS) -src_filetime_LDFLAGS = $(VSERVER_LDFLAGS) +src_filetime_LDFLAGS = $(VSERVER_LDFLGS) src_chain_echo_SOURCES = src/chain-echo.c src_chroot_cat_SOURCES = src/chroot-cat.c @@ -180,93 +199,112 @@ src_vshelper_sync_SOURCES = src/vshelper-sync.c src_reducecap_SOURCES = src/reducecap.c src_reducecap_LDADD = $(VSERVER_LDADDS) -src_reducecap_LDFLAGS = $(VSERVER_LDFLAGS) +src_reducecap_LDFLAGS = $(VSERVER_LDFLGS) src_vkill_SOURCES = src/vkill.c src_vkill_LDADD = $(VSERVER_LDADDS) -src_vkill_LDFLAGS = $(VSERVER_LDFLAGS) +src_vkill_LDFLAGS = $(VSERVER_LDFLGS) src_vkill_CPPFLAGS = $(AM_CPPFLAGS) -DLEGACYDIR=\"$(legacydir)\" src_vlimit_SOURCES = src/vlimit.c src_vlimit_LDADD = $(VSERVER_LDADDS) -src_vlimit_LDFLAGS = $(VSERVER_LDFLAGS) +src_vlimit_LDFLAGS = $(VSERVER_LDFLGS) src_save_ctxinfo_SOURCES = src/save_ctxinfo.c src_save_ctxinfo_LDADD = $(VSERVER_LDADDS) -src_save_ctxinfo_LDFLAGS = $(VSERVER_LDFLAGS) +src_save_ctxinfo_LDFLAGS = $(VSERVER_LDFLGS) src_vdu_SOURCES = src/vdu.c src_vreboot_SOURCES = src/vreboot.c + src_secure_mount_SOURCES = src/secure-mount.c +src_secure_mount_LDADD = $(VSERVER_LDADDS) +src_secure_mount_LDFLAGS = $(VSERVER_LDFLGS) src_vattribute_SOURCES = src/vattribute.c src_vattribute_LDADD = $(VSERVER_LDADDS) -src_vattribute_LDFLAGS = $(VSERVER_LDFLAGS) +src_vattribute_LDFLAGS = $(VSERVER_LDFLGS) src_vnamespace_SOURCES = src/vnamespace.c -src_vnamespace_LDADD = $(VSERVER_LDADDS) lib_internal/libinternal.a -src_vnamespace_LDFLAGS = $(VSERVER_LDFLAGS) +src_vnamespace_LDADD = $(VSERVER_LDADDS) $(LIBINTERNAL) +src_vnamespace_LDFLAGS = $(VSERVER_LDFLGS) src_rpm_fake_resolver_SOURCES = src/rpm-fake-resolver.c src_rpm_fake_resolver_LDADD = $(VSERVER_LDADDS) -src_rpm_fake_resolver_LDFLAGS = $(VSERVER_LDFLAGS) +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_LDFLAGS = $(VSERVER_LDFLAGS) +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_LDFLAGS = $(VSERVER_LDFLAGS) +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_LDFLAGS = $(VSERVER_LDFLAGS) +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 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_LDFLAGS = $(VSERVER_LDFLAGS) +src_lsxid_LDADD = $(LIBINTERNAL) $(VSERVER_LDADDS) $(LIBENSCVECTOR) +src_lsxid_LDFLAGS = $(VSERVER_LDFLGS) -src_chxid_SOURCES = src/fstool.c \ - src/fstool-resolvectx.c src/chxid.c -src_chxid_LDADD = lib_internal/libinternal.a $(VSERVER_LDADDS) -src_chxid_LDFLAGS = $(VSERVER_LDFLAGS) +src_chxid_SOURCES = src/fstool.c src/chxid.c +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_LDFLAGS = $(VSERVER_LDFLAGS) +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_LDFLAGS = $(VSERVER_LDFLAGS) +src_setattr_LDADD = $(LIBINTERNAL) $(VSERVER_LDADDS) +src_setattr_LDFLAGS = $(VSERVER_LDFLGS) src_keep_ctx_alive_SOURCES = src/keep-ctx-alive.c src_keep_ctx_alive_LDADD = $(VSERVER_LDADDS) -src_keep_ctx_alive_LDFLAGS = $(VSERVER_LDFLAGS) +src_keep_ctx_alive_LDFLAGS = $(VSERVER_LDFLGS) src_vcopy_SOURCES = src/vcopy.c -src_vcopy_LDADD = lib_internal/libinternal.a $(VSERVER_LDADDS) -src_vcopy_LDFLAGS = $(VSERVER_LDFLAGS) +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_LDFLAGS = $(VSERVER_LDFLAGS) +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_LDFLAGS) +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)