From: Enrico Scholz Date: Thu, 16 Oct 2003 14:49:14 +0000 (+0000) Subject: generalized building with dietlibc X-Git-Tag: VERSION_0_10~1231 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=005f9d824eccf328edd2b1ca951fc98f7943df7c;p=util-vserver.git generalized building with dietlibc git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@179 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/util-vserver/Makefile.am b/util-vserver/Makefile.am index 9c085e8..79aa390 100644 --- a/util-vserver/Makefile.am +++ b/util-vserver/Makefile.am @@ -42,6 +42,8 @@ noinst_PROGRAMS = $(test_PRGS) sysv_SCRIPTS = $(sysv_SCRPTS) sysconf_DATA = $(sysv_CFG) +DIETPROGS = $(src_DIETPROGS) $(tests_DIETPROGS) + BUILT_SOURCES = linuxcaps.h pathconfig.h linuxvirtual.h man_MANS = $(man_DATMAN) @@ -109,6 +111,11 @@ pathconfig.h: .pathconfig.h.pathsubst.stamp install-data-local: $(INSTALL) -d -m755 $(DESTDIR)$(localstatedir)/run/vservers +if USE_DIETLIBC +$(addsuffix $(EXEEXT), $(DIETPROGS)) \ +$(addsuffix $(OBJEXT), $(DIETPROGS)) \ + : CC=$(DIET_CC) +endif include $(top_srcdir)/lib/Makefile-files include $(top_srcdir)/src/Makefile-files diff --git a/util-vserver/src/Makefile-files b/util-vserver/src/Makefile-files index 88ca8a8..ab323c0 100644 --- a/util-vserver/src/Makefile-files +++ b/util-vserver/src/Makefile-files @@ -17,6 +17,15 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ## +src_DIETPROGS = src/new-namespace \ + src/secure-mount \ + src/secure-umount \ + src/save_ctxinfo \ + src/mask2prefix \ + src/chroot-rm \ + src/fakerunlevel \ + src/ctx-kill + src_HDRS = src/vutil.h src/vutil.p src/util.h \ src/wrappers.h src/wrappers-vserver.h \ src/compat-pivot_root.h \ @@ -101,20 +110,6 @@ src_vserver_stat_LDADD = lib/libvserver.a src_vunify_SOURCES = src/vunify.cc src/vutil.cc src_vcheck_SOURCES = src/vcheck.cc src/vutil.cc -src_DIETPROGS = src/new-namespace \ - src/secure-mount \ - src/secure-umount \ - src/save_ctxinfo \ - src/mask2prefix \ - src/chroot-rm \ - src/fakerunlevel \ - src/ctx-kill - -if USE_DIETLIBC -$(addsuffix $(EXEEXT), $(src_DIETPROGS)) \ -$(addsuffix $(OBJEXT), $(src_DIETPROGS)) \ - : CC=$(DIET_CC) -endif ## Local Variables: ## compile-command: "make -C .. -k"