From: Enrico Scholz Date: Tue, 30 Dec 2003 15:59:18 +0000 (+0000) Subject: * added legacy-dir (merged from 0.26.90) X-Git-Tag: VERSION_0_10~1013 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9bf2c8e42990264a62c91f1fe26a4353a389bb4b;p=util-vserver.git * added legacy-dir (merged from 0.26.90) * libtool'ized it git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@510 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/util-vserver/Makefile.am b/util-vserver/Makefile.am index 2adbf36..17ff7bb 100644 --- a/util-vserver/Makefile.am +++ b/util-vserver/Makefile.am @@ -26,16 +26,19 @@ CVS2CL_ALLFLAGS := $(CVS2CL_AMFLAGS) $(CVS2CL_FLAGS) confdir = $(sysconfdir)/vservers confdefaultsdir = $(confdir)/.defaults sbincfgdir = $(sbindir) +legacydir = $(pkglibdir)/legacy include_HEADERS = $(lib_HDRS) noinst_HEADERS = $(src_HDRS) $(lib_XHDRS) compat.h lib_LIBRARIES = $(lib_lib_LIBS) -#lib_LTLIBRARIES = $(lib_lib_LTLIBS) +lib_LTLIBRARIES = $(lib_lib_LTLIBS) $(src_lib_LTLIBS) +pkglib_LTLIBRARIES = $(src_pkglib_LTLIBS) pkglib_SCRIPTS = $(scripts_pkglib_SCRPTS) pkglib_DATA = $(scripts_pkglib_DTA) pkglib_PROGRAMS = $(src_pkglib_PRGS) +legacy_SCRIPTS = $(scripts_legacy_SCRPTS) sbincfg_DATA = $(scripts_sbincfg_DTA) @@ -46,7 +49,7 @@ noinst_PROGRAMS = $(test_PRGS) initrd_SCRIPTS = $(sysv_SCRPTS) sysconf_DATA = $(sysv_CFG) -DIETPROGS = $(src_DIETPROGS) $(tests_DIETPROGS) +DIETPROGS = $(src_DIETPROGS) $(tests_DIETPROGS) $(lib_DIETPROGS) BUILT_SOURCES = linuxcaps.h pathconfig.h linuxvirtual.h @@ -80,6 +83,10 @@ if USE_DIETLIBC DIET = diet DIET_FLAGS = DIET_CC := $(DIET) $(DIET_FLAGS) $(CC) +DIET_LIBTOOL := $(LIBTOOL) --tag CC +VSERVER_LDFLAGS := -static +else +VSERVER_LDFLAGS := endif linuxcaps.h: ${kernelincludedir}/linux/capability.h Makefile @@ -154,7 +161,9 @@ install-vserverdir: $(mkinstalldirs) $(DESTDIR)$(vserverdir) $(DESTDIR)$(vserverpkgdir) if USE_DIETLIBC -$(DIETPROGS): LIBTOOL=$(LIBTOOL) --tag CC +$(addsuffix $(EXEEXT), $(DIETPROGS)) \ +$(addsuffix $(OBJEXT), $(DIETPROGS)) \ + : LIBTOOL=$(DIET_LIBTOOL) $(addsuffix $(EXEEXT), $(DIETPROGS)) \ $(addsuffix $(OBJEXT), $(DIETPROGS)) \