gentoo: use /var/run for new /run compatibility
[util-vserver.git] / src / Makefile-files
index c24d11a..a9a18b6 100644 (file)
@@ -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 \
@@ -85,7 +81,8 @@ DIETPROGS +=          src/chcontext-compat \
                        src/vtag \
                        src/vspace \
                        src/vmemctrl \
-                       src/tunctl
+                       src/tunctl \
+                       src/exec-remount
 
 if ENSC_CAN_CRYPTO_WITH_DIETLIBC
 DIETPROGS +=           src/vhashify
@@ -102,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 \
@@ -125,8 +123,8 @@ pkglib_PROGRAMS +=  src/capchroot \
                        src/vsysctl \
                        src/h2ext \
                        src/tunctl \
-                       $(src_pkglib_C99_X_PROGS) \
-                       $(src_pkglib_CXX_X_PROGS)
+                       src/exec-remount \
+                       $(src_pkglib_C99_X_PROGS)
 
 if ENSC_HAVE_C99_COMPILER
 if ENSC_HAVE_CRYPTO
@@ -155,7 +153,6 @@ sbin_PROGRAMS +=    src/exec-cd \
                        src/vcontext \
                        src/vlimit \
                        src/vkill \
-                       src/vnamespace \
                        src/vrsetup \
                        src/vsched \
                        src/vserver-stat \
@@ -168,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
@@ -245,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)
@@ -367,7 +359,9 @@ 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)
+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
 
@@ -379,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: