mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-23 06:10:50 +00:00
More bug fixes.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@2661 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Scott Christley
parent
ef556e80d7
commit
f46e577bf7
4 changed files with 76 additions and 30 deletions
19
ChangeLog
19
ChangeLog
|
|
@ -1,3 +1,22 @@
|
|||
Fri Nov 28 10:47:11 1997 Scott Christley <scottc@net-community.com>
|
||||
|
||||
* common.make (GNUSTEP_INSTALLATION_DIR): If the default
|
||||
GNUSTEP_LOCAL_ROOT is empty then use GNUSTEP_SYSTEM_ROOT.
|
||||
(GNUSTEP_LOCAL_HEADERS_FLAG, GNUSTEP_USER_HEADERS_FLAG): New variable.
|
||||
(GNUSTEP_LOCAL_TARGET_LIBRARIES_FLAG): New variable.
|
||||
(GNUSTEP_LOCAL_LIBRARIES_FLAG): New variable.
|
||||
(GNUSTEP_USER_TARGET_LIBRARIES_FLAG): New variable.
|
||||
(GNUSTEP_USER_LIBRARIES_FLAG): New variable.
|
||||
In places where GNUSTEP_LOCAL_ROOT and GNUSTEP_USER_ROOT are
|
||||
used, check to see if they are not blank before using them.
|
||||
(GNUSTEP_FND_DIR): Change to just gnustep.
|
||||
* objc.make (OBJC_PROGRAM_INSTALLATION_DIR): Add the target
|
||||
subdirectory path.
|
||||
(objc-program): Change to objc_program for target names.
|
||||
* rules.make (ALL_OBJCFLAGS, ALL_CFLAGS): Use flag variables
|
||||
for local and user header directories in case they are blank.
|
||||
(ALL_LIB_DIRS, LIB_DIRS_NO_SYSTEM): Likewise.
|
||||
|
||||
Wed Nov 19 13:07:37 1997 Scott Christley <scottc@net-community.com>
|
||||
|
||||
* COPYING: New file.
|
||||
|
|
|
|||
52
common.make
52
common.make
|
|
@ -66,10 +66,15 @@ include $(GNUSTEP_SYSTEM_ROOT)/Makefiles/target.make
|
|||
|
||||
#
|
||||
# GNUSTEP_INSTALLATION_DIR is the directory where all the things go. If you
|
||||
# don't specify it defaults to GNUSTEP_LOCAL_ROOT
|
||||
# don't specify it defaults to GNUSTEP_LOCAL_ROOT, unless GNUSTEP_LOCAL_ROOT
|
||||
# is empty in which case it defaults to GNUSTEP_SYSTEM_ROOT
|
||||
#
|
||||
ifeq ($(GNUSTEP_INSTALLATION_DIR),)
|
||||
GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_LOCAL_ROOT)
|
||||
ifeq ($(GNUSTEP_LOCAL_ROOT),)
|
||||
GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
|
||||
else
|
||||
GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_LOCAL_ROOT)
|
||||
endif
|
||||
endif
|
||||
|
||||
#
|
||||
|
|
@ -94,31 +99,44 @@ GNUSTEP_SYSTEM_TARGET_LIBRARIES = \
|
|||
GNUSTEP_SYSTEM_LIBRARIES = $(GNUSTEP_SYSTEM_TARGET_LIBRARIES)/$(LIBRARY_COMBO)
|
||||
GNUSTEP_SYSTEM_HEADERS = $(GNUSTEP_SYSTEM_ROOT)/Headers
|
||||
|
||||
ifneq ($(GNUSTEP_LOCAL_ROOT),)
|
||||
GNUSTEP_LOCAL_LIBRARIES_ROOT = $(GNUSTEP_LOCAL_ROOT)/Libraries
|
||||
GNUSTEP_LOCAL_TARGET_LIBRARIES = \
|
||||
$(GNUSTEP_LOCAL_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_DIR)
|
||||
GNUSTEP_LOCAL_TARGET_LIBRARIES_FLAG = -L$(GNUSTEP_LOCAL_TARGET_LIBRARIES)
|
||||
GNUSTEP_LOCAL_LIBRARIES = $(GNUSTEP_LOCAL_TARGET_LIBRARIES)/$(LIBRARY_COMBO)
|
||||
GNUSTEP_LOCAL_LIBRARIES_FLAG = -L$(GNUSTEP_LOCAL_LIBRARIES)
|
||||
GNUSTEP_LOCAL_HEADERS = $(GNUSTEP_LOCAL_ROOT)/Headers
|
||||
GNUSTEP_LOCAL_HEADERS_FLAG = -I$(GNUSTEP_LOCAL_HEADERS)
|
||||
endif
|
||||
|
||||
ifneq ($(GNUSTEP_USER_ROOT),)
|
||||
GNUSTEP_USER_LIBRARIES_ROOT = $(GNUSTEP_USER_ROOT)/Libraries
|
||||
GNUSTEP_USER_TARGET_LIBRARIES = \
|
||||
$(GNUSTEP_USER_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_DIR)
|
||||
GNUSTEP_USER_TARGET_LIBRARIES_FLAG = -L$(GNUSTEP_USER_TARGET_LIBRARIES)
|
||||
GNUSTEP_USER_LIBRARIES = $(GNUSTEP_USER_TARGET_LIBRARIES)/$(LIBRARY_COMBO)
|
||||
GNUSTEP_USER_LIBRARIES_FLAG = -L$(GNUSTEP_USER_LIBRARIES)
|
||||
GNUSTEP_USER_HEADERS = $(GNUSTEP_USER_ROOT)/Headers
|
||||
GNUSTEP_USER_HEADERS_FLAG = -I$(GNUSTEP_USER_HEADERS)
|
||||
endif
|
||||
|
||||
#
|
||||
# Target specific header include directories
|
||||
#
|
||||
GNUSTEP_HEADERS_TARGET_FLAG = \
|
||||
-I$(GNUSTEP_USER_HEADERS)/$(GNUSTEP_TARGET_DIR) \
|
||||
-I$(GNUSTEP_LOCAL_HEADERS)/$(GNUSTEP_TARGET_DIR) \
|
||||
-I$(GNUSTEP_SYSTEM_HEADERS)/$(GNUSTEP_TARGET_DIR)
|
||||
ifneq ($(GNUSTEP_USER_ROOT),)
|
||||
GNUSTEP_HEADERS_TARGET_FLAG += -I$(GNUSTEP_USER_HEADERS)/$(GNUSTEP_TARGET_DIR)
|
||||
endif
|
||||
ifneq ($(GNUSTEP_LOCAL_ROOT),)
|
||||
GNUSTEP_HEADERS_TARGET_FLAG += -I$(GNUSTEP_LOCAL_HEADERS)/$(GNUSTEP_TARGET_DIR)
|
||||
endif
|
||||
GNUSTEP_HEADERS_TARGET_FLAG += -I$(GNUSTEP_SYSTEM_HEADERS)/$(GNUSTEP_TARGET_DIR)
|
||||
|
||||
#
|
||||
# Determine Foundation header subdirectory based upon library combo
|
||||
#
|
||||
ifeq ($(FOUNDATION_LIB),gnu)
|
||||
GNUSTEP_FND_DIR = gnustep/base
|
||||
GNUSTEP_FND_DIR = gnustep
|
||||
FOUNDATION_LIBRARY_NAME = gnustep-base
|
||||
FOUNDATION_LIBRARY_DEFINE = -DGNUSTEP_BASE_LIBRARY=1
|
||||
endif
|
||||
|
|
@ -140,9 +158,13 @@ GNUSTEP_FND_DIR = sun
|
|||
FOUNDATION_LIBRARY_DEFINE = -DSun_Foundation_LIBRARY=1
|
||||
endif
|
||||
|
||||
GNUSTEP_HEADERS_FND_FLAG = -I$(GNUSTEP_USER_HEADERS)/$(GNUSTEP_FND_DIR) \
|
||||
-I$(GNUSTEP_LOCAL_HEADERS)/$(GNUSTEP_FND_DIR) \
|
||||
-I$(GNUSTEP_SYSTEM_HEADERS)/$(GNUSTEP_FND_DIR)
|
||||
ifneq ($(GNUSTEP_USER_ROOT),)
|
||||
GNUSTEP_HEADERS_FND_FLAG += -I$(GNUSTEP_USER_HEADERS)/$(GNUSTEP_FND_DIR)
|
||||
endif
|
||||
ifneq ($(GNUSTEP_LOCAL_ROOT),)
|
||||
GNUSTEP_HEADERS_FND_FLAG += -I$(GNUSTEP_LOCAL_HEADERS)/$(GNUSTEP_FND_DIR)
|
||||
endif
|
||||
GNUSTEP_HEADERS_FND_FLAG += -I$(GNUSTEP_SYSTEM_HEADERS)/$(GNUSTEP_FND_DIR)
|
||||
|
||||
ifeq ($(FOUNDATION_LIB), fd)
|
||||
GNUSTEP_HEADERS_FND_FLAG += -I$(GNUSTEP_USER_HEADERS)/$(GNUSTEP_FND_DIR)/$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/$(OBJC_RUNTIME) \
|
||||
|
|
@ -155,9 +177,13 @@ endif
|
|||
#
|
||||
ifeq ($(GUI_LIB),gnu)
|
||||
GNUSTEP_GUI_DIR = gnustep/gui
|
||||
GNUSTEP_HEADERS_GUI_FLAG = -I$(GNUSTEP_USER_HEADERS)/$(GNUSTEP_GUI_DIR) \
|
||||
-I$(GNUSTEP_LOCAL_HEADERS)/$(GNUSTEP_GUI_DIR) \
|
||||
-I$(GNUSTEP_SYSTEM_HEADERS)/$(GNUSTEP_GUI_DIR)
|
||||
ifneq ($(GNUSTEP_USER_ROOT),)
|
||||
GNUSTEP_HEADERS_GUI_FLAG += -I$(GNUSTEP_USER_HEADERS)/$(GNUSTEP_GUI_DIR)
|
||||
endif
|
||||
ifneq ($(GNUSTEP_LOCAL_ROOT),)
|
||||
GNUSTEP_HEADERS_GUI_FLAG += -I$(GNUSTEP_LOCAL_HEADERS)/$(GNUSTEP_GUI_DIR)
|
||||
endif
|
||||
GNUSTEP_HEADERS_GUI_FLAG += -I$(GNUSTEP_SYSTEM_HEADERS)/$(GNUSTEP_GUI_DIR)
|
||||
endif
|
||||
|
||||
ifeq ($(GUI_LIB),nx)
|
||||
|
|
|
|||
15
objc.make
15
objc.make
|
|
@ -56,7 +56,7 @@ else
|
|||
# don't specify a directory they will get installed in the GNUstep
|
||||
# system root.
|
||||
OBJC_PROGRAM_INSTALLATION_DIR = \
|
||||
$(GNUSTEP_INSTALLATION_DIR)/Tools
|
||||
$(GNUSTEP_INSTALLATION_DIR)/Tools/$(GNUSTEP_TARGET_DIR)
|
||||
|
||||
ALL_OBJC_LIBS = $(ADDITIONAL_OBJC_LIBS) $(AUXILIARY_OBJC_LIBS) $(OBJC_LIBS) \
|
||||
$(TARGET_SYSTEM_LIBS)
|
||||
|
|
@ -79,30 +79,31 @@ $(GNUSTEP_OBJ_DIR)/$(INTERNAL_objc_program_NAME): \
|
|||
#
|
||||
# Compilation targets
|
||||
#
|
||||
internal-objc-program-all:: before-$(TARGET)-all $(GNUSTEP_OBJ_DIR) \
|
||||
internal-objc_program-all:: before-$(TARGET)-all $(GNUSTEP_OBJ_DIR) \
|
||||
$(GNUSTEP_OBJ_DIR)/$(INTERNAL_objc_program_NAME) after-$(TARGET)-all
|
||||
|
||||
before-$(TARGET)-all::
|
||||
|
||||
after-$(TARGET)-all::
|
||||
|
||||
internal-objc-program-install:: internal-install-objc-dirs install-objc-program
|
||||
internal-objc_program-install:: internal-install-objc-dirs install-objc_program
|
||||
|
||||
internal-install-objc-dirs::
|
||||
$(GNUSTEP_MAKEFILES)/mkinstalldirs $(OBJC_PROGRAM_INSTALLATION_DIR)
|
||||
|
||||
install-objc-program::
|
||||
$(INSTALL_PROGRAM) -m 0755 $(INTERNAL_objc_program_NAME) \
|
||||
install-objc_program::
|
||||
$(INSTALL_PROGRAM) -m 0755 \
|
||||
$(GNUSTEP_OBJ_DIR)/$(INTERNAL_objc_program_NAME) \
|
||||
$(OBJC_PROGRAM_INSTALLATION_DIR);
|
||||
|
||||
#
|
||||
# Cleaning targets
|
||||
#
|
||||
internal-objc-program-clean::
|
||||
internal-objc_program-clean::
|
||||
rm -f $(OBJC_PROGRAM_NAME)
|
||||
rm -rf $(GNUSTEP_OBJ_PREFIX)
|
||||
|
||||
internal-objc-program-distclean::
|
||||
internal-objc_program-distclean::
|
||||
rm -rf shared_obj static_obj shared_debug_obj shared_profile_obj \
|
||||
static_debug_obj static_profile_obj shared_profile_debug_obj \
|
||||
static_profile_debug_obj
|
||||
|
|
|
|||
20
rules.make
20
rules.make
|
|
@ -110,29 +110,29 @@ ALL_OBJCFLAGS = $(INTERNAL_OBJCFLAGS) $(ADDITIONAL_OBJCFLAGS) \
|
|||
$(AUXILIARY_OBJCFLAGS) $(ADDITIONAL_INCLUDE_DIRS) \
|
||||
$(AUXILIARY_INCLUDE_DIRS) -I. $(SYSTEM_INCLUDES) \
|
||||
$(GNUSTEP_HEADERS_FND_FLAG) $(GNUSTEP_HEADERS_GUI_FLAG) \
|
||||
$(GNUSTEP_HEADERS_TARGET_FLAG) -I$(GNUSTEP_USER_HEADERS) \
|
||||
-I$(GNUSTEP_LOCAL_HEADERS) -I$(GNUSTEP_SYSTEM_HEADERS)
|
||||
$(GNUSTEP_HEADERS_TARGET_FLAG) $(GNUSTEP_USER_HEADERS_FLAG) \
|
||||
$(GNUSTEP_LOCAL_HEADERS_FLAG) -I$(GNUSTEP_SYSTEM_HEADERS)
|
||||
|
||||
ALL_CFLAGS = $(INTERNAL_CFLAGS) $(ADDITIONAL_CFLAGS) \
|
||||
$(AUXILIARY_CFLAGS) $(ADDITIONAL_INCLUDE_DIRS) \
|
||||
$(AUXILIARY_INCLUDE_DIRS) -I. $(SYSTEM_INCLUDES) \
|
||||
$(GNUSTEP_HEADERS_FND_FLAG) $(GNUSTEP_HEADERS_GUI_FLAG) \
|
||||
$(GNUSTEP_HEADERS_TARGET_FLAG) -I$(GNUSTEP_USER_HEADERS) \
|
||||
-I$(GNUSTEP_LOCAL_HEADERS) -I$(GNUSTEP_SYSTEM_HEADERS)
|
||||
$(GNUSTEP_HEADERS_TARGET_FLAG) $(GNUSTEP_USER_HEADERS_FLAG) \
|
||||
$(GNUSTEP_LOCAL_HEADERS_FLAG) -I$(GNUSTEP_SYSTEM_HEADERS)
|
||||
|
||||
ALL_LDFLAGS = $(ADDITIONAL_LDFLAGS) $(AUXILIARY_LDFLAGS) $(GUI_LDFLAGS) \
|
||||
$(BACKEND_LDFLAGS) $(SYSTEM_LDFLAGS) $(INTERNAL_LDFLAGS)
|
||||
|
||||
ALL_LIB_DIRS = $(ADDITIONAL_LIB_DIRS) $(AUXILIARY_LIB_DIRS) \
|
||||
-L$(GNUSTEP_USER_LIBRARIES) -L$(GNUSTEP_USER_LIBRARIES_ROOT) \
|
||||
-L$(GNUSTEP_LOCAL_LIBRARIES) -L$(GNUSTEP_LOCAL_LIBRARIES_ROOT) \
|
||||
-L$(GNUSTEP_SYSTEM_LIBRARIES) -L$(GNUSTEP_SYSTEM_LIBRARIES_ROOT) \
|
||||
$(GNUSTEP_USER_LIBRARIES_FLAG) $(GNUSTEP_USER_TARGET_LIBRARIES_FLAG) \
|
||||
$(GNUSTEP_LOCAL_LIBRARIES_FLAG) $(GNUSTEP_LOCAL_TARGET_LIBRARIES_FLAG) \
|
||||
-L$(GNUSTEP_SYSTEM_LIBRARIES) -L$(GNUSTEP_SYSTEM_TARGET_LIBRARIES) \
|
||||
$(SYSTEM_LIB_DIR)
|
||||
|
||||
LIB_DIRS_NO_SYSTEM = $(ADDITIONAL_LIB_DIRS) \
|
||||
-L$(GNUSTEP_USER_LIBRARIES) -L$(GNUSTEP_USER_LIBRARIES_ROOT) \
|
||||
-L$(GNUSTEP_LOCAL_LIBRARIES) -L$(GNUSTEP_LOCAL_LIBRARIES_ROOT) \
|
||||
-L$(GNUSTEP_SYSTEM_LIBRARIES) -L$(GNUSTEP_SYSTEM_LIBRARIES_ROOT)
|
||||
$(GNUSTEP_USER_LIBRARIES_FLAG) $(GNUSTEP_USER_TARGET_LIBRARIES_FLAG) \
|
||||
$(GNUSTEP_LOCAL_LIBRARIES_FLAG) $(GNUSTEP_LOCAL_TARGET_LIBRARIES_FLAG) \
|
||||
-L$(GNUSTEP_SYSTEM_LIBRARIES) -L$(GNUSTEP_SYSTEM_TARGET_LIBRARIES)
|
||||
|
||||
|
||||
ifneq ($(LIBRARIES_DEPEND_UPON),)
|
||||
|
|
|
|||
Loading…
Reference in a new issue