gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-10 16:20:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make base library depend on required libs if shared=yes

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@15197 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor 2002-12-02 23:59:57 +00:00
parent f34d7a922a
commit 34242770a3
4 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -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> 2002-11-29 Richard Frith-Macdonald <rfm@gnu.org>
* Tools/plparse.m: Stefan Urbaneks patch to return 1 on failure. * Tools/plparse.m: Stefan Urbaneks patch to return 1 on failure.

6
Source/Makefile.preamble
View file

@ -78,8 +78,10 @@ ifeq ($(GNUSTEP_TARGET_OS),cygwin)
libgnustep-base_LIBRARIES_DEPEND_UPON += -lobjc libgnustep-base_LIBRARIES_DEPEND_UPON += -lobjc
endif endif
ifeq ($(findstring darwin, $(GNUSTEP_TARGET_OS)), darwin) ifeq ($(findstring darwin, $(GNUSTEP_TARGET_OS)), darwin)
libgnustep-base_LIBRARIES_DEPEND_UPON += $(CONFIG_SYSTEM_LIBS) \ libgnustep-base_LIBRARIES_DEPEND_UPON += -flat_namespace
-flat_namespace endif
ifeq ($(shared),yes)
libgnustep-base_LIBRARIES_DEPEND_UPON += $(CONFIG_SYSTEM_LIBS)
endif endif
# Flags dealing with installing and uninstalling # Flags dealing with installing and uninstalling

4
base.make.in
View file

@ -28,7 +28,9 @@ ifeq ($(FOUNDATION_LIB),gnu)
# FIXME - macro names # FIXME - macro names
# #
CONFIG_SYSTEM_INCL += @NX_CONST_STRING_CPPFLAGS@ 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_VERSION = @VERSION@
GNUSTEP_BASE_MAJOR_VERSION = @MAJOR_VERSION@ GNUSTEP_BASE_MAJOR_VERSION = @MAJOR_VERSION@

4
config.mak.in
View file

@ -13,3 +13,7 @@ WITH_FFI=@WITH_FFI@
HAVE_PTHREAD_H=@HAVE_PTHREAD_H@ HAVE_PTHREAD_H=@HAVE_PTHREAD_H@
CONFIG_SYSTEM_INCL += @INCLUDE_FLAGS@ CONFIG_SYSTEM_INCL += @INCLUDE_FLAGS@
ifeq ($(shared),yes)
CONFIG_SYSTEM_LIBS += @LIBS@
endif