From: Enrico Scholz Date: Thu, 19 Aug 2004 14:06:24 +0000 (+0000) Subject: automake-1.9 fixes: s!VSERVER_LDFLAGS!VSERVER_LDFLGS! X-Git-Tag: IPSENTINEL_VERSION_0_12~332 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bcade54a36a64a24cd9113598f38d08f0451fb67;p=util-vserver.git automake-1.9 fixes: s!VSERVER_LDFLAGS!VSERVER_LDFLGS! removed some libtool-hacks which are not needed with automake-1.9 anymore git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@1660 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/util-vserver/Makefile.am b/util-vserver/Makefile.am index 5a20d15..12dc5df 100644 --- a/util-vserver/Makefile.am +++ b/util-vserver/Makefile.am @@ -92,17 +92,13 @@ DISTCLEANFILES = FEATURES.txt AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = -LIBTOOL_CC = @LIBTOOL@ --tag CC -LIBTOOL_CXX = @LIBTOOL@ --tag CXX - if USE_DIETLIBC DIET = diet DIET_FLAGS = DIET_CC := $(DIET) $(DIET_FLAGS) $(CC) -DIET_LIBTOOL := $(LIBTOOL_CC) -VSERVER_LDFLAGS := -static +VSERVER_LDFLGS := -static else -VSERVER_LDFLAGS := +VSERVER_LDFLGS := endif if USE_DIETLIBC_COMPAT @@ -241,10 +237,6 @@ _install-vserverdir: if USE_DIETLIBC $(addsuffix $(EXEEXT), $(DIETPROGS)) \ $(addsuffix $(OBJEXT), $(DIETPROGS)) \ - : LIBTOOL=$(DIET_LIBTOOL) - -$(addsuffix $(EXEEXT), $(DIETPROGS)) \ -$(addsuffix $(OBJEXT), $(DIETPROGS)) \ : CC=$(DIET_CC) endif