X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fsrc%2FMakefile-files;h=33d636ed3fcbf13a10295469eae81a80f6f67922;hb=be9d3a848e765cfc4c79802016d664da6200cc15;hp=a88340ef22ab78153ea03a64914232836eb1ffc9;hpb=cd128444ace7595e92b9d8fb367483fe0ff2997a;p=util-vserver.git diff --git a/util-vserver/src/Makefile-files b/util-vserver/src/Makefile-files index a88340e..33d636e 100644 --- a/util-vserver/src/Makefile-files +++ b/util-vserver/src/Makefile-files @@ -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/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 \ @@ -34,7 +37,6 @@ src_OPTIONS_EXEMPT = src/parserpmdump \ src/filetime \ src/ifspec \ src/chbind \ - src/chcontext \ src/rebootmgr \ src/reducecap \ src/vlimit \ @@ -45,6 +47,7 @@ src_OPTIONS_EXEMPT = src/parserpmdump \ src_DIETPROGS = src/new-namespace \ + src/chcontext \ src/secure-mount \ src/save_ctxinfo \ src/mask2prefix \ @@ -61,8 +64,10 @@ src_DIETPROGS = src/new-namespace \ src/setattr \ src/vlimit \ src/vunify \ + src/vuname \ src/rpm-fake-resolver \ src/vkill \ + src/vrsetup \ src/vserver-stat \ src/vserver-info @@ -98,8 +103,8 @@ src_pkglib_PRGS = src/capchroot \ src/pipe-sync \ src/exec-ulimit \ src/rpm-fake-resolver \ - src/vunify \ - $(src_pkglib_CXX_PROGS) + $(src_pkglib_C99_X_PROGS) \ + $(src_pkglib_CXX_X_PROGS) src_pkglib_LTLIBS = src/rpm-fake.la src_lib_LTLIBS = @@ -119,9 +124,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 @@ -131,7 +138,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) @@ -217,6 +224,10 @@ src_vunify_SOURCES = src/vunify.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) src_rpm_fake_la_LDFLAGS = -module -avoid-version -rpath $(pkglibdir) @@ -227,16 +238,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