mirror of
https://github.com/gnustep/libs-base.git
synced 2025-05-30 00:11:26 +00:00
(ALL_INCLUDE_FLAGS): Undo last change, except use name
`srcdir-include' instead of `include'. This should allow building is a separate directory than the source, yet still avoid confusion between <string.h> and <String.h> on win32 systems. (gnustep/base:): Use `srcdir-include' instead of `include' for extra links needed when building in a separate directory than the source. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@1570 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
3dd47fd888
commit
ee86b8a746
1 changed files with 4 additions and 3 deletions
|
@ -85,7 +85,7 @@ NEXT_NEXT_INCLUDES = -I/usr/include
|
|||
GNU_NEXT_INCLUDES = -I$(srcdir)
|
||||
NEXT_INCLUDES = @NEXT_INCLUDES@
|
||||
|
||||
ALL_INCLUDE_FLAGS = -I. $(NEXT_INCLUDES) $(INCLUDEFLAGS)
|
||||
ALL_INCLUDE_FLAGS = -I. -I./srcdir-include $(NEXT_INCLUDES) $(INCLUDEFLAGS)
|
||||
ALL_CPPFLAGS = $(ALL_INCLUDE_FLAGS) $(CPPFLAGS)
|
||||
ALL_CFLAGS = $(CFLAGS)
|
||||
ALL_OBJCFLAGS = $(CFLAGS) -Wno-protocol
|
||||
|
@ -516,8 +516,9 @@ gnustep/base:
|
|||
ln -s ./include base
|
||||
# Make necessary links to source headers if compiling in seperate dir
|
||||
if [ ! -r ./include/Collection.h ]; then \
|
||||
ln -s ../$(srcdir)/include ./include/base; \
|
||||
(cd include; ln -s . gnustep); \
|
||||
mkdir srcdir-include; \
|
||||
ln -s ../$(srcdir)/include ./srcdir-include/base; \
|
||||
(cd srcdir-include; ln -s . gnustep); \
|
||||
fi
|
||||
# This deletion is necessary, because the CVS repository contains
|
||||
# an emtpy `Foundation' directory that used to hold the OpenStep headers.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue