gnustep/tools-make
0
0
Fork 0
mirror of https://github.com/gnustep/tools-make.git synced 2025-04-23 22:33:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Instance/application.make, Instance/gswapp.make,

Browse source 
Instance/service.make, Instance/tool.make: Revert change from
2005-06-06.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@21625 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor 2005-08-08 15:04:07 +00:00
parent 8aa49a1487
commit 4477922535
5 changed files with 14 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2005-08-08 Adam Fedor <fedor@gnu.org>
* Instance/application.make, Instance/gswapp.make,
Instance/service.make, Instance/tool.make: Revert change from
2005-06-06.
2005-07-21 Adam Fedor <fedor@gnu.org>
* Version 1.11.0

8
Instance/application.make
View file

@ -58,17 +58,13 @@ ifeq ($(APP_INSTALL_DIR),)
APP_INSTALL_DIR = $(GNUSTEP_APPS)
endif
# On windows, this is unfortunately required.
ifeq ($(BUILD_DLL), yes)
DUP_OBJC_LIBS = $(AUXILIARY_OBJC_LIBS) $(OBJC_LIBS)
endif
ALL_GUI_LIBS = \
$(shell $(WHICH_LIB_SCRIPT) \
$(ALL_LIB_DIRS) \
$(ADDITIONAL_GUI_LIBS) $(AUXILIARY_GUI_LIBS) $(GUI_LIBS) \
$(BACKEND_LIBS) $(ADDITIONAL_TOOL_LIBS) $(AUXILIARY_TOOL_LIBS) \
$(FND_LIBS) $(ADDITIONAL_OBJC_LIBS) $(DUP_OBJC_LIBS) $(SYSTEM_LIBS) \
$(FND_LIBS) $(ADDITIONAL_OBJC_LIBS) $(AUXILIARY_OBJC_LIBS) $(OBJC_LIBS) \
$(SYSTEM_LIBS) $(TARGET_SYSTEM_LIBS) \
debug=$(debug) profile=$(profile) shared=$(shared) \
libext=$(LIBEXT) shared_libext=$(SHARED_LIBEXT))

8
Instance/gswapp.make
View file

@ -73,18 +73,14 @@ ifeq ($(GSWAPP_INSTALL_DIR),)
GSWAPP_INSTALL_DIR = $(GNUSTEP_GSWAPPS)
endif
# On windows, this is unfortunately required.
ifeq ($(BUILD_DLL), yes)
DUP_OBJC_LIBS = $(AUXILIARY_OBJC_LIBS) $(OBJC_LIBS)
endif
# Libraries that go before the WO libraries
ALL_GSW_LIBS = \
$(shell $(WHICH_LIB_SCRIPT) \
$(ALL_LIB_DIRS) \
$(ADDITIONAL_GSW_LIBS) $(AUXILIARY_GSW_LIBS) $(GSW_LIBS) \
$(ADDITIONAL_TOOL_LIBS) $(AUXILIARY_TOOL_LIBS) \
$(FND_LIBS) $(ADDITIONAL_OBJC_LIBS) $(DUP_OBJC_LIBS) $(SYSTEM_LIBS) \
$(FND_LIBS) $(ADDITIONAL_OBJC_LIBS) $(AUXILIARY_OBJC_LIBS) \
$(OBJC_LIBS) $(SYSTEM_LIBS) $(TARGET_SYSTEM_LIBS) \
debug=$(debug) profile=$(profile) shared=$(shared) \
libext=$(LIBEXT) shared_libext=$(SHARED_LIBEXT))

9
Instance/service.make
View file

@ -39,19 +39,14 @@ endif
internal-service-copy_into_dir \
service-resource-files
# On windows, this is unfortunately required.
ifeq ($(BUILD_DLL), yes)
DUP_OBJC_LIBS = $(AUXILIARY_OBJC_LIBS) $(OBJC_LIBS)
endif
# Libraries that go before the GUI libraries
ALL_SERVICE_LIBS = \
$(shell $(WHICH_LIB_SCRIPT) \
$(ALL_LIB_DIRS) \
$(ADDITIONAL_GUI_LIBS) $(AUXILIARY_GUI_LIBS) \
$(GUI_LIBS) $(ADDITIONAL_TOOL_LIBS) $(AUXILIARY_TOOL_LIBS) \
$(FND_LIBS) $(ADDITIONAL_OBJC_LIBS) $(DUP_OBJC_LIBS) \
$(SYSTEM_LIBS) \
$(FND_LIBS) $(ADDITIONAL_OBJC_LIBS) $(AUXILIARY_OBJC_LIBS) \
$(OBJC_LIBS) $(SYSTEM_LIBS) $(TARGET_SYSTEM_LIBS) \
debug=$(debug) profile=$(profile) shared=$(shared) \
libext=$(LIBEXT) shared_libext=$(SHARED_LIBEXT))

8
Instance/tool.make
View file

@ -52,16 +52,12 @@ ifeq ($(FINAL_TOOL_INSTALL_DIR),)
FINAL_TOOL_INSTALL_DIR = $(TOOL_INSTALL_DIR)/$(GNUSTEP_TARGET_LDIR)
endif
# On windows, this is unfortunately required.
ifeq ($(BUILD_DLL), yes)
DUP_OBJC_LIBS = $(AUXILIARY_OBJC_LIBS) $(OBJC_LIBS)
endif
ALL_TOOL_LIBS = \
$(shell $(WHICH_LIB_SCRIPT) \
$(ALL_LIB_DIRS) \
$(ADDITIONAL_TOOL_LIBS) $(AUXILIARY_TOOL_LIBS) $(FND_LIBS) \
$(ADDITIONAL_OBJC_LIBS) $(DUP_OBJC_LIBS) \
$(ADDITIONAL_OBJC_LIBS) $(AUXILIARY_OBJC_LIBS) $(OBJC_LIBS) \
$(TARGET_SYSTEM_LIBS) \
debug=$(debug) profile=$(profile) shared=$(shared) \
libext=$(LIBEXT) shared_libext=$(SHARED_LIBEXT))