Description: Fix some linking issues.
Author: Yavor Doganov <yavor@gnu.org>
Forwarded: no
Last-Update: 2024-06-18
---

--- steptalk.orig/Frameworks/StepTalk/GNUmakefile
+++ steptalk/Frameworks/StepTalk/GNUmakefile
@@ -104,7 +104,7 @@
         -Declared StepTalk \
         -DocumentationDirectory ../../Documentation/Reference
 
-StepTalk_LIBRARIES_DEPEND_UPON += -lgnustep-base -lobjc
+StepTalk_LIBRARIES_DEPEND_UPON += -lgnustep-base -lobjc -lm
 
 ifeq ($(check),yes)
     ADDITIONAL_OBJCFLAGS += -Werror
--- steptalk.orig/Languages/Smalltalk/GNUmakefile
+++ steptalk/Languages/Smalltalk/GNUmakefile
@@ -60,7 +60,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.orig/Examples/Shell/GNUmakefile
+++ steptalk/Examples/Shell/GNUmakefile
@@ -26,7 +26,9 @@
 
 stshell_OBJC_FILES = STShell.m STShell+output.m stshell_tool.m
 
-ADDITIONAL_TOOL_LIBS += -lStepTalk -lreadline -lncurses
+ADDITIONAL_TOOL_LIBS += -lStepTalk -lreadline
+ADDITIONAL_LIB_DIRS += -L../../Frameworks/StepTalk/StepTalk.framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
+ADDITIONAL_INCLUDE_DIRS += -I../../Frameworks/
 
 ADDITIONAL_OBJCFLAGS = -Wall -Wno-import
 
--- steptalk.orig/Modules/GDL2/GNUmakefile
+++ steptalk/Modules/GDL2/GNUmakefile
@@ -35,7 +35,7 @@
         
 GDL2_RESOURCE_FILES = ScriptingInfo.plist
 
-ADDITIONAL_NATIVE_LIBS += EOAccess EOControl EOModeler
+ADDITIONAL_NATIVE_LIBS += EOAccess EOControl
 
 BUNDLE_LIBS += -lStepTalk
 ADDITIONAL_INCLUDE_DIRS += -I../../Frameworks/