X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fsrc%2FMakefile-files;h=6b9743e4a2e6df73aa5be5eda25ebe9ed5c6b024;hb=6b8e8be311f1f826e1ab6cedad1a5d50ef6dd4d6;hp=4934746f1967b190223be3a33bade7c43d5e0f15;hpb=5714bb6ff47998d59bd5ad3e7d69099bebbb721b;p=util-vserver.git diff --git a/util-vserver/src/Makefile-files b/util-vserver/src/Makefile-files index 4934746..6b9743e 100644 --- a/util-vserver/src/Makefile-files +++ b/util-vserver/src/Makefile-files @@ -1,6 +1,6 @@ ## $Id$ -*- makefile -*- -## Copyright (C) 2003 Enrico Scholz +## Copyright (C) 2003,2004 Enrico Scholz ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -17,8 +17,11 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ## -src_sbin_CXX_X_PROGS = src/vfiles -src_pkglib_CXX_X_PROGS = src/vunify src/vbuild src/vcheck +src_sbin_CXX_PROGS = src/vfiles +src_pkglib_CXX_PROGS = src/vbuild src/vcheck + +src_pkglib_C99_PROGS = src/vunify + src_OPTIONS_EXEMPT = src/parserpmdump \ src/readlink \ @@ -27,17 +30,13 @@ src_OPTIONS_EXEMPT = src/parserpmdump \ src/vcheck \ src/vreboot \ src/save_ctxinfo \ - src/vunify \ src/mask2prefix \ src/pipe-sync \ src/capchroot \ src/chroot-cat \ src/filetime \ src/ifspec \ - src/chbind \ - src/chcontext \ src/rebootmgr \ - src/reducecap \ src/vlimit \ src/vdu \ src/vfiles \ @@ -46,55 +45,64 @@ src_OPTIONS_EXEMPT = src/parserpmdump \ src_DIETPROGS = src/new-namespace \ + src/chcontext \ src/secure-mount \ src/save_ctxinfo \ src/mask2prefix \ + src/chbind \ src/chroot-cat \ src/chroot-rm \ src/exec-cd \ src/fakerunlevel \ src/pipe-sync \ src/exec-ulimit \ + src/vps \ src/lsxid \ src/chxid \ + src/reducecap \ src/showattr \ src/setattr \ src/vlimit \ src/vunify \ + src/vuname \ src/rpm-fake-resolver \ src/vkill \ + src/vrsetup \ src/vserver-stat \ src/vserver-info src_HDRS = src/vutil.h src/vutil.p src/util.h \ - src/wrappers.h src/wrappers-vserver.h \ src/fstool.h \ src/compat-pivot_root.h \ src/stack-start.h \ + src/sys_clone.h \ src/vunify-matchlist.h \ - src/vunify-operations.h \ - src/wrappers-dirent.h \ + src/vunify.h \ + src/vunify-compare.hc \ + src/vunify-doit.hc \ + src/vunify-init.hc \ src/vserver.hh src_pkglib_SCRPTS = -src_pkglib_PRGS = src/capchroot \ - src/chroot-cat \ - src/chroot-rm \ - src/fakerunlevel \ - src/filetime \ - src/ifspec \ - src/listdevip \ - src/parserpmdump \ - 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_pkglib_CXX_PROGS) +src_pkglib_PRGS = src/capchroot \ + src/chroot-cat \ + src/chroot-rm \ + src/fakerunlevel \ + src/filetime \ + src/ifspec \ + src/listdevip \ + src/parserpmdump \ + 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_pkglib_C99_X_PROGS) \ + $(src_pkglib_CXX_X_PROGS) src_pkglib_LTLIBS = src/rpm-fake.la src_lib_LTLIBS = @@ -105,6 +113,7 @@ src_sbin_PRGS = src/chbind \ src/exec-cd \ src/lsxid \ src/chxid \ + src/vps \ src/showattr \ src/setattr \ src/rebootmgr \ @@ -113,9 +122,11 @@ src_sbin_PRGS = src/chbind \ src/new-namespace \ src/vlimit \ src/vkill \ + src/vrsetup \ src/vserver-stat \ src/vserver-info \ - $(src_sbin_CXX_PROGS) + src/vuname \ + $(src_sbin_CXX_X_PROGS) src_capchroot_SOURCES = src/capchroot.c src_capchroot_LDADD = lib/libvserver.la @@ -125,7 +136,7 @@ src_chbind_SOURCES = src/chbind.c src_chbind_LDADD = lib/libvserver.la src_chbind_LDFLAGS = $(VSERVER_LDFLAGS) -src_chcontext_SOURCES = src/chcontext.c +src_chcontext_SOURCES = src/chcontext.c src/util-exitlikeprocess.c src_chcontext_LDADD = lib/libvserver.la src_chcontext_LDFLAGS = $(VSERVER_LDFLAGS) @@ -159,10 +170,11 @@ src_save_ctxinfo_SOURCES = src/save_ctxinfo.c src_save_ctxinfo_LDADD = lib/libvserver.la 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_new_namespace_SOURCES = src/new-namespace.c \ + src/util-exitlikeprocess.c +src_secure_mount_SOURCES = src/secure-mount.c src_rpm_fake_resolver_SOURCES = src/rpm-fake-resolver.c src_rpm_fake_resolver_LDADD = lib/libvserver.la @@ -170,12 +182,16 @@ 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_LDFLAGS = $(VSERVER_LDFLAGS) + src_vserver_info_SOURCES = src/vserver-info.c src_vserver_info_LDADD = lib/libvserver.la 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 = lib/libvserver.la libensc_vector.a src_vserver_stat_LDFLAGS = $(VSERVER_LDFLAGS) src_vfiles_SOURCES = src/vfiles.cc src/vutil.cc src/vserver.cc @@ -183,8 +199,8 @@ 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 -src_lsxid_LDFLAGS = $(VSERVER_LDFLAGS) +src_lsxid_LDADD = lib/libvserver.la libensc_vector.a +src_lsxid_LDFLAGS = $(VSERVER_LDFLAGS) src_chxid_SOURCES = src/fstool.c src/util-safechdir.c \ src/fstool-resolvectx.c src/chxid.c @@ -200,10 +216,16 @@ src_setattr_LDADD = lib/libvserver.la src_setattr_LDFLAGS = $(VSERVER_LDFLAGS) -src_vunify_SOURCES = src/vunify.c \ - src/util-safechdir.c \ - src/vunify-matchlist.c \ - src/vunify-operations.c +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_LDFLAGS = $(VSERVER_LDFLAGS) + +src_vuname_SOURCES = src/vuname.c +src_vuname_LDADD = lib/libvserver.la +src_vuname_LDFLAGS = $(VSERVER_LDFLAGS) src_rpm_fake_la_SOURCES = src/rpm-fake.c src_rpm_fake_la_CFLAGS = $(AM_CFLAGS) @@ -215,16 +237,24 @@ src_check_SCRPTS = $(src_testsuite_check_SCRPTS) src_TSTS = $(src_testsuite_TSTS) src_XTRAS = $(src_testsuite_XTRAS) -src_EXTRA_PROGS = $(src_sbin_CXX_X_PROGS) $(src_pkglib_CXX_X_PROGS) +src_EXTRA_PROGS = $(src_sbin_CXX_PROGS) $(src_pkglib_CXX_PROGS) src_TESTS_ENV = srctestsuitedir=$(top_builddir)/src/testsuite +if ENSC_HAVE_C99_COMPILER +src_sbin_C99_X_PROGS = $(src_sbin_C99_PROGS) +src_pkglib_C99_X_PROGS = $(src_pkglib_C99_PROGS) +else +src_sbin_C99_X_PROGS = +src_pkglib_C99_X_PROGS = +endif + if ENSC_HAVE_CXX_COMPILER -src_sbin_CXX_PROGS = $(src_sbin_CXX_X_PROGS) -src_pkglib_CXX_PROGS = $(src_pkglib_CXX_X_PROGS) +src_sbin_CXX_X_PROGS = $(src_sbin_CXX_PROGS) +src_pkglib_CXX_X_PROGS = $(src_pkglib_CXX_PROGS) else -src_sbin__PROGS = -src_pkglib_CXX_PROGS = +src_sbin_CXX_X_PROGS = +src_pkglib_CXX_X_PROGS = endif install-exec-hook: src_install_exec_hook