gentoo: use /var/run for new /run compatibility
[util-vserver.git] / src / Makefile-files
index 01f8af2..a9a18b6 100644 (file)
 ## 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_pkglib_C99_PROGS = src/vunify src/vcopy src/vclone
 
 
 AM_INSTALLCHECK_STD_OPTIONS_EXEMPT += \
@@ -60,7 +57,6 @@ DIETPROGS +=          src/chcontext-compat \
                        src/sigexec \
                        src/vattribute \
                        src/vlimit \
-                       src/vnamespace \
                        src/vunify \
                        src/vuname \
                        src/rpm-fake-resolver \
@@ -77,9 +73,18 @@ DIETPROGS +=         src/chcontext-compat \
                        src/vwait \
                        src/ncontext \
                        src/nattribute \
-                       src/naddress
-
-if ENSC_CAN_BEECRYPT_WITH_DIETLIBC
+                       src/naddress \
+                       src/vdevmap \
+                       src/vsysctl \
+                       src/vclone \
+                       src/h2ext \
+                       src/vtag \
+                       src/vspace \
+                       src/vmemctrl \
+                       src/tunctl \
+                       src/exec-remount
+
+if ENSC_CAN_CRYPTO_WITH_DIETLIBC
 DIETPROGS +=           src/vhashify
 endif
 
@@ -94,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 \
@@ -114,13 +120,16 @@ pkglib_PROGRAMS +=        src/capchroot \
                        src/vshelper-sync \
                        src/sigexec \
                        src/chbind-compat \
-                       $(src_pkglib_C99_X_PROGS) \
-                       $(src_pkglib_CXX_X_PROGS)
+                       src/vsysctl \
+                       src/h2ext \
+                       src/tunctl \
+                       src/exec-remount \
+                       $(src_pkglib_C99_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 \
@@ -144,7 +153,6 @@ sbin_PROGRAMS +=    src/exec-cd \
                        src/vcontext \
                        src/vlimit \
                        src/vkill \
-                       src/vnamespace \
                        src/vrsetup \
                        src/vsched \
                        src/vserver-stat \
@@ -154,7 +162,10 @@ sbin_PROGRAMS +=   src/exec-cd \
                        src/ncontext \
                        src/nattribute \
                        src/naddress \
-                       $(src_sbin_CXX_X_PROGS)
+                       src/vdevmap \
+                       src/vtag \
+                       src/vspace \
+                       src/vmemctrl
 
 if ENSC_HAVE_C99_COMPILER
 sbin_PROGRAMS +=       src/vdlimit
@@ -205,7 +216,7 @@ src_reducecap_LDFLAGS               =  $(VSERVER_LDFLGS)
 
 src_vkill_SOURCES              =  src/vkill.c
 src_vkill_LDADD                        =  $(VSERVER_LDADDS)
-src_vkill_LDFLAGS              =  $(VSERVER_LDFLGS)
+src_vkill_LDFLAGS              =  $(VSERVER_LDFLGS) $(LIBINTERNAL)
 src_vkill_CPPFLAGS             =  $(AM_CPPFLAGS) -DLEGACYDIR=\"$(legacydir)\"
 
 src_vlimit_SOURCES             =  src/vlimit.c
@@ -230,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)
@@ -282,12 +289,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
@@ -316,10 +324,44 @@ src_nattribute_LDADD              = $(VSERVER_LDADDS)
 src_nattribute_LDFLAGS         = $(VSERVER_LDFLGS)
 
 src_naddress_SOURCES           = src/naddress.c
-src_naddress_LDADD             = $(VSERVER_LDADDS)
+src_naddress_LDADD             = $(VSERVER_LDADDS) $(LIBINTERNAL)
 src_naddress_LDFLAGS           = $(VSERVER_LDFLGS)
 
-EXTRA_PROGRAMS +=              $(src_sbin_CXX_PROGS) $(src_pkglib_CXX_PROGS)
+src_vdevmap_SOURCES            = src/vdevmap.c
+src_vdevmap_LDADD              = $(VSERVER_LDADDS) $(LIBINTERNAL)
+src_vdevmap_LDFLAGS            = $(VSERVER_LDFLGS)
+
+src_vsysctl_SOURCES            = src/vsysctl.c
+src_vsysctl_LDADD              = $(VSERVER_LDADDS)
+src_vsysctl_LDFLAGS            = $(VSERVER_LDFLGS)
+
+src_vclone_SOURCES             = src/vclone.c
+src_vclone_LDADD               = $(LIBINTERNAL) $(VSERVER_LDADDS)
+src_vclone_LDFLAGS             = $(VSERVER_LDLFGS)
+
+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)
 
 TESTS_ENVIRONMENT +=           srctestsuitedir=$(top_builddir)/src/testsuite
 
@@ -331,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: