X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2FMakefile-files;h=faacdfff0a89b037118a381e9da0d807c5899b3e;hb=88847d302dd8df68f18a2f02a13ca579a83fb26f;hp=34a5be1e48253e0a423fcceb6566bd531cdb3e2a;hpb=5ee5e9157572fe9047a12be75af60fa32f0a60a8;p=util-vserver.git diff --git a/src/Makefile-files b/src/Makefile-files index 34a5be1..faacdff 100644 --- a/src/Makefile-files +++ b/src/Makefile-files @@ -84,9 +84,10 @@ DIETPROGS += src/chcontext-compat \ src/h2ext \ src/vtag \ src/vspace \ - src/vmemctrl + src/vmemctrl \ + src/tunctl -if ENSC_CAN_BEECRYPT_WITH_DIETLIBC +if ENSC_CAN_CRYPTO_WITH_DIETLIBC DIETPROGS += src/vhashify endif @@ -101,7 +102,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 \ @@ -123,13 +125,14 @@ pkglib_PROGRAMS += src/capchroot \ 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 \ @@ -295,12 +298,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 @@ -360,6 +364,10 @@ 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