steptalk (0.10.0-5) link-libs.patch

2010-06-07  Yavor Doganov  <yavor@gnu.org>

	Fix the GDL2 bundle to link with the correct libraries.
	* Modules/GDL2/GNUmakefile (GDL2_BUNDLE_LIBS): Define to
	`-lEOControl -lEOAccess'.

2009-12-13  Yavor Doganov  <yavor@gnu.org>

	Link with all necessary libraries.
	* Frameworks/StepTalk/GNUmakefile
	(StepTalk_LIBRARIES_DEPEND_UPON): Remove mingw conditional, add
	-lm.
	* Languages/Smalltalk/GNUmakefile (ADDITIONAL_BUNDLE_LIBS):
	* Modules/ObjectiveC/GNUmakefile (ADDITIONAL_BUNDLE_LIBS): Rename
	as...
	(BUNDLE_LIBS): ...to have effect.
	* Examples/Shell/GNUmakefile (ADDITIONAL_TOOL_LIBS): Remove
	-lncurses.

--- steptalk-0.10.0.orig/Frameworks/StepTalk/GNUmakefile
+++ steptalk-0.10.0/Frameworks/StepTalk/GNUmakefile
@@ -104,9 +104,7 @@
         -Declared StepTalk \
         -DocumentationDirectory ../../Documentation/Reference
 
-ifeq ($(GNUSTEP_TARGET_OS),mingw32)
-    StepTalk_LIBRARIES_DEPEND_UPON += -lgnustep-base -lobjc
-endif
+StepTalk_LIBRARIES_DEPEND_UPON += $(FND_LIBS) $(OBJC_LIBS) -lm
 
 ifeq ($(check),yes)
     ADDITIONAL_OBJCFLAGS += -Werror
--- steptalk-0.10.0.orig/Languages/Smalltalk/GNUmakefile
+++ steptalk-0.10.0/Languages/Smalltalk/GNUmakefile
@@ -59,7 +59,7 @@
         
 ADDITIONAL_INCLUDE_DIRS += -I../../Source/Headers
 
-ADDITIONAL_BUNDLE_LIBS = -lStepTalk
+BUNDLE_LIBS += -lStepTalk
 ADDITIONAL_INCLUDE_DIRS += -I../../Frameworks/
 ADDITIONAL_LIB_DIRS += -L../../Frameworks/StepTalk/StepTalk.framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
 
--- steptalk-0.10.0.orig/Modules/ObjectiveC/GNUmakefile
+++ steptalk-0.10.0/Modules/ObjectiveC/GNUmakefile
@@ -36,7 +36,7 @@
         
 ObjectiveC_RESOURCE_FILES = ScriptingInfo.plist
 
-ADDITIONAL_BUNDLE_LIBS = -lStepTalk
+BUNDLE_LIBS += -lStepTalk
 ADDITIONAL_INCLUDE_DIRS += -I../../Frameworks/
 ADDITIONAL_LIB_DIRS += -L../../Frameworks/StepTalk/StepTalk.framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
 
--- steptalk-0.10.0.orig/Examples/Shell/GNUmakefile
+++ steptalk-0.10.0/Examples/Shell/GNUmakefile
@@ -26,7 +26,7 @@
 
 stshell_OBJC_FILES = STShell.m STShell+output.m stshell_tool.m
 
-ADDITIONAL_TOOL_LIBS += -lStepTalk -lreadline -lncurses
+ADDITIONAL_TOOL_LIBS += -lStepTalk -lreadline
 ADDITIONAL_INCLUDE_DIRS += -I../../Frameworks
 ADDITIONAL_LIB_DIRS += -L../../Frameworks/StepTalk/StepTalk.framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
 ADDITIONAL_OBJCFLAGS = -Wall -Wno-import
--- steptalk-0.10.0.orig/Modules/GDL2/GNUmakefile
+++ steptalk-0.10.0/Modules/GDL2/GNUmakefile
@@ -35,7 +35,7 @@
         
 GDL2_RESOURCE_FILES = ScriptingInfo.plist
 
-GDL2_BUNDLE_LIBS += -lgnustep-db2 -lgnustep-db2control -lgnustep-db2modeler
+GDL2_BUNDLE_LIBS += -lEOControl -lEOAccess
 
 ADDITIONAL_BUNDLE_LIBS = -lStepTalk
 ADDITIONAL_INCLUDE_DIRS += -I../../Frameworks/