From 34242770a33fbf0dc412da94782fe1e9e42f4174 Mon Sep 17 00:00:00 2001 From: Adam Fedor Date: Mon, 2 Dec 2002 23:59:57 +0000 Subject: [PATCH] Make base library depend on required libs if shared=yes git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@15197 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 7 +++++++ Source/Makefile.preamble | 6 ++++-- base.make.in | 4 +++- config.mak.in | 4 ++++ 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3eb8fefc6..8890ffe6b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2002-12-02 Adam Fedor + + * base.make.in (CONFIG_SYSTEM_LIBS): Set only if shared=no. + * config.make.in (CONFIG_SYSTEM_LIBS): Set only if shared=yes. + * Source/Makefile.preamble (libgnustep-base_LIBRARIES_DEPEND_UPON): + Depend on $(CONFIG_SYSTEM_LIBS) if shared=yes. + 2002-11-29 Richard Frith-Macdonald * Tools/plparse.m: Stefan Urbaneks patch to return 1 on failure. diff --git a/Source/Makefile.preamble b/Source/Makefile.preamble index b630f6c56..319b13cc4 100644 --- a/Source/Makefile.preamble +++ b/Source/Makefile.preamble @@ -78,8 +78,10 @@ ifeq ($(GNUSTEP_TARGET_OS),cygwin) libgnustep-base_LIBRARIES_DEPEND_UPON += -lobjc endif ifeq ($(findstring darwin, $(GNUSTEP_TARGET_OS)), darwin) -libgnustep-base_LIBRARIES_DEPEND_UPON += $(CONFIG_SYSTEM_LIBS) \ - -flat_namespace +libgnustep-base_LIBRARIES_DEPEND_UPON += -flat_namespace +endif +ifeq ($(shared),yes) +libgnustep-base_LIBRARIES_DEPEND_UPON += $(CONFIG_SYSTEM_LIBS) endif # Flags dealing with installing and uninstalling diff --git a/base.make.in b/base.make.in index c1168a543..4accb7f4b 100644 --- a/base.make.in +++ b/base.make.in @@ -28,7 +28,9 @@ ifeq ($(FOUNDATION_LIB),gnu) # FIXME - macro names # CONFIG_SYSTEM_INCL += @NX_CONST_STRING_CPPFLAGS@ - CONFIG_SYSTEM_LIBS += @LIBS@ + ifeq ($(shared),no) + CONFIG_SYSTEM_LIBS += @LIBS@ + endif GNUSTEP_BASE_VERSION = @VERSION@ GNUSTEP_BASE_MAJOR_VERSION = @MAJOR_VERSION@ diff --git a/config.mak.in b/config.mak.in index 4180b7dfc..cecd4c35e 100644 --- a/config.mak.in +++ b/config.mak.in @@ -13,3 +13,7 @@ WITH_FFI=@WITH_FFI@ HAVE_PTHREAD_H=@HAVE_PTHREAD_H@ CONFIG_SYSTEM_INCL += @INCLUDE_FLAGS@ +ifeq ($(shared),yes) + CONFIG_SYSTEM_LIBS += @LIBS@ +endif +