X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2FMakefile-files;h=3ffda07c41a36a602fa15d5c1fb1c7fe80f1c0fb;hb=8ba515c4f3b4fd99e223577e000dbd750e1233ef;hp=dad36c17bc78306255ff3c4aca10fa6f8f35eba1;hpb=6748c9f084926d640133c27eea34c34bb07c1191;p=util-vserver.git diff --git a/src/Makefile-files b/src/Makefile-files index dad36c1..3ffda07 100644 --- a/src/Makefile-files +++ b/src/Makefile-files @@ -81,9 +81,14 @@ DIETPROGS += src/chcontext-compat \ src/vdevmap \ src/vsysctl \ src/vclone \ - src/h2ext + src/h2ext \ + src/vtag \ + src/vspace \ + src/vmemctrl \ + src/tunctl \ + src/exec-remount -if ENSC_CAN_BEECRYPT_WITH_DIETLIBC +if ENSC_CAN_CRYPTO_WITH_DIETLIBC DIETPROGS += src/vhashify endif @@ -98,7 +103,8 @@ noinst_HEADERS += src/capability-compat.h \ src/vhashify.h \ src/vhashify-init.hc \ src/vserver-visitdir.hc \ - src/context-sync.hc + src/context-sync.hc \ + src/attribute-util.h pkglib_PROGRAMS += src/capchroot \ src/chain-echo \ @@ -120,13 +126,15 @@ pkglib_PROGRAMS += src/capchroot \ src/chbind-compat \ src/vsysctl \ src/h2ext \ + src/tunctl \ + src/exec-remount \ $(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 \ @@ -161,6 +169,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 @@ -289,12 +300,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 @@ -342,6 +354,26 @@ 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) + +src_exec_remount_SOURCES = src/exec-remount.c +src_exec_remount_LDADD = $(VSERVER_LDADDS) +src_exec_remount_LDFLAGS = $(VSERVER_LDFLGS) + EXTRA_PROGRAMS += $(src_sbin_CXX_PROGS) $(src_pkglib_CXX_PROGS) TESTS_ENVIRONMENT += srctestsuitedir=$(top_builddir)/src/testsuite