mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-23 14:20:50 +00:00
Use GNUSTEP_MAKEFILES in place of $(GNUSTEP_SYSTEM_ROOT)/Makefiles
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@2739 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor
parent
e790d1bb94
commit
cc0031d356
11 changed files with 35 additions and 27 deletions
|
|
@ -1,3 +1,9 @@
|
|||
Fri Feb 6 12:25:51 1998 Adam Fedor <fedor@ultra.doc.com>
|
||||
|
||||
* common.make (GNUSTEP_MAKEFILES): Set only if not already set.
|
||||
* *.make: Use GNUSTEP_MAKEFILES in place of
|
||||
$(GNUSTEP_SYSTEM_ROOT)/Makefiles.
|
||||
|
||||
1998-02-05 Ovidiu Predescu <ovidiu@net-community.com>
|
||||
|
||||
* brain.make (GUI_LIBS): Changed the order of the gui and gmodel
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ AGGREGATE_MAKE_LOADED=yes
|
|||
#
|
||||
# Include in the common makefile rules
|
||||
#
|
||||
include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/rules.make
|
||||
include $(GNUSTEP_MAKEFILES)/rules.make
|
||||
|
||||
#
|
||||
# The list of directory names with the subprojects
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ APPLICATION_MAKE_LOADED=yes
|
|||
#
|
||||
# Include in the common makefile rules
|
||||
#
|
||||
include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/rules.make
|
||||
include $(GNUSTEP_MAKEFILES)/rules.make
|
||||
|
||||
#
|
||||
# The name of the application is in the APP_NAME variable.
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@ FND_DEFINE = -DGNUSTEP_BASE_LIBRARY=1
|
|||
endif
|
||||
|
||||
ifeq ($(FOUNDATION_LIB),fd)
|
||||
-include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/libFoundation.make
|
||||
-include $(GNUSTEP_MAKEFILES)/libFoundation.make
|
||||
FND_LDFLAGS =
|
||||
FND_LIBS = -lFoundation $(LIBFOUNDATION_GC_LIBRARY)
|
||||
FND_DEFINE = -DLIB_FOUNDATION_LIBRARY=1
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ BUNDLE_MAKE_LOADED=yes
|
|||
#
|
||||
# Include in the common makefile rules
|
||||
#
|
||||
include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/rules.make
|
||||
include $(GNUSTEP_MAKEFILES)/rules.make
|
||||
|
||||
# The name of the bundle is in the BUNDLE_NAME variable.
|
||||
# The list of bundle resource file are in xxx_RESOURCES
|
||||
|
|
|
|||
34
common.make
34
common.make
|
|
@ -28,22 +28,22 @@ VERSION = 1.0.0
|
|||
#
|
||||
# Scripts to run for parsing canonical names
|
||||
#
|
||||
CONFIG_GUESS_SCRIPT = $(GNUSTEP_SYSTEM_ROOT)/Makefiles/config.guess
|
||||
CONFIG_SUB_SCRIPT = $(GNUSTEP_SYSTEM_ROOT)/Makefiles/config.sub
|
||||
CONFIG_CPU_SCRIPT = $(GNUSTEP_SYSTEM_ROOT)/Makefiles/cpu.sh
|
||||
CONFIG_VENDOR_SCRIPT = $(GNUSTEP_SYSTEM_ROOT)/Makefiles/vendor.sh
|
||||
CONFIG_OS_SCRIPT = $(GNUSTEP_SYSTEM_ROOT)/Makefiles/os.sh
|
||||
CLEAN_CPU_SCRIPT = $(GNUSTEP_SYSTEM_ROOT)/Makefiles/clean_cpu.sh
|
||||
CLEAN_VENDOR_SCRIPT = $(GNUSTEP_SYSTEM_ROOT)/Makefiles/clean_vendor.sh
|
||||
CLEAN_OS_SCRIPT = $(GNUSTEP_SYSTEM_ROOT)/Makefiles/clean_os.sh
|
||||
WHICH_LIB_SCRIPT = $(GNUSTEP_SYSTEM_ROOT)/Makefiles/$(GNUSTEP_HOST_CPU)/$(GNUSTEP_HOST_OS)/which_lib
|
||||
LD_LIB_PATH_SCRIPT = $(GNUSTEP_SYSTEM_ROOT)/Makefiles/ld_lib_path.sh
|
||||
TRANSFORM_PATHS_SCRIPT = $(GNUSTEP_SYSTEM_ROOT)/Makefiles/transform_paths.sh
|
||||
CONFIG_GUESS_SCRIPT = $(GNUSTEP_MAKEFILES)/config.guess
|
||||
CONFIG_SUB_SCRIPT = $(GNUSTEP_MAKEFILES)/config.sub
|
||||
CONFIG_CPU_SCRIPT = $(GNUSTEP_MAKEFILES)/cpu.sh
|
||||
CONFIG_VENDOR_SCRIPT = $(GNUSTEP_MAKEFILES)/vendor.sh
|
||||
CONFIG_OS_SCRIPT = $(GNUSTEP_MAKEFILES)/os.sh
|
||||
CLEAN_CPU_SCRIPT = $(GNUSTEP_MAKEFILES)/clean_cpu.sh
|
||||
CLEAN_VENDOR_SCRIPT = $(GNUSTEP_MAKEFILES)/clean_vendor.sh
|
||||
CLEAN_OS_SCRIPT = $(GNUSTEP_MAKEFILES)/clean_os.sh
|
||||
WHICH_LIB_SCRIPT = $(GNUSTEP_MAKEFILES)/$(GNUSTEP_HOST_CPU)/$(GNUSTEP_HOST_OS)/which_lib
|
||||
LD_LIB_PATH_SCRIPT = $(GNUSTEP_MAKEFILES)/ld_lib_path.sh
|
||||
TRANSFORM_PATHS_SCRIPT = $(GNUSTEP_MAKEFILES)/transform_paths.sh
|
||||
|
||||
#
|
||||
# Determine the compilation host and target
|
||||
#
|
||||
include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/names.make
|
||||
include $(GNUSTEP_MAKEFILES)/names.make
|
||||
|
||||
GNUSTEP_HOST_DIR = $(GNUSTEP_HOST_CPU)/$(GNUSTEP_HOST_OS)
|
||||
|
||||
|
|
@ -52,17 +52,17 @@ GNUSTEP_TARGET_DIR = $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)
|
|||
#
|
||||
# Get the config information
|
||||
#
|
||||
include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/$(GNUSTEP_TARGET_DIR)/config.make
|
||||
include $(GNUSTEP_MAKEFILES)/$(GNUSTEP_TARGET_DIR)/config.make
|
||||
|
||||
#
|
||||
# Determine the core libraries
|
||||
#
|
||||
include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/brain.make
|
||||
include $(GNUSTEP_MAKEFILES)/brain.make
|
||||
|
||||
#
|
||||
# Determine target specific settings
|
||||
#
|
||||
include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/target.make
|
||||
include $(GNUSTEP_MAKEFILES)/target.make
|
||||
|
||||
#
|
||||
# GNUSTEP_INSTALLATION_DIR is the directory where all the things go. If you
|
||||
|
|
@ -89,7 +89,9 @@ GNUSTEP_LIBRARIES = $(GNUSTEP_TARGET_LIBRARIES)/$(LIBRARY_COMBO)
|
|||
GNUSTEP_RESOURCES = $(GNUSTEP_LIBRARIES_ROOT)/Resources
|
||||
|
||||
# Take the makefiles from the system root
|
||||
GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
|
||||
ifeq ($(GNUSTEP_MAKEFILES),)
|
||||
GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
|
||||
endif
|
||||
|
||||
# The default name of the makefile to be used in recursive invocations of make
|
||||
ifeq ($(MAKEFILE_NAME),)
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ LIBRARY_MAKE_LOADED=yes
|
|||
#
|
||||
# Include in the common makefile rules
|
||||
#
|
||||
include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/rules.make
|
||||
include $(GNUSTEP_MAKEFILES)/rules.make
|
||||
|
||||
#
|
||||
# The name of the library is in the LIBRARY_NAME variable.
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ OBJC_PROGRAM_MAKE_LOADED=yes
|
|||
#
|
||||
# Include in the common makefile rules
|
||||
#
|
||||
include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/rules.make
|
||||
include $(GNUSTEP_MAKEFILES)/rules.make
|
||||
|
||||
ifeq ($(INTERNAL_objc_program_NAME),)
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ TEST_APPLICATION_MAKE_LOADED=yes
|
|||
#
|
||||
# Include in the common makefile rules
|
||||
#
|
||||
include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/rules.make
|
||||
include $(GNUSTEP_MAKEFILES)/rules.make
|
||||
|
||||
# building of test applications calls the application.make rules
|
||||
ifeq ($(INTERNAL_app_NAME),)
|
||||
|
|
@ -43,7 +43,7 @@ $(TEST_APP_NAME):
|
|||
else
|
||||
|
||||
# We use the application.make rules for building
|
||||
include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/application.make
|
||||
include $(GNUSTEP_MAKEFILES)/application.make
|
||||
|
||||
endif
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ TEST_TOOL_MAKE_LOADED=yes
|
|||
#
|
||||
# Include in the common makefile rules
|
||||
#
|
||||
include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/rules.make
|
||||
include $(GNUSTEP_MAKEFILES)/rules.make
|
||||
|
||||
# building of test tools calls the tool.make rules
|
||||
ifeq ($(INTERNAL_tool_NAME),)
|
||||
|
|
@ -43,7 +43,7 @@ $(TEST_TOOL_NAME):
|
|||
else
|
||||
|
||||
# We use the tool.make rules for building
|
||||
include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/tool.make
|
||||
include $(GNUSTEP_MAKEFILES)/tool.make
|
||||
|
||||
endif
|
||||
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ TOOL_MAKE_LOADED=yes
|
|||
#
|
||||
# Include in the common makefile rules
|
||||
#
|
||||
include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/rules.make
|
||||
include $(GNUSTEP_MAKEFILES)/rules.make
|
||||
|
||||
ifeq ($(INTERNAL_tool_NAME),)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue