X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2FMakefile-files;h=c24d11a41ea178cde64641446e50f01484acbdb9;hb=4dd2d44ee45230e79b4797f162cdbbf767cad41c;hp=704a86ae888f0f24902f97c891d3967bc6f64be2;hpb=ea9ae97995b5e59360e14af5e57d46dca3ee1839;p=util-vserver.git diff --git a/src/Makefile-files b/src/Makefile-files index 704a86a..c24d11a 100644 --- a/src/Makefile-files +++ b/src/Makefile-files @@ -80,9 +80,14 @@ DIETPROGS += src/chcontext-compat \ src/naddress \ src/vdevmap \ src/vsysctl \ - src/vclone - -if ENSC_CAN_BEECRYPT_WITH_DIETLIBC + src/vclone \ + src/h2ext \ + src/vtag \ + src/vspace \ + src/vmemctrl \ + src/tunctl + +if ENSC_CAN_CRYPTO_WITH_DIETLIBC DIETPROGS += src/vhashify endif @@ -118,13 +123,15 @@ pkglib_PROGRAMS += src/capchroot \ src/sigexec \ src/chbind-compat \ src/vsysctl \ + src/h2ext \ + src/tunctl \ $(src_pkglib_C99_X_PROGS) \ $(src_pkglib_CXX_X_PROGS) if ENSC_HAVE_C99_COMPILER -if ENSC_HAVE_BEECRYPT +if ENSC_HAVE_CRYPTO pkglib_PROGRAMS += src/vhashify -endif ENSC_HAVE_BEECRYPT +endif ENSC_HAVE_CRYPTO endif ENSC_HAVE_C99_COMPILER legacy_PROGRAMS += src/ifspec \ @@ -159,6 +166,9 @@ sbin_PROGRAMS += src/exec-cd \ src/nattribute \ src/naddress \ src/vdevmap \ + src/vtag \ + src/vspace \ + src/vmemctrl \ $(src_sbin_CXX_X_PROGS) if ENSC_HAVE_C99_COMPILER @@ -210,7 +220,7 @@ src_reducecap_LDFLAGS = $(VSERVER_LDFLGS) src_vkill_SOURCES = src/vkill.c src_vkill_LDADD = $(VSERVER_LDADDS) -src_vkill_LDFLAGS = $(VSERVER_LDFLGS) +src_vkill_LDFLAGS = $(VSERVER_LDFLGS) $(LIBINTERNAL) src_vkill_CPPFLAGS = $(AM_CPPFLAGS) -DLEGACYDIR=\"$(legacydir)\" src_vlimit_SOURCES = src/vlimit.c @@ -287,12 +297,13 @@ src_vunify_LDADD = $(LIBINTERNAL) $(VSERVER_LDADDS) src_vunify_LDFLAGS = $(VSERVER_LDFLGS) src_vhashify_SOURCES = src/vhashify.c -if ENSC_CAN_BEECRYPT_WITH_DIETLIBC -src_vhashify_LDADD = $(LIBINTERNAL) $(LIBENSCVECTOR) -lbeecrypt $(VSERVER_LDADDS) +src_vhashify_CFLAGS = $(AM_CFLAGS) $(ENSC_CRYPTO_CFLAGS) +if ENSC_CAN_CRYPTO_WITH_DIETLIBC +src_vhashify_LDADD = $(LIBINTERNAL) $(LIBENSCVECTOR) $(ENSC_CRYPTO_LIB) $(VSERVER_LDADDS) src_vhashify_LDFLAGS = $(VSERVER_LDFLGS) else -src_vhashify_LDADD = $(LIBINTERNAL_GLIBC) $(LIBENSCVECTOR_GLIBC) $(LIBVSERVER_GLIBC) -lbeecrypt -src_vhashify_LDFLAGS = +src_vhashify_LDADD = $(LIBINTERNAL_GLIBC) $(LIBENSCVECTOR_GLIBC) $(LIBVSERVER_GLIBC) $(ENSC_CRYPTO_LIB) +src_vhashify_LDFLAGS = -Wl,--as-needed endif src_vuname_SOURCES = src/vuname.c @@ -336,6 +347,26 @@ src_vclone_SOURCES = src/vclone.c src_vclone_LDADD = $(LIBINTERNAL) $(VSERVER_LDADDS) src_vclone_LDFLAGS = $(VSERVER_LDLFGS) +src_h2ext_SOURCES = src/h2ext.c +src_h2ext_LDADD = $(LIBINTERNAL) $(VSERVER_LDADDS) +src_h2ext_LDFLAGS = $(VSERVER_LDFLGS) + +src_vtag_SOURCES = src/vtag.c +src_vtag_LDADD = $(VSERVER_LDADDS) +src_vtag_LDFLAGS = $(VSERVER_LDADDS) + +src_vspace_SOURCES = src/vspace.c +src_vspace_LDADD = $(VSERVER_LDADDS) $(LIBINTERNAL) +src_vspace_LDFLAGS = $(VSERVER_LDFLGS) + +src_vmemctrl_SOURCES = src/vmemctrl.c +src_vmemctrl_LDADD = $(VSERVER_LDADDS) $(LIBINTERNAL) +src_vmemctrl_LDFLAGS = $(VSERVER_LDFLGS) + +src_tunctl_SOURCES = src/tunctl.c +src_tunctl_LDADD = $(VSERVER_LDADDS) $(LIBINTERNAL) +src_tunctl_LDFLAGS = $(VSERVER_LDFLGS) + EXTRA_PROGRAMS += $(src_sbin_CXX_PROGS) $(src_pkglib_CXX_PROGS) TESTS_ENVIRONMENT += srctestsuitedir=$(top_builddir)/src/testsuite