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 (ALL_GUI_LIBS): Remove OBJC_LIBS,

Browse source 
AUXILIARY_OBJC_LIBS, and TARGET_SYSTEM_LIBS
        * Instance/gswapp.make (ALL_GSW_LIBS): Idem.
        * Instance/service.make (ALL_SERVICE_LIBS): Idem.
        * Instance/test-library.make (ALL_TEST_LIBRARY_LIBS): Idem.
        * Instance/tool.make (ALL_TOOL_LIBS): Idem.
        Fixes bug #9920.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@21290 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor 2005-06-07 04:21:02 +00:00
parent 6b91a7ec5d
commit c41f313136
8 changed files with 42 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
2005-06-06 Adam Fedor <fedor@gnu.org>
* Instance/application.make (ALL_GUI_LIBS): Remove OBJC_LIBS,
AUXILIARY_OBJC_LIBS, and TARGET_SYSTEM_LIBS
* Instance/gswapp.make (ALL_GSW_LIBS): Idem.
* Instance/service.make (ALL_SERVICE_LIBS): Idem.
* Instance/test-library.make (ALL_TEST_LIBRARY_LIBS): Idem.
* Instance/tool.make (ALL_TOOL_LIBS): Idem.
Fixes bug #9920.
2005-05-31 Nicola Pero <n.pero@mi.flashnet.it>
* Documentation/README.MinGW: Rewritten with updated instructions.

4
Documentation/machines.texi
View file

@ -350,7 +350,7 @@ You need to use gmake not make to compile the GNUstep packages.
@c -----------------------------------------
@node Irix 6.5/MIPS, MacOSX/PowerPC, FreeBSD 2.x, Machine Specific
@section Irix 6.5/MIPS
@section Irix 6.5/MIPS (@emph{Needs a maintainer})
@table @var
@item Recommended compiler
@ -811,7 +811,7 @@ work.
@c -----------------------------------------
@node Windows with CYGWIN, Windows with MinGW, Unixware-2.1.3/Intel, Machine Specific
@section Windows with CYGWIN (@emph{Needs Testing})
@section Windows with CYGWIN (@emph{Needs a maintainer})
@table @var
@item Recommended compiler

5
Documentation/userfaq.texi
View file

@ -398,7 +398,10 @@ Please report the error to bug-gnustep@@gnu.org.
when compiling the gui library, there could be several things wrong. One
is that you installed the gnustep-objc library, but the compiler
found another Objecive-C library (like the one that came with gcc). If
you are using gcc 3.x, DO NOT use the gnustep-objc library.
you are using gcc 3.x, DO NOT use the gnustep-objc library.
There could also be a mismatch between the base and gui library versions.
Make sure you have the latest release of each library installed.
@node Problems with Alt key, Problems with gcc3, Problems compiling (GNUstep Internal Error), Troubleshooting
@subsection Problems with Alt key

8
Instance/application.make
View file

@ -58,13 +58,17 @@ 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) $(AUXILIARY_OBJC_LIBS) $(OBJC_LIBS) \
$(SYSTEM_LIBS) $(TARGET_SYSTEM_LIBS) \
$(FND_LIBS) $(ADDITIONAL_OBJC_LIBS) $(DUP_OBJC_LIBS) $(SYSTEM_LIBS) \
debug=$(debug) profile=$(profile) shared=$(shared) \
libext=$(LIBEXT) shared_libext=$(SHARED_LIBEXT))

8
Instance/gswapp.make
View file

@ -73,14 +73,18 @@ 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) $(AUXILIARY_OBJC_LIBS) \
$(OBJC_LIBS) $(SYSTEM_LIBS) $(TARGET_SYSTEM_LIBS) \
$(FND_LIBS) $(ADDITIONAL_OBJC_LIBS) $(DUP_OBJC_LIBS) $(SYSTEM_LIBS) \
debug=$(debug) profile=$(profile) shared=$(shared) \
libext=$(LIBEXT) shared_libext=$(SHARED_LIBEXT))

9
Instance/service.make
View file

@ -39,14 +39,19 @@ 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) $(AUXILIARY_OBJC_LIBS) \
$(OBJC_LIBS) $(SYSTEM_LIBS) $(TARGET_SYSTEM_LIBS) \
$(FND_LIBS) $(ADDITIONAL_OBJC_LIBS) $(DUP_OBJC_LIBS) \
$(SYSTEM_LIBS) \
debug=$(debug) profile=$(profile) shared=$(shared) \
libext=$(LIBEXT) shared_libext=$(SHARED_LIBEXT))

3
Instance/test-library.make
View file

@ -78,8 +78,7 @@ ALL_TEST_LIBRARY_LIBS = \
$(shell $(WHICH_LIB_SCRIPT) \
$(ALL_LIB_DIRS) \
$(ADDITIONAL_LIBRARY_LIBS) $(AUXILIARY_LIBS) \
$(AUXILIARY_TOOL_LIBS) $(FND_LIBS) $(OBJC_LIBS) \
$(TARGET_SYSTEM_LIBS) \
$(AUXILIARY_TOOL_LIBS) $(FND_LIBS) \
debug=$(debug) profile=$(profile) shared=$(shared) \
libext=$(LIBEXT) shared_libext=$(SHARED_LIBEXT))

8
Instance/tool.make
View file

@ -52,12 +52,16 @@ 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) $(AUXILIARY_OBJC_LIBS) $(OBJC_LIBS) \
$(TARGET_SYSTEM_LIBS) \
$(ADDITIONAL_OBJC_LIBS) $(DUP_OBJC_LIBS) \
debug=$(debug) profile=$(profile) shared=$(shared) \
libext=$(LIBEXT) shared_libext=$(SHARED_LIBEXT))