From 2da0d9a1bc4cb7bd2de04fd5d1f00add42c00d0f Mon Sep 17 00:00:00 2001 From: Wolfgang Lux Date: Fri, 26 Oct 2012 16:01:57 +0000 Subject: [PATCH] Fix Makefile variable for StepTalk bundles git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/steptalk/trunk@35748 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 10 ++++++++++ Modules/AppKit/GNUmakefile | 2 +- Modules/Foundation/GNUmakefile | 2 +- Modules/GDL2/GNUmakefile | 2 +- Modules/ObjectiveC/GNUmakefile | 2 +- Modules/SimpleTranscript/GNUmakefile | 2 +- 6 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 21553e7..f2e39a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2012-10-26 Wolfgang Lux + + * Modules/AppKit/GNUmakefile: + * Modules/Foundation/GNUmakefile: + * Modules/GDL2/GNUmakefile: + * Modules/ObjectiveC/GNUmakefile: + * Modules/SimpleTranscript/GNUmakefile: + Fix Makefile variables (bundle.make uses BUNDLE_LIBS, not + ADDITIONAL_BUNDLE_LIBS). + 2012-02-07 Wolfgang Lux * Frameworks/StepTalk/STBundleInfo.m (-_bundleDidLoad:): Add diff --git a/Modules/AppKit/GNUmakefile b/Modules/AppKit/GNUmakefile index 5687e91..f958f3a 100644 --- a/Modules/AppKit/GNUmakefile +++ b/Modules/AppKit/GNUmakefile @@ -43,7 +43,7 @@ BUNDLE_INSTALL_DIR:=$(GNUSTEP_LIBRARY)/StepTalk/Modules ADDITIONAL_OBJCFLAGS = -Wall -Wno-import -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) diff --git a/Modules/Foundation/GNUmakefile b/Modules/Foundation/GNUmakefile index 0d1296f..73e37af 100644 --- a/Modules/Foundation/GNUmakefile +++ b/Modules/Foundation/GNUmakefile @@ -35,7 +35,7 @@ Foundation_PRINCIPAL_CLASS = STFoundationModule Foundation_RESOURCE_FILES = ScriptingInfo.plist BUNDLE_INSTALL_DIR:=$(GNUSTEP_LIBRARY)/StepTalk/Modules -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) diff --git a/Modules/GDL2/GNUmakefile b/Modules/GDL2/GNUmakefile index da4a74e..ea875e3 100644 --- a/Modules/GDL2/GNUmakefile +++ b/Modules/GDL2/GNUmakefile @@ -37,7 +37,7 @@ GDL2_RESOURCE_FILES = ScriptingInfo.plist ADDITIONAL_NATIVE_LIBS += EOAccess EOControl EOModeler -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) diff --git a/Modules/ObjectiveC/GNUmakefile b/Modules/ObjectiveC/GNUmakefile index e3eb577..6a3baf2 100644 --- a/Modules/ObjectiveC/GNUmakefile +++ b/Modules/ObjectiveC/GNUmakefile @@ -36,7 +36,7 @@ ObjectiveC_PRINCIPAL_CLASS = ObjectiveCModule 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) diff --git a/Modules/SimpleTranscript/GNUmakefile b/Modules/SimpleTranscript/GNUmakefile index 1fc0a2e..cc3c399 100644 --- a/Modules/SimpleTranscript/GNUmakefile +++ b/Modules/SimpleTranscript/GNUmakefile @@ -34,7 +34,7 @@ SimpleTranscript_RESOURCE_FILES = ScriptingInfo.plist BUNDLE_INSTALL_DIR:=$(GNUSTEP_LIBRARY)/StepTalk/Modules -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)