From b46b2810f3e7caf40227f14f1bda2e93e3e6e7dc Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Sat, 19 Mar 2005 02:07:22 +0000 Subject: [PATCH] moved vdlimit into the only-C99 section build vhashify only with C99 and beecrypt cleanups git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@1938 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- util-vserver/src/Makefile-files | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/util-vserver/src/Makefile-files b/util-vserver/src/Makefile-files index 5ccccdf..4f5b1e0 100644 --- a/util-vserver/src/Makefile-files +++ b/util-vserver/src/Makefile-files @@ -20,7 +20,7 @@ src_sbin_CXX_PROGS = src/vfiles src_pkglib_CXX_PROGS = src/vbuild src/vcheck -src_pkglib_C99_PROGS = src/vunify src/vcopy src/vhashify +src_pkglib_C99_PROGS = src/vunify src/vcopy AM_INSTALLCHECK_STD_OPTIONS_EXEMPT += \ @@ -77,7 +77,7 @@ DIETPROGS += src/chcontext-compat \ src/vserver-info \ src/vdlimit -if CAN_BEECRYPT_WITH_DIETLIBC +if ENSC_CAN_BEECRYPT_WITH_DIETLIBC DIETPROGS += src/vhashify endif @@ -91,7 +91,7 @@ noinst_HEADERS += src/vutil.h src/vutil.p \ src/vunify.h \ src/vunify-init.hc \ src/vhashify.h \ - src/vhashify-init.hc + src/vhashify-init.hc \ src/vserver-visitdir.hc \ src/context-sync.hc \ src/vserver.hh @@ -117,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 \ @@ -137,7 +143,6 @@ sbin_PROGRAMS += src/chbind \ src/vdu \ src/vattribute \ src/vcontext \ - src/vdlimit \ src/vlimit \ src/vkill \ src/vnamespace \ @@ -148,6 +153,11 @@ sbin_PROGRAMS += src/chbind \ src/vuname \ $(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_LDFLGS) @@ -270,7 +280,7 @@ src_vunify_LDADD = $(LIBINTERNAL) $(VSERVER_LDADDS) src_vunify_LDFLAGS = $(VSERVER_LDFLGS) src_vhashify_SOURCES = src/vhashify.c -if CAN_BEECRYPT_WITH_DIETLIBC +if ENSC_CAN_BEECRYPT_WITH_DIETLIBC src_vhashify_LDADD = $(LIBINTERNAL) $(LIBENSCVECTOR) -lbeecrypt $(VSERVER_LDADDS) src_vhashify_LDFLAGS = $(VSERVER_LDFLGS) else -- 1.8.1.5