X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fsrc%2FMakefile-files;h=1a976ae969dfc14bc28b2051c607ebce4f0b5b4d;hb=5736e97486dbc7182b2e832f4367812741ccbd86;hp=1e48ac49e63fab54040ee1a7acb922bc50ed8f91;hpb=fccabb65cb77f943cb7bf96463e56eb6cf296eaa;p=util-vserver.git diff --git a/util-vserver/src/Makefile-files b/util-vserver/src/Makefile-files index 1e48ac4..1a976ae 100644 --- a/util-vserver/src/Makefile-files +++ b/util-vserver/src/Makefile-files @@ -23,40 +23,38 @@ src_pkglib_CXX_PROGS = src/vbuild src/vcheck src_pkglib_C99_PROGS = src/vunify src/vcopy -src_OPTIONS_EXEMPT = src/parserpmdump \ - src/readlink \ - src/showperm \ - src/vbuild \ - src/vcheck \ - src/vreboot \ - src/save_ctxinfo \ - src/mask2prefix \ - src/pipe-sync \ - src/capchroot \ - src/chroot-cat \ - src/filetime \ - src/ifspec \ - src/rebootmgr \ - src/vlimit \ - src/vdu \ - src/vfiles \ - src/vserver-stat - - - -src_DIETPROGS = src/new-namespace \ - src/chcontext \ +AM_INSTALLCHECK_STD_OPTIONS_EXEMPT += \ + src/parserpmdump \ + src/showperm \ + src/vbuild \ + src/vcheck \ + 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 \ 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 \ + src/keep-ctx-alive \ src/exec-ulimit \ src/vps \ src/lsxid \ @@ -64,6 +62,8 @@ src_DIETPROGS = src/new-namespace \ src/reducecap \ src/showattr \ src/setattr \ + src/sigexec \ + src/vattribute \ src/vlimit \ src/vnamespace \ src/vunify \ @@ -72,149 +72,163 @@ src_DIETPROGS = src/new-namespace \ src/vcontext \ src/vcopy \ src/vkill \ + src/vsched \ + src/vshelper-sync \ src/vrsetup \ src/vserver-stat \ src/vserver-info -src_HDRS = src/vutil.h src/vutil.p \ +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/vserver-visitdir.hc \ + src/context-sync.hc \ src/vserver.hh -src_pkglib_SCRPTS = -src_pkglib_PRGS = src/capchroot \ +pkglib_PROGRAMS += src/capchroot \ + src/chain-echo \ + src/chcontext-compat \ + src/check-unixfile \ src/chroot-cat \ src/chroot-rm \ - src/clearenv \ src/fakerunlevel \ src/filetime \ - src/ifspec \ - src/listdevip \ - src/parserpmdump \ + src/keep-ctx-alive \ + src/lockfile \ 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/vshelper-sync \ + src/sigexec \ $(src_pkglib_C99_X_PROGS) \ $(src_pkglib_CXX_X_PROGS) -src_pkglib_LTLIBS = src/rpm-fake.la -src_lib_LTLIBS = +legacy_PROGRAMS += src/ifspec \ + src/listdevip \ + src/parserpmdump \ + src/rebootmgr \ + src/showperm \ + src/vreboot + +pkglib_LTLIBRARIES += src/rpm-fake.la -src_sbin_SCRPTS = -src_sbin_PRGS = src/chbind \ - src/chcontext \ +sbin_PROGRAMS += src/chbind \ src/exec-cd \ src/lsxid \ src/chxid \ src/vps \ src/showattr \ src/setattr \ - src/rebootmgr \ src/reducecap \ src/vdu \ - src/enter-namespace \ - src/new-namespace \ + src/vattribute \ src/vcontext \ src/vlimit \ src/vkill \ src/vnamespace \ src/vrsetup \ + src/vsched \ src/vserver-stat \ src/vserver-info \ src/vuname \ $(src_sbin_CXX_X_PROGS) -src_capchroot_SOURCES = src/capchroot.c -src_capchroot_LDADD = lib/libvserver.la +src_capchroot_SOURCES = src/capchroot.c +src_capchroot_LDADD = $(VSERVER_LDADDS) +src_capchroot_LDFLAGS = $(VSERVER_LDFLGS) -src_chbind_SOURCES = src/chbind.c -src_chbind_LDADD = $(VSERVER_LDADDS) -src_chbind_LDFLAGS = $(VSERVER_LDFLAGS) +src_chbind_SOURCES = src/chbind.c +src_chbind_LDADD = $(VSERVER_LDADDS) +src_chbind_LDFLAGS = $(VSERVER_LDFLGS) -src_chcontext_SOURCES = src/chcontext.c -src_chcontext_LDADD = $(VSERVER_LDADDS) lib_internal/libinternal.a -src_chcontext_LDFLAGS = $(VSERVER_LDFLAGS) +src_chcontext_compat_SOURCES = src/chcontext.c +src_chcontext_compat_LDADD = $(VSERVER_LDADDS) lib_internal/libinternal.a +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_LDFLAGS = $(VSERVER_LDFLGS) + +src_vsched_SOURCES = src/vsched.c +src_vsched_LDADD = $(VSERVER_LDADDS) +src_vsched_LDFLAGS = $(VSERVER_LDFLGS) + +src_filetime_SOURCES = src/filetime.c +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_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 src_ifspec_SOURCES = src/ifspec.c src_listdevip_SOURCES = src/listdevip.c +src_lockfile_SOURCES = src/lockfile.c src_parserpmdump_SOURCES = src/parserpmdump.c src_readlink_SOURCES = src/readlink.c src_rebootmgr_SOURCES = src/rebootmgr.c -src_pipe_sync_SOURCES = src/pipe-sync.c src_exec_ulimit_SOURCES = src/exec-ulimit.c +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_enter_namespace_SOURCES = src/enter-namespace.c -src_enter_namespace_LDADD = $(VSERVER_LDADDS) -src_enter_namespace_LDFLAGS = $(VSERVER_LDFLAGS) +src_vattribute_SOURCES = src/vattribute.c +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_LDFLAGS = $(VSERVER_LDFLAGS) - -src_new_namespace_SOURCES = src/new-namespace.c -src_new_namespace_LDADD = $(DIET_COMPAT_LDADDS) lib_internal/libinternal.a +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 = $(VSERVER_LDADDS) lib_internal/libinternal.a -src_vps_LDFLAGS = $(VSERVER_LDFLAGS) +src_vps_LDADD = lib_internal/libinternal.a $(VSERVER_LDADDS) +src_vps_LDFLAGS = $(VSERVER_LDFLGS) src_vserver_info_SOURCES = src/vserver-info.c -src_vserver_info_LDADD = $(VSERVER_LDADDS) -src_vserver_info_LDFLAGS = $(VSERVER_LDFLAGS) +src_vserver_info_LDADD = lib_internal/libinternal.a $(VSERVER_LDADDS) +src_vserver_info_LDFLAGS = $(VSERVER_LDFLGS) src_vserver_stat_SOURCES = src/vserver-stat.c -src_vserver_stat_LDADD = $(VSERVER_LDADDS) libensc_vector.a -src_vserver_stat_LDFLAGS = $(VSERVER_LDFLAGS) +src_vserver_stat_LDADD = lib_internal/libinternal.a $(VSERVER_LDADDS) libensc_vector.a +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 @@ -222,46 +236,45 @@ 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_LDFLAGS = $(VSERVER_LDFLGS) -src_chxid_SOURCES = src/fstool.c \ - src/fstool-resolvectx.c src/chxid.c +src_chxid_SOURCES = src/fstool.c src/chxid.c src_chxid_LDADD = lib_internal/libinternal.a $(VSERVER_LDADDS) -src_chxid_LDFLAGS = $(VSERVER_LDFLAGS) +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_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_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_LDFLGS) + src_vcopy_SOURCES = src/vcopy.c src_vcopy_LDADD = lib_internal/libinternal.a $(VSERVER_LDADDS) -src_vcopy_LDFLAGS = $(VSERVER_LDFLAGS) +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_LDFLAGS = $(VSERVER_LDFLGS) 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_check_PRGS = $(src_testsuite_check_PRGS) -src_check_SCRPTS = $(src_testsuite_check_SCRPTS) -src_TSTS = $(src_testsuite_TSTS) -src_XTRAS = $(src_testsuite_XTRAS) - -src_EXTRA_PROGS = $(src_sbin_CXX_PROGS) $(src_pkglib_CXX_PROGS) +EXTRA_PROGRAMS += $(src_sbin_CXX_PROGS) $(src_pkglib_CXX_PROGS) -src_TESTS_ENV = srctestsuitedir=$(top_builddir)/src/testsuite +TESTS_ENVIRONMENT += srctestsuitedir=$(top_builddir)/src/testsuite if ENSC_HAVE_C99_COMPILER src_sbin_C99_X_PROGS = $(src_sbin_C99_PROGS) @@ -285,8 +298,3 @@ src_install_exec_hook: -rm -f $(DESTDIR)$(pkglibdir)/rpm-fake.a $(DESTDIR)$(pkglibdir)/rpm-fake.la include $(top_srcdir)/src/testsuite/Makefile-files - -## Local Variables: -## compile-command: "make -C .. -k" -## End: -