From 632f5d060f6fe25eb052680e9fe0ea36a65fa9a7 Mon Sep 17 00:00:00 2001 From: Stefan Urbanek Date: Sun, 11 May 2003 16:02:27 +0000 Subject: [PATCH] Added some linkage dependencies git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/steptalk/trunk@16697 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 6 +++++- Finders/DistributedFinder/GNUmakefile | 1 + Languages/Smalltalk/GNUmakefile | 3 +++ Modules/ObjectiveC/GNUmakefile | 2 +- TODO | 5 +++-- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 708ffce..9e331b1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,8 @@ -2003 May 10 +2003 May 11 Stefan Urbanek + + * Fixed linking of some bundles + +2003 May 10 Stefan Urbanek * Fixed linking under mingw32 * STBundleInfo: implemented framework searching diff --git a/Finders/DistributedFinder/GNUmakefile b/Finders/DistributedFinder/GNUmakefile index 8f0ea63..826e05a 100644 --- a/Finders/DistributedFinder/GNUmakefile +++ b/Finders/DistributedFinder/GNUmakefile @@ -33,6 +33,7 @@ DistributedFinder_BUNDLE_LIBS += -lStepTalk ADDITIONAL_INCLUDE_DIRS += -I../../Source/Headers ADDITIONAL_LIB_DIRS += -L../../Source/$(GNUSTEP_OBJ_DIR) +ADDITIONAL_TOOL_LIBS += -lStepTalk BUNDLE_INSTALL_DIR:=$(GNUSTEP_INSTALLATION_DIR)/Library/StepTalk/Finders diff --git a/Languages/Smalltalk/GNUmakefile b/Languages/Smalltalk/GNUmakefile index e062970..3db502b 100644 --- a/Languages/Smalltalk/GNUmakefile +++ b/Languages/Smalltalk/GNUmakefile @@ -58,6 +58,9 @@ ADDITIONAL_OBJCFLAGS = -Wall -Wno-import ADDITIONAL_INCLUDE_DIRS += -I../../Source/Headers +ADDITIONAL_TOOL_LIBS += -lStepTalk +ADDITIONAL_LIB_DIRS += -L../../Source/$(GNUSTEP_OBJ_DIR) + -include GNUmakefile.preamble include $(GNUSTEP_MAKEFILES)/bundle.make -include GNUMakefile.postamble diff --git a/Modules/ObjectiveC/GNUmakefile b/Modules/ObjectiveC/GNUmakefile index 346495d..a823b26 100644 --- a/Modules/ObjectiveC/GNUmakefile +++ b/Modules/ObjectiveC/GNUmakefile @@ -36,7 +36,7 @@ ObjectiveC_PRINCIPAL_CLASS = ObjectiveCModule ObjectiveC_RESOURCE_FILES = ScriptingInfo.plist -StepTalk_BUNDLE_LIBS += -lStepTalk +ObjectiveC_BUNDLE_LIBS += -lStepTalk ADDITIONAL_INCLUDE_DIRS += -I../../Source/Headers ADDITIONAL_LIB_DIRS += -L../../Source/$(GNUSTEP_OBJ_DIR) diff --git a/TODO b/TODO index 16953d7..ed7c850 100644 --- a/TODO +++ b/TODO @@ -5,10 +5,11 @@ TODO list 3 implement NSRect object 5 Smalltalk: separate compiler and compilation context 9 create a 'Shell' scripting environment -10 Make loading of frameworks easier in STEnvironment, something like - loadFrameworkWithName: 11 Create ApplicationScripting framework, instead of bundle. It should offer passive application scripting (without linking) and active app. scripting (linking with the framewotk). Give it some reasonable name, becauase that one is already used by Apple 13 Change source directory structure (see DevelopmentNotes.txt in Doumentation) +14 Add framework list into environment description +15 Change Modules to Framework +16 Remove StepTalk modules