fixed some PCH issues

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

diff --git a/gnustep-make/ChangeLog b/gnustep-make/ChangeLog
index 23c9d50b315d31bf6d38fb9a5887d0f491eb34b9..c7f596ca4ce03032d5bbaf9c84ed26ccfaa4128d 100644 (file)
--- a/gnustep-make/ChangeLog
+++ b/gnustep-make/ChangeLog
@@ -1,3 +1,10 @@
+2005-08-29  Helge Hess  <helge.hess@opengroupware.org>
+
+       * Instance/subproject.make: moved include of Shared/pch.make up (to
+         make it available prior use)
+
+       * Instance/framework.make: enabled compilation of PCH
+
 2005-08-29  Helge Hess  <helge.hess@skyrix.com>
        
        * Instance/Shared/headers.make: fixed HEADER_FILES_INSTALL_DIR not to

diff --git a/gnustep-make/Instance/framework.make b/gnustep-make/Instance/framework.make
index 3132c2c3f8ea52993792f48a0ce84a882b5a577b..8ae997a467c1a4ad6536ef1215d50b304fe697c7 100644 (file)
--- a/gnustep-make/Instance/framework.make
+++ b/gnustep-make/Instance/framework.make
@@ -144,6 +144,7 @@ FRAMEWORK_VERSION_DIR = $(GNUSTEP_BUILD_DIR)/$(FRAMEWORK_VERSION_DIR_NAME)
 # So we assume by default that we have some headers even if
 # HEADER_FILES is empty.
 include $(GNUSTEP_MAKEFILES)/Instance/Shared/headers.make
+include $(GNUSTEP_MAKEFILES)/Instance/Shared/pch.make
 
 # On windows, this is unfortunately required.
 ifeq ($(BUILD_DLL), yes)
@@ -312,6 +313,7 @@ GNUSTEP_SHARED_BUNDLE_RESOURCE_PATH = $(FRAMEWORK_VERSION_DIR)/Resources
 include $(GNUSTEP_MAKEFILES)/Instance/Shared/bundle.make
 
 internal-framework-all_:: $(GNUSTEP_OBJ_DIR) \
+                         shared-instance-pch-all \
                           build-framework
 
 internal-framework-build-headers:: $(FRAMEWORK_HEADER_FILES) \

diff --git a/gnustep-make/Instance/subproject.make b/gnustep-make/Instance/subproject.make
index b249333c76a6547e57a0cf58842fdc429f9ab6c9..26f7639772f4887a02c2fd56859c76adb78cdb24 100644 (file)
--- a/gnustep-make/Instance/subproject.make
+++ b/gnustep-make/Instance/subproject.make
@@ -28,6 +28,8 @@ endif
         internal-subproject-install_   \
         internal-subproject-uninstall_
 
+include $(GNUSTEP_MAKEFILES)/Instance/Shared/pch.make
+
 #
 # Compilation targets
 #
@@ -106,7 +108,6 @@ else
 #
 
 include $(GNUSTEP_MAKEFILES)/Instance/Shared/headers.make
-include $(GNUSTEP_MAKEFILES)/Instance/Shared/pch.make
 
 internal-subproject-install_:: shared-instance-headers-install