From 19c0fe570931d2a1ff18ea582f31287c2be8b1ea Mon Sep 17 00:00:00 2001 From: Nicola Pero Date: Wed, 11 Oct 2006 00:45:54 +0000 Subject: [PATCH] Fixed compiler flags with non-flattened layout git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@23840 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 8 ++++++++ SSL/Makefile.preamble | 2 +- Source/Additions/Makefile.preamble | 3 ++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 25c7c2c95..41e25398c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2006-10-11 Nicola Pero + + * Source/Additions/Makefile.preamble (ADDITIONAL_INCLUDE_DIRS): + Added -I.. so that the compiler finds GSPrivate.h when it's using + the non-flattened layout, and it compiles again. + * SSL/Makefile.preamble (ADDITIONAL_INCLUDE_DIRS): Added + -I../Source for the same reason. + 2006-10-10 Richard Frith-Macdonald * Source/NSDecimalNumber.m: Implement coding/decoding diff --git a/SSL/Makefile.preamble b/SSL/Makefile.preamble index 4b9926ba9..75f88c432 100644 --- a/SSL/Makefile.preamble +++ b/SSL/Makefile.preamble @@ -49,7 +49,7 @@ ADDITIONAL_CFLAGS = # Additional include directories the compiler should search ADDITIONAL_INCLUDE_DIRS = -I./$(GNUSTEP_TARGET_DIR) \ - -I../Source/$(GNUSTEP_TARGET_DIR) \ + -I../Source/$(GNUSTEP_TARGET_DIR) -I../Source \ -I../Headers/Additions -I../Headers # Additional LDFLAGS to pass to the linker diff --git a/Source/Additions/Makefile.preamble b/Source/Additions/Makefile.preamble index 8963da2f9..b68b1b068 100644 --- a/Source/Additions/Makefile.preamble +++ b/Source/Additions/Makefile.preamble @@ -55,8 +55,9 @@ endif ADDITIONAL_CFLAGS = # Additional include directories the compiler should search +# FIXME - the -I../ is for GSPrivate.h ADDITIONAL_INCLUDE_DIRS = -I../../Headers/Additions \ - -I../$(GNUSTEP_TARGET_DIR) + -I../$(GNUSTEP_TARGET_DIR) -I../ ifeq ($(FOUNDATION_LIB),gnu) ADDITIONAL_INCLUDE_DIRS += -I../../Headers