mirror of
https://github.com/gnustep/libs-base.git
synced 2025-04-22 16:33:29 +00:00
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
This commit is contained in:
parent
fa4af907b5
commit
08e78d20cd
4 changed files with 18 additions and 3 deletions
|
@ -1,3 +1,10 @@
|
|||
2002-12-02 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* 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 <rfm@gnu.org>
|
||||
|
||||
* Tools/plparse.m: Stefan Urbaneks patch to return 1 on failure.
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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@
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue