From 4471b1d57be1a905c9598a15f33c9c733d848b18 Mon Sep 17 00:00:00 2001 From: Adam Fedor Date: Thu, 5 Feb 1998 15:51:18 +0000 Subject: [PATCH] Define GNUSTEP_MAKEFILE_DIR for compiling in large package. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@2730 72102866-910b-0410-8b05-ffd578937521 --- Admin/GNUmakefile | 6 ++++-- ChangeLog | 6 ++++++ Documentation/GNUmakefile | 6 ++++-- Examples/GNUmakefile | 6 ++++-- GNUmakefile | 6 ++++-- NSCharacterSets/GNUmakefile | 6 ++++-- NSTimeZones/GNUmakefile | 6 ++++-- Source/GNUmakefile | 6 ++++-- Testing/GNUmakefile | 8 +++++--- Tools/GNUmakefile | 8 +++++--- 10 files changed, 44 insertions(+), 20 deletions(-) diff --git a/Admin/GNUmakefile b/Admin/GNUmakefile index 0029a1cd4..d0d310dcd 100644 --- a/Admin/GNUmakefile +++ b/Admin/GNUmakefile @@ -23,7 +23,9 @@ # Install into the system root by default GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT) -include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/common.make +GNUSTEP_MAKEFILE_DIR = $(GNUSTEP_SYSTEM_ROOT)/Makefiles + +include $(GNUSTEP_MAKEFILE_DIR)/common.make include ../Version include ../config.mak @@ -41,6 +43,6 @@ DIST_FILES = $(RCS_FILES) $(ADMIN_FILES) # We don't actually build anything in this directory so # just include the common makefile rules -include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/rules.make +include $(GNUSTEP_MAKEFILE_DIR)/rules.make -include Makefile.postamble diff --git a/ChangeLog b/ChangeLog index 0c72c3ebd..69db3ac8a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Feb 5 10:48:35 1998 Adam Fedor + + * GNUmakefile (GNUSTEP_MAKEFILE_DIR): New variable. Use it to + include makefiles. + * Likewise for all sub-directory GNUmakefile files. + Mon Feb 2 10:11:20 1998 Adam Fedor * Version (GCC_VERSION): Change to 2.8.0 diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile index 3d6ac36d3..59e804444 100644 --- a/Documentation/GNUmakefile +++ b/Documentation/GNUmakefile @@ -23,7 +23,9 @@ # Install into the system root by default GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT) -include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/common.make +GNUSTEP_MAKEFILE_DIR = $(GNUSTEP_SYSTEM_ROOT)/Makefiles + +include $(GNUSTEP_MAKEFILE_DIR)/common.make include ../Version include ../config.mak @@ -76,7 +78,7 @@ DIST_FILES = $(RCS_FILES) $(TEXT_FILES) # We don't actually build anything in this directory so # just include the common makefile rules -include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/rules.make +include $(GNUSTEP_MAKEFILE_DIR)/rules.make -include Makefile.postamble diff --git a/Examples/GNUmakefile b/Examples/GNUmakefile index 50bd77bf6..c4739d3d3 100644 --- a/Examples/GNUmakefile +++ b/Examples/GNUmakefile @@ -25,7 +25,9 @@ # Install into the system root by default GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT) -include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/common.make +GNUSTEP_MAKEFILE_DIR = $(GNUSTEP_SYSTEM_ROOT)/Makefiles + +include $(GNUSTEP_MAKEFILE_DIR)/common.make include ../Version include ../config.mak @@ -61,6 +63,6 @@ custom-zone.m -include Makefile.preamble -include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/test-tool.make +include $(GNUSTEP_MAKEFILE_DIR)/test-tool.make -include Makefile.postamble diff --git a/GNUmakefile b/GNUmakefile index 3262cc5e5..553b832c1 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -25,7 +25,9 @@ # Install into the system root by default GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT) -include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/common.make +GNUSTEP_MAKEFILE_DIR = $(GNUSTEP_SYSTEM_ROOT)/Makefiles + +include $(GNUSTEP_MAKEFILE_DIR)/common.make include ./Version @@ -51,6 +53,6 @@ SUBPROJECTS = src Tools doc NSCharacterSets NSTimeZones admin -include Makefile.preamble -include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/aggregate.make +include $(GNUSTEP_MAKEFILE_DIR)/aggregate.make -include Makefile.postamble diff --git a/NSCharacterSets/GNUmakefile b/NSCharacterSets/GNUmakefile index 1a75e535e..8e1a2b6a0 100644 --- a/NSCharacterSets/GNUmakefile +++ b/NSCharacterSets/GNUmakefile @@ -23,7 +23,9 @@ # Install into the system root by default GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT) -include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/common.make +GNUSTEP_MAKEFILE_DIR = $(GNUSTEP_SYSTEM_ROOT)/Makefiles + +include $(GNUSTEP_MAKEFILE_DIR)/common.make include ../Version include ../config.mak @@ -50,6 +52,6 @@ INSTALL_FILES = $(CHARSET_FILES) README.CharSet # We don't actually build anything in this directory so # just include the common makefile rules -include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/rules.make +include $(GNUSTEP_MAKEFILE_DIR)/rules.make -include Makefile.postamble diff --git a/NSTimeZones/GNUmakefile b/NSTimeZones/GNUmakefile index ff8280ffc..caf253ab5 100644 --- a/NSTimeZones/GNUmakefile +++ b/NSTimeZones/GNUmakefile @@ -23,7 +23,9 @@ # Install into the system root by default GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT) -include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/common.make +GNUSTEP_MAKEFILE_DIR = $(GNUSTEP_SYSTEM_ROOT)/Makefiles + +include $(GNUSTEP_MAKEFILE_DIR)/common.make include ../Version include ../config.mak @@ -39,6 +41,6 @@ DIST_FILES = GNUmakefile Makefile.postamble $(TIMEZONE_ARCHIVE) # We don't actually build anything in this directory so # just include the common makefile rules -include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/rules.make +include $(GNUSTEP_MAKEFILE_DIR)/rules.make -include Makefile.postamble diff --git a/Source/GNUmakefile b/Source/GNUmakefile index ae2fe41ca..bf00314cb 100644 --- a/Source/GNUmakefile +++ b/Source/GNUmakefile @@ -25,7 +25,9 @@ # Install into the system root by default GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT) -include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/common.make +GNUSTEP_MAKEFILE_DIR = $(GNUSTEP_SYSTEM_ROOT)/Makefiles + +include $(GNUSTEP_MAKEFILE_DIR)/common.make include ../Version include ../config.mak @@ -498,6 +500,6 @@ libgnustep-base_HEADER_FILES = $(NEXTSTEP_HEADERS) $(BASE_HEADERS) -include Makefile.preamble -include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/library.make +include $(GNUSTEP_MAKEFILE_DIR)/library.make -include Makefile.postamble diff --git a/Testing/GNUmakefile b/Testing/GNUmakefile index a959d230b..a9e867a9f 100644 --- a/Testing/GNUmakefile +++ b/Testing/GNUmakefile @@ -25,7 +25,9 @@ # Install into the system root by default GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT) -include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/common.make +GNUSTEP_MAKEFILE_DIR = $(GNUSTEP_SYSTEM_ROOT)/Makefiles + +include $(GNUSTEP_MAKEFILE_DIR)/common.make include ../Version include ../config.mak @@ -160,7 +162,7 @@ DIST_FILES = $(SRCS) $(HDRS) $(DYNAMIC_MFILES) $(DYNAMIC_HFILES) \ -include Makefile.preamble -include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/test-tool.make -include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/bundle.make +include $(GNUSTEP_MAKEFILE_DIR)/test-tool.make +include $(GNUSTEP_MAKEFILE_DIR)/bundle.make -include Makefile.postamble diff --git a/Tools/GNUmakefile b/Tools/GNUmakefile index 9741276c1..e4737d50a 100644 --- a/Tools/GNUmakefile +++ b/Tools/GNUmakefile @@ -23,7 +23,9 @@ # Install into the system root by default GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT) -include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/common.make +GNUSTEP_MAKEFILE_DIR = $(GNUSTEP_SYSTEM_ROOT)/Makefiles + +include $(GNUSTEP_MAKEFILE_DIR)/common.make # The application to be compiled TOOL_NAME = defaults dread dwrite dremove @@ -45,7 +47,7 @@ $(SOURCES) $(HEADERS) -include Makefile.preamble -include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/objc.make -include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/tool.make +include $(GNUSTEP_MAKEFILE_DIR)/objc.make +include $(GNUSTEP_MAKEFILE_DIR)/tool.make -include Makefile.postamble