util-vserver 0.30.215.
[util-vserver.git] / src / Makefile-files
index 5def348..bfe10ce 100644 (file)
@@ -1,4 +1,4 @@
-## $Id: Makefile-files,v 1.70 2005/07/02 09:17:55 ensc Exp $  -*- makefile -*-
+## $Id: Makefile-files 2697 2008-03-01 01:24:07Z dhozac $  -*- makefile -*-
 
 ## Copyright (C) 2003,2004 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
 ##  
@@ -20,7 +20,7 @@
 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 += \
@@ -33,7 +33,6 @@ AM_INSTALLCHECK_STD_OPTIONS_EXEMPT += \
                        src/mask2prefix \
                        src/ifspec \
                        src/rebootmgr \
-                       src/vdu \
                        src/vfiles
 
 DIETPROGS +=           src/chcontext-compat \
@@ -47,7 +46,7 @@ DIETPROGS +=          src/chcontext-compat \
                        src/secure-mount \
                        src/save_ctxinfo \
                        src/mask2prefix \
-                       src/chbind \
+                       src/chbind-compat \
                        src/exec-cd \
                        src/fakerunlevel \
                        src/keep-ctx-alive \
@@ -74,9 +73,21 @@ DIETPROGS +=         src/chcontext-compat \
                        src/vserver-stat \
                        src/vserver-info \
                        src/vdlimit \
-                       src/vwait
-
-if ENSC_CAN_BEECRYPT_WITH_DIETLIBC
+                       src/vdu \
+                       src/vwait \
+                       src/ncontext \
+                       src/nattribute \
+                       src/naddress \
+                       src/vdevmap \
+                       src/vsysctl \
+                       src/vclone \
+                       src/h2ext \
+                       src/vtag \
+                       src/vspace \
+                       src/vmemctrl \
+                       src/tunctl
+
+if ENSC_CAN_CRYPTO_WITH_DIETLIBC
 DIETPROGS +=           src/vhashify
 endif
 
@@ -91,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 \
@@ -110,13 +122,17 @@ pkglib_PROGRAMS +=        src/capchroot \
                        src/rpm-fake-resolver \
                        src/vshelper-sync \
                        src/sigexec \
+                       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 \
@@ -128,8 +144,7 @@ legacy_PROGRAMS +=  src/ifspec \
 
 pkglib_LTLIBRARIES +=  src/rpm-fake.la
 
-sbin_PROGRAMS +=       src/chbind \
-                       src/exec-cd \
+sbin_PROGRAMS +=       src/exec-cd \
                        src/lsxid \
                        src/chxid \
                        src/vps \
@@ -148,6 +163,13 @@ sbin_PROGRAMS +=   src/chbind \
                        src/vserver-info \
                        src/vuname \
                        src/vwait \
+                       src/ncontext \
+                       src/nattribute \
+                       src/naddress \
+                       src/vdevmap \
+                       src/vtag \
+                       src/vspace \
+                       src/vmemctrl \
                        $(src_sbin_CXX_X_PROGS)
 
 if ENSC_HAVE_C99_COMPILER
@@ -159,20 +181,20 @@ src_capchroot_SOURCES =           src/capchroot.c
 src_capchroot_LDADD =          $(VSERVER_LDADDS)
 src_capchroot_LDFLAGS =                $(VSERVER_LDFLGS)
 
-src_chbind_SOURCES =           src/chbind.c
-src_chbind_LDADD =             $(VSERVER_LDADDS)
-src_chbind_LDFLAGS =           $(VSERVER_LDFLGS)
+src_chbind_compat_SOURCES =    src/chbind.c
+src_chbind_compat_LDADD =      $(VSERVER_LDADDS)
+src_chbind_compat_LDFLAGS =    $(VSERVER_LDFLGS)
 
 src_chcontext_compat_SOURCES = src/chcontext.c
 src_chcontext_compat_LDADD =   $(VSERVER_LDADDS) $(LIBINTERNAL)
 src_chcontext_compat_LDFLAGS = $(VSERVER_LDFLGS)
 
-src_vcontext_SOURCES           =  src/vcontext.c
+src_vcontext_SOURCES           =  src/vcontext.c src/vlogin.c
 src_vcontext_LDADD             =  $(VSERVER_LDADDS) $(LIBINTERNAL)
 src_vcontext_LDFLAGS           =  $(VSERVER_LDFLGS)
 
 src_vsched_SOURCES             =  src/vsched.c
-src_vsched_LDADD               =  $(VSERVER_LDADDS)
+src_vsched_LDADD               =  $(VSERVER_LDADDS) $(LIBINTERNAL)
 src_vsched_LDFLAGS             =  $(VSERVER_LDFLGS)
 
 src_filetime_SOURCES           =  src/filetime.c
@@ -181,6 +203,7 @@ src_filetime_LDFLAGS                =  $(VSERVER_LDFLGS)
 
 src_chain_echo_SOURCES         =  src/chain-echo.c
 src_chroot_sh_SOURCES          =  src/chroot-sh.c
+src_chroot_sh_LDADD            =  $(LIBINTERNAL)
 src_exec_cd_SOURCES            =  src/exec-cd.c
 src_fakerunlevel_SOURCES       =  src/fakerunlevel.c
 src_ifspec_SOURCES             =  src/ifspec.c
@@ -198,7 +221,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
@@ -209,7 +232,10 @@ src_save_ctxinfo_SOURCES   =  src/save_ctxinfo.c
 src_save_ctxinfo_LDADD         =  $(VSERVER_LDADDS)
 src_save_ctxinfo_LDFLAGS       =  $(VSERVER_LDFLGS)
 
-src_vdu_SOURCES =              src/vdu.c
+src_vdu_SOURCES                =  src/vdu.c
+src_vdu_LDADD                  =  $(VSERVER_LDADDS) $(LIBINTERNAL)
+src_vdu_LDFLAGS                        =  $(VSERVER_LDFLGS)
+
 src_vreboot_SOURCES =          src/vreboot.c
 
 src_secure_mount_SOURCES =     src/secure-mount.c
@@ -272,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
@@ -297,6 +324,50 @@ src_vwait_SOURCES          = src/vwait.c
 src_vwait_LDADD                        = $(VSERVER_LDADDS)
 src_vwait_LDFLAGS              = $(VSERVER_LDFLGS)
 
+src_ncontext_SOURCES           = src/ncontext.c
+src_ncontext_LDADD             = $(VSERVER_LDADDS) $(LIBINTERNAL)
+src_ncontext_LDFLAGS           = $(VSERVER_LDFLGS)
+
+src_nattribute_SOURCES         = src/nattribute.c
+src_nattribute_LDADD           = $(VSERVER_LDADDS)
+src_nattribute_LDFLAGS         = $(VSERVER_LDFLGS)
+
+src_naddress_SOURCES           = src/naddress.c
+src_naddress_LDADD             = $(VSERVER_LDADDS) $(LIBINTERNAL)
+src_naddress_LDFLAGS           = $(VSERVER_LDFLGS)
+
+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)
+
 EXTRA_PROGRAMS +=              $(src_sbin_CXX_PROGS) $(src_pkglib_CXX_PROGS)
 
 TESTS_ENVIRONMENT +=           srctestsuitedir=$(top_builddir)/src/testsuite