gnustep/libs-back
0
0
Fork 0
mirror of https://github.com/gnustep/libs-back.git synced 2025-04-23 16:10:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix order of use of library and header directories

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@36837 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2013-07-04 16:44:28 +00:00
parent 0752783e29
commit e1551e60be
3 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2013-07-04 Richard Frith-Macdonald <rfm@gnu.org>
* Tools/GNUmakefile.preamble:
* Source/GNUmakefile.preamble:
Fix order of use of library and header directories.
2013-07-03 Ivan Vucica <ivan@vucica.net>
* Source/x11/XGGLFormat.m:

7
Source/GNUmakefile.preamble
View file

@ -37,14 +37,15 @@ ADDITIONAL_CPPFLAGS += -Wall
ADDITIONAL_CFLAGS +=
# Additional include directories the compiler should search
ADDITIONAL_INCLUDE_DIRS += -I../Headers \
-I$(GNUSTEP_TARGET_DIR) $(GRAPHIC_CFLAGS)
ADDITIONAL_INCLUDE_DIRS += -I../Headers -I$(GNUSTEP_TARGET_DIR)
CONFIG_SYSTEM_INCL += $(GRAPHIC_CFLAGS)
# Additional LDFLAGS to pass to the linker
#ADDITIONAL_LDFLAGS +=
# Additional library directories the linker should search
ADDITIONAL_LIB_DIRS += $(GRAPHIC_LFLAGS)
#ADDITIONAL_LIB_DIRS +=
CONFIG_SYSTEM_LIB_DIR += $(GRAPHIC_LFLAGS)
#
# Flags for compiling as a bundle or library (if the system depends

5
Tools/GNUmakefile.preamble
View file

@ -43,7 +43,6 @@ ADDITIONAL_OBJCFLAGS += -Wall
# Additional include directories the compiler should search
ADDITIONAL_INCLUDE_DIRS += -I../Headers -I../Source/$(GNUSTEP_TARGET_DIR)
# Additional LDFLAGS to pass to the linker
# ADDITIONAL_LDFLAGS +=
@ -63,8 +62,8 @@ ADDITIONAL_INSTALL_DIRS +=
# Flags for when the backend is compiled as a bundle
ifneq ($(BACKEND_BUNDLE),)
ADDITIONAL_TOOL_LIBS += $(GUI_LIBS) $(GRAPHIC_LIBS) $(SYSTEM_LIBS)
ADDITIONAL_INCLUDE_DIRS += $(GRAPHIC_CFLAGS)
ADDITIONAL_LIB_DIRS += $(GRAPHIC_LFLAGS)
CONFIG_SYSTEM_INCL += $(GRAPHIC_CFLAGS)
CONFIG_SYSTEM_LIB_DIR += $(GRAPHIC_LFLAGS)
else
ADDITIONAL_TOOL_LIBS += -lgnustep-gui -lgnustep-back $(SYSTEM_LIBS)
endif