X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fsrc%2FMakefile-files;h=a5ff98cbeae744ef502072b4eddf768b22ed610f;hb=f095183802c5263915fe8f45e54a632615e9c38a;hp=df906f8e48c61277129e271a91b69afe7abd27dc;hpb=c1021c05b0d857285259fb3b45031a217b4f2b23;p=util-vserver.git diff --git a/util-vserver/src/Makefile-files b/util-vserver/src/Makefile-files index df906f8..a5ff98c 100644 --- a/util-vserver/src/Makefile-files +++ b/util-vserver/src/Makefile-files @@ -23,29 +23,28 @@ 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/filetime \ + src/lockfile \ + src/readlink \ src/secure-mount \ src/save_ctxinfo \ src/mask2prefix \ @@ -53,10 +52,9 @@ src_DIETPROGS = src/new-namespace \ 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,18 +62,22 @@ src_DIETPROGS = src/new-namespace \ src/reducecap \ src/showattr \ src/setattr \ + src/vattribute \ src/vlimit \ + src/vnamespace \ src/vunify \ src/vuname \ src/rpm-fake-resolver \ 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/util.h \ src/fstool.h \ src/compat-pivot_root.h \ @@ -85,84 +87,97 @@ src_HDRS = src/vutil.h src/vutil.p \ 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/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_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_LDFLAGS) -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_LDFLAGS) -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_LDFLAGS) src_vcontext_SOURCES = src/vcontext.c src_vcontext_LDADD = $(VSERVER_LDADDS) lib_internal/libinternal.a src_vcontext_LDFLAGS = $(VSERVER_LDFLAGS) +src_vsched_SOURCES = src/vsched.c +src_vsched_LDADD = $(VSERVER_LDADDS) +src_vsched_LDFLAGS = $(VSERVER_LDFLAGS) + +src_filetime_SOURCES = src/filetime.c +src_filetime_LDADD = $(VSERVER_LDADDS) +src_filetime_LDFLAGS = $(VSERVER_LDFLAGS) + +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) @@ -185,12 +200,13 @@ 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_vattribute_SOURCES = src/vattribute.c +src_vattribute_LDADD = $(VSERVER_LDADDS) +src_vattribute_LDFLAGS = $(VSERVER_LDFLAGS) -src_new_namespace_SOURCES = src/new-namespace.c -src_new_namespace_LDADD = $(DIET_COMPAT_LDADDS) lib_internal/libinternal.a +src_vnamespace_SOURCES = src/vnamespace.c +src_vnamespace_LDADD = $(VSERVER_LDADDS) lib_internal/libinternal.a +src_vnamespace_LDFLAGS = $(VSERVER_LDFLAGS) src_rpm_fake_resolver_SOURCES = src/rpm-fake-resolver.c src_rpm_fake_resolver_LDADD = $(VSERVER_LDADDS) @@ -199,15 +215,15 @@ src_rpm_fake_resolver_LDFLAGS = $(VSERVER_LDFLAGS) src_mask2prefix_SOURCES = src/mask2prefix.c src_vps_SOURCES = src/vps.c -src_vps_LDADD = $(VSERVER_LDADDS) lib_internal/libinternal.a +src_vps_LDADD = lib_internal/libinternal.a $(VSERVER_LDADDS) src_vps_LDFLAGS = $(VSERVER_LDFLAGS) src_vserver_info_SOURCES = src/vserver-info.c -src_vserver_info_LDADD = $(VSERVER_LDADDS) +src_vserver_info_LDADD = lib_internal/libinternal.a $(VSERVER_LDADDS) src_vserver_info_LDFLAGS = $(VSERVER_LDFLAGS) src_vserver_stat_SOURCES = src/vserver-stat.c -src_vserver_stat_LDADD = $(VSERVER_LDADDS) libensc_vector.a +src_vserver_stat_LDADD = lib_internal/libinternal.a $(VSERVER_LDADDS) libensc_vector.a src_vserver_stat_LDFLAGS = $(VSERVER_LDFLAGS) src_vfiles_SOURCES = src/vfiles.cc src/vutil.cc src/vserver.cc @@ -231,6 +247,11 @@ src_setattr_SOURCES = src/fstool.c src/setattr.c src_setattr_LDADD = lib_internal/libinternal.a $(VSERVER_LDADDS) src_setattr_LDFLAGS = $(VSERVER_LDFLAGS) +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_vcopy_SOURCES = src/vcopy.c src_vcopy_LDADD = lib_internal/libinternal.a $(VSERVER_LDADDS) src_vcopy_LDFLAGS = $(VSERVER_LDFLAGS) @@ -248,14 +269,9 @@ 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) @@ -279,8 +295,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: -