From: helge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Fri, 26 Aug 2005 13:11:13 +0000 (+0000)
Subject: more work on PCH
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bdcf442a57fa877480d4f58ef130a8da9851fc08;p=sope

more work on PCH


git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1078 e4a50df8-12e2-0310-a44c-efbce7f8a7e3
---

diff --git a/gnustep-make/ChangeLog b/gnustep-make/ChangeLog
index 6ff01541..08066269 100644
--- a/gnustep-make/ChangeLog
+++ b/gnustep-make/ChangeLog
@@ -14,7 +14,7 @@
 	  directory (which contains the precompiled header if one was created)
 
 	* rules.make: added a rule to compile a precompiled header (.h header
-	  to .gch)
+	  to .gch), added a flag to ObjC file compilation to include a PCH
 
 2005-07-21  Adam Fedor  <fedor@gnu.org>
 
diff --git a/gnustep-make/Instance/Shared/headers.make b/gnustep-make/Instance/Shared/headers.make
index 2fa29f0e..b0cf8c16 100644
--- a/gnustep-make/Instance/Shared/headers.make
+++ b/gnustep-make/Instance/Shared/headers.make
@@ -91,6 +91,8 @@ $(GNUSTEP_INSTANCE)_GCH_FILE=$(patsubst %.h,%$(GCH_SUFFIX),$($(GNUSTEP_INSTANCE)
 
 $(DERIVED_SOURCES_DIR)/$($(GNUSTEP_INSTANCE)_GCH_FILE) :: $(HEADER_FILES)
 
+PCH_INCLUDE_FLAG=-include $(DERIVED_SOURCES_DIR)/$($(GNUSTEP_INSTANCE)_PCH_FILE)
+
 shared-instance-headers-all: \
 	$(DERIVED_SOURCES_DIR)/$($(GNUSTEP_INSTANCE)_GCH_FILE)
 
diff --git a/gnustep-make/rules.make b/gnustep-make/rules.make
index eb699ad8..6493106f 100644
--- a/gnustep-make/rules.make
+++ b/gnustep-make/rules.make
@@ -392,6 +392,7 @@ $(GNUSTEP_OBJ_DIR)/%${OEXT} : %.m
 	$(ECHO_COMPILING)$(CC) $< -c \
 	      $(filter-out $($<_FILE_FILTER_OUT_FLAGS),$(ALL_CPPFLAGS) \
 	                                                $(ALL_OBJCFLAGS)) \
+	      $(PCH_INCLUDE_FLAG) \
 	      $($<_FILE_FLAGS) -o $@$(END_ECHO)
 
 $(GNUSTEP_OBJ_DIR)/%${OEXT} : %.C
@@ -430,7 +431,7 @@ $(GNUSTEP_OBJ_DIR)/%${OEXT} : %.cp
 	      $($<_FILE_FLAGS) -o $@$(END_ECHO)
 
 # precompiled header files (TODO: should go into GNUSTEP_OBJ_DIR?)
-GCH_SUFFIX=.gch
+GCH_SUFFIX=.h.gch
 $(DERIVED_SOURCES_DIR)/%$(GCH_SUFFIX): %.h
 	if ! test -d $(DERIVED_SOURCES_DIR); then \
 	  $(MKDIRS) $(DERIVED_SOURCES_DIR); \