X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=src%2FMakefile-files;h=4283ac0f5a48c61a0ea5d50cd3ec6bbdcd2957d0;hb=fc28db1eb4146796ec27c2fb15780d6303120261;hp=5def348c967a0b648af35f9cb3bcf1d0b35d0095;hpb=8cf13bb177d92c93eb73dc8939777150536c2d00;p=util-vserver.git

diff --git a/src/Makefile-files b/src/Makefile-files
index 5def348..4283ac0 100644
--- a/src/Makefile-files
+++ b/src/Makefile-files
@@ -1,4 +1,4 @@
-## $Id: Makefile-files,v 1.70 2005/07/02 09:17:55 ensc Exp $  -*- makefile -*-
+## $Id: Makefile-files 2385 2006-11-20 00:23:13Z dhozac $  -*- makefile -*-
 
 ## Copyright (C) 2003,2004 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
 ##  
@@ -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,7 +73,11 @@ DIETPROGS +=		src/chcontext-compat \
 			src/vserver-stat \
 			src/vserver-info \
 			src/vdlimit \
-			src/vwait
+			src/vdu \
+			src/vwait \
+			src/ncontext \
+			src/nattribute \
+			src/naddress
 
 if ENSC_CAN_BEECRYPT_WITH_DIETLIBC
 DIETPROGS +=		src/vhashify
@@ -110,6 +113,7 @@ pkglib_PROGRAMS +=	src/capchroot \
 			src/rpm-fake-resolver \
 			src/vshelper-sync \
 			src/sigexec \
+			src/chbind-compat \
 			$(src_pkglib_C99_X_PROGS) \
 			$(src_pkglib_CXX_X_PROGS)
 
@@ -128,8 +132,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 +151,9 @@ sbin_PROGRAMS +=	src/chbind \
 			src/vserver-info \
 			src/vuname \
 			src/vwait \
+			src/ncontext \
+			src/nattribute \
+			src/naddress \
 			$(src_sbin_CXX_X_PROGS)
 
 if ENSC_HAVE_C99_COMPILER
@@ -159,20 +165,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 +187,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
@@ -209,7 +216,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
@@ -297,6 +307,18 @@ 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)
+
 EXTRA_PROGRAMS +=		$(src_sbin_CXX_PROGS) $(src_pkglib_CXX_PROGS)
 
 TESTS_ENVIRONMENT +=		srctestsuitedir=$(top_builddir)/src/testsuite