mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-22 22:00:49 +00:00
Add AUXILIARY macros for auxiliary libraries.
Minor bug fixes. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@2609 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Scott Christley
parent
4e25f9b437
commit
ed39f705a7
5 changed files with 39 additions and 17 deletions
15
ChangeLog
15
ChangeLog
|
|
@ -1,3 +1,14 @@
|
|||
Sat Nov 1 13:17:07 1997 Scott Christley <scottc@net-community.com>
|
||||
|
||||
* brain.make: Export LIBRARY_COMBO.
|
||||
* common.make: Target and GUI header include flags should
|
||||
contain user, local, and system roots. Rename GNUSTEP_TARGET_HEADERS
|
||||
to GNUSTEP_HEADERS_TARGET_FLAG.
|
||||
* rules.make: Rename GNUSTEP_TARGET_HEADERS to
|
||||
GNUSTEP_HEADERS_TARGET_FLAG. Add AUXILIARY macros for auxiliary
|
||||
libraries to add flags (e.g. gnustep-db).
|
||||
* test.make: Put additional_library_paths outside of for loop.
|
||||
|
||||
Thu Oct 31 11:30:00 1997 Richard Frith-Macdonald <richard@brainstorm.co.uk>
|
||||
|
||||
* which_lib.c: Modified for systems where realloc() doesn't handle
|
||||
|
|
@ -12,7 +23,7 @@ Thu Oct 30 17:22:13 1997 Ovidiu Predescu <ovidiu@net-community.com>
|
|||
* test.make: Likewise. Correctly process the additional library paths
|
||||
so it contains only absolute paths.
|
||||
|
||||
Thu Oct 30 15:49:53 1997 Scott Christley <scottc@stetson.net-community.com>
|
||||
Thu Oct 30 15:49:53 1997 Scott Christley <scottc@net-community.com>
|
||||
|
||||
* rules.make: Fix variables when building test applications.
|
||||
* test.make: Fix rules for building test applications.
|
||||
|
|
@ -338,7 +349,7 @@ Fri Oct 3 13:43:18 1997 Ovidiu Predescu <ovidiu@net-community.com>
|
|||
* rules.make: internal-distclean does not make first the clean target.
|
||||
* target.make: Shared libraries under OS 4.x have the .so extension.
|
||||
|
||||
Thu Oct 2 14:56:08 1997 Scott Christley <scottc@stetson.net-community.com>
|
||||
Thu Oct 2 14:56:08 1997 Scott Christley <scottc@net-community.com>
|
||||
|
||||
* ld_lib_path.sh: New file.
|
||||
* common.make: Add variables which define explicit paths to the
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ ifneq ($(backend),)
|
|||
GUI_BACKEND_LIB = $(backend)
|
||||
endif
|
||||
|
||||
LIBRARY_COMBO = $(OBJC_RUNTIME_LIB)-$(FOUNDATION_LIB)-$(GUI_LIB)-$(GUI_BACKEND_LIB)
|
||||
export LIBRARY_COMBO = $(OBJC_RUNTIME_LIB)-$(FOUNDATION_LIB)-$(GUI_LIB)-$(GUI_BACKEND_LIB)
|
||||
|
||||
OBJC_LDFLAGS =
|
||||
OBJC_LIBS =
|
||||
|
|
|
|||
17
common.make
17
common.make
|
|
@ -78,7 +78,6 @@ endif
|
|||
GNUSTEP_APPS = $(GNUSTEP_INSTALLATION_DIR)/Apps
|
||||
GNUSTEP_TOOLS = $(GNUSTEP_INSTALLATION_DIR)/Tools
|
||||
GNUSTEP_HEADERS = $(GNUSTEP_INSTALLATION_DIR)/Headers
|
||||
GNUSTEP_TARGET_HEADERS = $(GNUSTEP_HEADERS)/$(GNUSTEP_TARGET_DIR)
|
||||
GNUSTEP_LIBRARIES_ROOT = $(GNUSTEP_INSTALLATION_DIR)/Libraries
|
||||
GNUSTEP_TARGET_LIBRARIES = $(GNUSTEP_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_DIR)
|
||||
GNUSTEP_LIBRARIES = $(GNUSTEP_TARGET_LIBRARIES)/$(LIBRARY_COMBO)
|
||||
|
|
@ -107,6 +106,14 @@ GNUSTEP_USER_TARGET_LIBRARIES = \
|
|||
GNUSTEP_USER_LIBRARIES = $(GNUSTEP_USER_TARGET_LIBRARIES)/$(LIBRARY_COMBO)
|
||||
GNUSTEP_USER_HEADERS = $(GNUSTEP_USER_ROOT)/Headers
|
||||
|
||||
#
|
||||
# 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)
|
||||
|
||||
#
|
||||
# Determine Foundation header subdirectory based upon library combo
|
||||
#
|
||||
|
|
@ -147,12 +154,14 @@ endif
|
|||
# Determine AppKit header subdirectory based upon library combo
|
||||
#
|
||||
ifeq ($(GUI_LIB),gnu)
|
||||
GNUSTEP_HEADERS_GUI = $(GNUSTEP_HEADERS)/gnustep/gui
|
||||
GNUSTEP_HEADERS_GUI_FLAG = -I$(GNUSTEP_HEADERS_GUI)
|
||||
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)
|
||||
endif
|
||||
|
||||
ifeq ($(GUI_LIB),nx)
|
||||
GNUSTEP_HEADERS_GUI =
|
||||
GNUSTEP_GUI_DIR =
|
||||
#GNUSTEP_HEADERS_GUI_FLAG = -framework AppKit
|
||||
endif
|
||||
|
||||
|
|
|
|||
16
rules.make
16
rules.make
|
|
@ -23,24 +23,26 @@
|
|||
ifneq ($(RULES_LOADED),yes)
|
||||
RULES_LOADED := yes
|
||||
|
||||
ALL_CPPFLAGS = $(CPPFLAGS) $(ADDITIONAL_CPPFLAGS)
|
||||
ALL_CPPFLAGS = $(CPPFLAGS) $(ADDITIONAL_CPPFLAGS) $(AUXILIARY_CPPFLAGS)
|
||||
|
||||
ALL_OBJCFLAGS = $(INTERNAL_OBJCFLAGS) $(ADDITIONAL_OBJCFLAGS) \
|
||||
$(ADDITIONAL_INCLUDE_DIRS) -I. $(SYSTEM_INCLUDES) \
|
||||
$(AUXILIARY_OBJCFLAGS) $(ADDITIONAL_INCLUDE_DIRS) \
|
||||
$(AUXILIARY_INCLUDE_DIRS) -I. $(SYSTEM_INCLUDES) \
|
||||
$(GNUSTEP_HEADERS_FND_FLAG) $(GNUSTEP_HEADERS_GUI_FLAG) \
|
||||
-I$(GNUSTEP_TARGET_HEADERS) -I$(GNUSTEP_USER_HEADERS) \
|
||||
-I$(GNUSTEP_HEADERS_TARGET_FLAG) -I$(GNUSTEP_USER_HEADERS) \
|
||||
-I$(GNUSTEP_LOCAL_HEADERS) -I$(GNUSTEP_SYSTEM_HEADERS)
|
||||
|
||||
ALL_CFLAGS = $(INTERNAL_CFLAGS) $(ADDITIONAL_CFLAGS) \
|
||||
$(ADDITIONAL_INCLUDE_DIRS) -I. $(SYSTEM_INCLUDES) \
|
||||
$(AUXILIARY_CFLAGS) $(ADDITIONAL_INCLUDE_DIRS) \
|
||||
$(AUXILIARY_INCLUDE_DIRS) -I. $(SYSTEM_INCLUDES) \
|
||||
$(GNUSTEP_HEADERS_FND_FLAG) $(GNUSTEP_HEADERS_GUI_FLAG) \
|
||||
-I$(GNUSTEP_TARGET_HEADERS) -I$(GNUSTEP_USER_HEADERS) \
|
||||
-I$(GNUSTEP_HEADERS_TARGET_FLAG) -I$(GNUSTEP_USER_HEADERS) \
|
||||
-I$(GNUSTEP_LOCAL_HEADERS) -I$(GNUSTEP_SYSTEM_HEADERS)
|
||||
|
||||
ALL_LDFLAGS = $(ADDITIONAL_LDFLAGS) $(GUI_LDFLAGS) \
|
||||
ALL_LDFLAGS = $(ADDITIONAL_LDFLAGS) $(AUXILIARY_LDFLAGS) $(GUI_LDFLAGS) \
|
||||
$(BACKEND_LDFLAGS) $(SYSTEM_LDFLAGS) $(INTERNAL_LDFLAGS)
|
||||
|
||||
ALL_LIB_DIRS = $(ADDITIONAL_LIB_DIRS) \
|
||||
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) \
|
||||
|
|
|
|||
|
|
@ -257,10 +257,10 @@ dejagnu_vars = "FOUNDATION_LIBRARY=$(FOUNDATION_LIB)" \
|
|||
"OBJC_RUNTIME=$(OBJC_RUNTIME)"
|
||||
|
||||
internal-check-%:: $(SCRIPTS_DIRECTORY)/config/unix.exp
|
||||
@(for f in $(CHECK_SCRIPT_DIRS); do \
|
||||
additional_library_paths="`echo $(ADDITIONAL_LIB_DIRS) | sed 's/-L//g'`"; \
|
||||
additional_library_paths="`$(GNUSTEP_SYSTEM_ROOT)/Makefiles/transform_paths.sh $$additional_library_paths`" \
|
||||
@(additional_library_paths="`echo $(ADDITIONAL_LIB_DIRS) | sed 's/-L//g'`"; \
|
||||
additional_library_paths="`$(GNUSTEP_SYSTEM_ROOT)/Makefiles/transform_paths.sh $$additional_library_paths`"; \
|
||||
. $(GNUSTEP_SYSTEM_ROOT)/Makefiles/ld_lib_path.sh; \
|
||||
for f in $(CHECK_SCRIPT_DIRS); do \
|
||||
if [ "$(SCRIPTS_DIRECTORY)" != "" ]; then \
|
||||
echo "cd $(SCRIPTS_DIRECTORY); runtest --tool $$f --srcdir . PROG=../$(GNUSTEP_OBJ_DIR)/$(TEST_$*_NAME) $(dejagnu_vars) $(ADDITIONAL_DEJAGNU_VARS)"; \
|
||||
(cd $(SCRIPTS_DIRECTORY); runtest --tool $$f --srcdir . PROG=../$(GNUSTEP_OBJ_DIR)/$(TEST_$*_NAME) $(dejagnu_vars) $(ADDITIONAL_DEJAGNU_VARS)); \
|
||||
|
|
|
|||
Loading…
Reference in a new issue