X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2FMakefile-files;h=a9a18b68bba2b035c3798d800530623f87d5a1bd;hb=da00467717303bf7c7f584af0572b5df6182e3a3;hp=33e17cbfcbe28a1ebe134ef1c2459be1cc234ad8;hpb=df13e5523df231124858003c93bdaa3b7a361f07;p=util-vserver.git diff --git a/src/Makefile-files b/src/Makefile-files index 33e17cb..a9a18b6 100644 --- a/src/Makefile-files +++ b/src/Makefile-files @@ -17,9 +17,6 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ## -src_sbin_CXX_PROGS = -src_pkglib_CXX_PROGS = - src_pkglib_C99_PROGS = src/vunify src/vcopy src/vclone @@ -60,7 +57,6 @@ DIETPROGS += src/chcontext-compat \ src/sigexec \ src/vattribute \ src/vlimit \ - src/vnamespace \ src/vunify \ src/vuname \ src/rpm-fake-resolver \ @@ -84,7 +80,9 @@ DIETPROGS += src/chcontext-compat \ src/h2ext \ src/vtag \ src/vspace \ - src/vmemctrl + src/vmemctrl \ + src/tunctl \ + src/exec-remount if ENSC_CAN_CRYPTO_WITH_DIETLIBC DIETPROGS += src/vhashify @@ -101,7 +99,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,8 +122,9 @@ pkglib_PROGRAMS += src/capchroot \ src/chbind-compat \ src/vsysctl \ src/h2ext \ - $(src_pkglib_C99_X_PROGS) \ - $(src_pkglib_CXX_X_PROGS) + src/tunctl \ + src/exec-remount \ + $(src_pkglib_C99_X_PROGS) if ENSC_HAVE_C99_COMPILER if ENSC_HAVE_CRYPTO @@ -153,7 +153,6 @@ sbin_PROGRAMS += src/exec-cd \ src/vcontext \ src/vlimit \ src/vkill \ - src/vnamespace \ src/vrsetup \ src/vsched \ src/vserver-stat \ @@ -166,8 +165,7 @@ sbin_PROGRAMS += src/exec-cd \ src/vdevmap \ src/vtag \ src/vspace \ - src/vmemctrl \ - $(src_sbin_CXX_X_PROGS) + src/vmemctrl if ENSC_HAVE_C99_COMPILER sbin_PROGRAMS += src/vdlimit @@ -243,10 +241,6 @@ src_vattribute_SOURCES = src/vattribute.c src_vattribute_LDADD = $(VSERVER_LDADDS) src_vattribute_LDFLAGS = $(VSERVER_LDFLGS) -src_vnamespace_SOURCES = src/vnamespace.c -src_vnamespace_LDADD = $(VSERVER_LDADDS) $(LIBINTERNAL) -src_vnamespace_LDFLAGS = $(VSERVER_LDFLGS) - src_rpm_fake_resolver_SOURCES = src/rpm-fake-resolver.c src_rpm_fake_resolver_LDADD = $(VSERVER_LDADDS) src_rpm_fake_resolver_LDFLAGS = $(VSERVER_LDFLGS) @@ -361,7 +355,13 @@ src_vmemctrl_SOURCES = src/vmemctrl.c src_vmemctrl_LDADD = $(VSERVER_LDADDS) $(LIBINTERNAL) src_vmemctrl_LDFLAGS = $(VSERVER_LDFLGS) -EXTRA_PROGRAMS += $(src_sbin_CXX_PROGS) $(src_pkglib_CXX_PROGS) +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) TESTS_ENVIRONMENT += srctestsuitedir=$(top_builddir)/src/testsuite @@ -373,14 +373,6 @@ src_sbin_C99_X_PROGS = src_pkglib_C99_X_PROGS = endif -if ENSC_HAVE_CXX_COMPILER -src_sbin_CXX_X_PROGS = $(src_sbin_CXX_PROGS) -src_pkglib_CXX_X_PROGS = $(src_pkglib_CXX_PROGS) -else -src_sbin_CXX_X_PROGS = -src_pkglib_CXX_X_PROGS = -endif - install-exec-hook: src_install_exec_hook src_install_exec_hook: