From 5256dfa00e018863f3521d17656ce4ee94655c09 Mon Sep 17 00:00:00 2001 From: Richard Frith-MacDonald Date: Thu, 21 Aug 2008 09:08:45 +0000 Subject: [PATCH] fix for bug #24109 git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@26817 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 7 +++++++ Source/GNUmakefile.preamble | 11 ++--------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index a90180feb..c3c6ed3a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-08-21 Yavor Doganov (tiny change) + + * Source/GNUmakefile.preamble (LIBRARIES_DEPEND_UPON): + Unconditionally link against $(OBJC_LIBS) on all platforms to + avoid undefined symbols. + Reported by Funda Wang (bug #24109). + 2008-08-21 Richard Frith-Macdonald * Source/NSBezierPath.m: ([transformUsingAffineTransform:]) corrected diff --git a/Source/GNUmakefile.preamble b/Source/GNUmakefile.preamble index a3f868a34..7d7154346 100644 --- a/Source/GNUmakefile.preamble +++ b/Source/GNUmakefile.preamble @@ -90,12 +90,5 @@ ADDITIONAL_INSTALL_DIRS = $(GNUSTEP_HEADERS)/AppKit $(GNUSTEP_HEADERS)/Cocoa # systems where building a shared library requires to pass to the linker # all the libraries the target library depends upon. -LIBRARIES_DEPEND_UPON = -l$(FOUNDATION_LIBRARY_NAME) $(ADDITIONAL_DEPENDS) - -ifeq ($(GNUSTEP_TARGET_OS),mingw32) -libgnustep-gui_LIBRARIES_DEPEND_UPON += -lobjc -endif -ifeq ($(GNUSTEP_TARGET_OS),cygwin) -libgnustep-gui_LIBRARIES_DEPEND_UPON += -lobjc -endif - +LIBRARIES_DEPEND_UPON = -l$(FOUNDATION_LIBRARY_NAME) $(ADDITIONAL_DEPENDS) \ + $(OBJC_LIBS)