X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2FMakefile-files;h=faacdfff0a89b037118a381e9da0d807c5899b3e;hb=cedbecf970f1f683472c337f19c02f3b93b06b52;hp=c374c1116ba09de851bbce36abf946a08f879104;hpb=d551c7d26f91aab498645827fd77cc36d6c3459c;p=util-vserver.git diff --git a/src/Makefile-files b/src/Makefile-files index c374c11..faacdff 100644 --- a/src/Makefile-files +++ b/src/Makefile-files @@ -83,9 +83,11 @@ DIETPROGS += src/chcontext-compat \ src/vclone \ src/h2ext \ src/vtag \ - src/vspace + src/vspace \ + src/vmemctrl \ + src/tunctl -if ENSC_CAN_BEECRYPT_WITH_DIETLIBC +if ENSC_CAN_CRYPTO_WITH_DIETLIBC DIETPROGS += src/vhashify endif @@ -100,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 \ @@ -122,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 \ @@ -165,6 +169,7 @@ sbin_PROGRAMS += src/exec-cd \ src/vdevmap \ src/vtag \ src/vspace \ + src/vmemctrl \ $(src_sbin_CXX_X_PROGS) if ENSC_HAVE_C99_COMPILER @@ -293,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 @@ -350,9 +356,17 @@ 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_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)