From 4936b405abde18c9b8c58ba369a5cb33014ef1b1 Mon Sep 17 00:00:00 2001 From: helge Date: Mon, 29 Aug 2005 18:02:51 +0000 Subject: [PATCH] fixed some PCH issues git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1095 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- gnustep-make/ChangeLog | 7 +++++++ gnustep-make/Instance/framework.make | 2 ++ gnustep-make/Instance/subproject.make | 3 ++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/gnustep-make/ChangeLog b/gnustep-make/ChangeLog index 23c9d50b..c7f596ca 100644 --- a/gnustep-make/ChangeLog +++ b/gnustep-make/ChangeLog @@ -1,3 +1,10 @@ +2005-08-29 Helge Hess + + * 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 * 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 3132c2c3..8ae997a4 100644 --- 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 b249333c..26f76397 100644 --- 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 -- 2.39.5