mirror of
https://github.com/gnustep/libs-steptalk.git
synced 2025-02-21 02:31:01 +00:00
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
This commit is contained in:
parent
91ca747a02
commit
2da0d9a1bc
6 changed files with 15 additions and 5 deletions
10
ChangeLog
10
ChangeLog
|
@ -1,3 +1,13 @@
|
||||||
|
2012-10-26 Wolfgang Lux <wolfgang.lux@gmail.com>
|
||||||
|
|
||||||
|
* 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 <wolfgang.lux@gmail.com>
|
2012-02-07 Wolfgang Lux <wolfgang.lux@gmail.com>
|
||||||
|
|
||||||
* Frameworks/StepTalk/STBundleInfo.m (-_bundleDidLoad:): Add
|
* Frameworks/StepTalk/STBundleInfo.m (-_bundleDidLoad:): Add
|
||||||
|
|
|
@ -43,7 +43,7 @@ BUNDLE_INSTALL_DIR:=$(GNUSTEP_LIBRARY)/StepTalk/Modules
|
||||||
|
|
||||||
ADDITIONAL_OBJCFLAGS = -Wall -Wno-import
|
ADDITIONAL_OBJCFLAGS = -Wall -Wno-import
|
||||||
|
|
||||||
ADDITIONAL_BUNDLE_LIBS = -lStepTalk
|
BUNDLE_LIBS += -lStepTalk
|
||||||
ADDITIONAL_INCLUDE_DIRS += -I../../Frameworks/
|
ADDITIONAL_INCLUDE_DIRS += -I../../Frameworks/
|
||||||
ADDITIONAL_LIB_DIRS += -L../../Frameworks/StepTalk/StepTalk.framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
|
ADDITIONAL_LIB_DIRS += -L../../Frameworks/StepTalk/StepTalk.framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
|
||||||
|
|
||||||
|
|
|
@ -35,7 +35,7 @@ Foundation_PRINCIPAL_CLASS = STFoundationModule
|
||||||
Foundation_RESOURCE_FILES = ScriptingInfo.plist
|
Foundation_RESOURCE_FILES = ScriptingInfo.plist
|
||||||
|
|
||||||
BUNDLE_INSTALL_DIR:=$(GNUSTEP_LIBRARY)/StepTalk/Modules
|
BUNDLE_INSTALL_DIR:=$(GNUSTEP_LIBRARY)/StepTalk/Modules
|
||||||
ADDITIONAL_BUNDLE_LIBS = -lStepTalk
|
BUNDLE_LIBS += -lStepTalk
|
||||||
ADDITIONAL_INCLUDE_DIRS += -I../../Frameworks/
|
ADDITIONAL_INCLUDE_DIRS += -I../../Frameworks/
|
||||||
ADDITIONAL_LIB_DIRS += -L../../Frameworks/StepTalk/StepTalk.framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
|
ADDITIONAL_LIB_DIRS += -L../../Frameworks/StepTalk/StepTalk.framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
|
||||||
|
|
||||||
|
|
|
@ -37,7 +37,7 @@ GDL2_RESOURCE_FILES = ScriptingInfo.plist
|
||||||
|
|
||||||
ADDITIONAL_NATIVE_LIBS += EOAccess EOControl EOModeler
|
ADDITIONAL_NATIVE_LIBS += EOAccess EOControl EOModeler
|
||||||
|
|
||||||
ADDITIONAL_BUNDLE_LIBS = -lStepTalk
|
BUNDLE_LIBS += -lStepTalk
|
||||||
ADDITIONAL_INCLUDE_DIRS += -I../../Frameworks/
|
ADDITIONAL_INCLUDE_DIRS += -I../../Frameworks/
|
||||||
ADDITIONAL_LIB_DIRS += -L../../Frameworks/StepTalk/StepTalk.framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
|
ADDITIONAL_LIB_DIRS += -L../../Frameworks/StepTalk/StepTalk.framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
|
||||||
|
|
||||||
|
|
|
@ -36,7 +36,7 @@ ObjectiveC_PRINCIPAL_CLASS = ObjectiveCModule
|
||||||
|
|
||||||
ObjectiveC_RESOURCE_FILES = ScriptingInfo.plist
|
ObjectiveC_RESOURCE_FILES = ScriptingInfo.plist
|
||||||
|
|
||||||
ADDITIONAL_BUNDLE_LIBS = -lStepTalk
|
BUNDLE_LIBS += -lStepTalk
|
||||||
ADDITIONAL_INCLUDE_DIRS += -I../../Frameworks/
|
ADDITIONAL_INCLUDE_DIRS += -I../../Frameworks/
|
||||||
ADDITIONAL_LIB_DIRS += -L../../Frameworks/StepTalk/StepTalk.framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
|
ADDITIONAL_LIB_DIRS += -L../../Frameworks/StepTalk/StepTalk.framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
|
||||||
|
|
||||||
|
|
|
@ -34,7 +34,7 @@ SimpleTranscript_RESOURCE_FILES = ScriptingInfo.plist
|
||||||
|
|
||||||
BUNDLE_INSTALL_DIR:=$(GNUSTEP_LIBRARY)/StepTalk/Modules
|
BUNDLE_INSTALL_DIR:=$(GNUSTEP_LIBRARY)/StepTalk/Modules
|
||||||
|
|
||||||
ADDITIONAL_BUNDLE_LIBS = -lStepTalk
|
BUNDLE_LIBS += -lStepTalk
|
||||||
ADDITIONAL_INCLUDE_DIRS += -I../../Frameworks/
|
ADDITIONAL_INCLUDE_DIRS += -I../../Frameworks/
|
||||||
ADDITIONAL_LIB_DIRS += -L../../Frameworks/StepTalk/StepTalk.framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
|
ADDITIONAL_LIB_DIRS += -L../../Frameworks/StepTalk/StepTalk.framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue