mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-23 22:33:28 +00:00
* GNUstep-reset.sh: Unset DYLD_LIBRARY_PATH and
DYLD_FRAMEWORK_PATH. * common.make: Mark as makefile for emacs. Add support for setting GNUSTEP_FRAMEWORKS_DIRS and GNUSTEP_FRAMEWORKS_FLAGS for apple-apple-apple. * ld_lib_path.(c)sh: Set DYLD_FRAMEWORK_PATH for apple-apple-apple. * rules.make: Added support for GNUSTEP_FRAMEWORKS_FLAGS. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@19000 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
David Ayers
parent
f6f446fc27
commit
9e97f4ca7d
6 changed files with 101 additions and 6 deletions
12
ChangeLog
12
ChangeLog
|
|
@ -1,3 +1,14 @@
|
|||
2004-04-02 David Ayers <d.ayers@inode.at>
|
||||
|
||||
* GNUstep-reset.sh: Unset DYLD_LIBRARY_PATH and
|
||||
DYLD_FRAMEWORK_PATH.
|
||||
* common.make: Mark as makefile for emacs. Add support for
|
||||
setting GNUSTEP_FRAMEWORKS_DIRS and GNUSTEP_FRAMEWORKS_FLAGS
|
||||
for apple-apple-apple.
|
||||
* ld_lib_path.(c)sh: Set DYLD_FRAMEWORK_PATH for
|
||||
apple-apple-apple.
|
||||
* rules.make: Added support for GNUSTEP_FRAMEWORKS_FLAGS.
|
||||
|
||||
Wed Mar 31 11:46:03 2004 Nicola Pero <n.pero@mi.flashnet.it>
|
||||
|
||||
* Instance/bundle.make: Use ALL_LDFLAGS when running DLLWRAP on
|
||||
|
|
@ -15,7 +26,6 @@ Wed Mar 31 11:44:21 2004 Willem Rein Oudshoorn <woudshoo@xs4all.nl>
|
|||
* Instance/Documentation/autogsdoc.make: Make doc subdirectory if
|
||||
necessary.
|
||||
|
||||
2004-03-28 David Ayers <d.ayers@inode.at>
|
||||
2004-03-31 Richard Frith-Macdonald <rfm@gnu.org>
|
||||
|
||||
* jni.make: Add support for MacOS-X ... use the java 1.3.1 headers
|
||||
|
|
|
|||
|
|
@ -83,6 +83,8 @@ function reset_path
|
|||
reset_path CLASSPATH
|
||||
reset_path GUILE_LOAD_PATH
|
||||
reset_path LD_LIBRARY_PATH
|
||||
reset_path DYLD_LIBRARY_PATH
|
||||
reset_path DYLD_FRAMEWORK_PATH
|
||||
reset_path PATH
|
||||
|
||||
# Make sure we destroy the reset_path function after using it - we don't
|
||||
|
|
|
|||
15
common.make
15
common.make
|
|
@ -1,4 +1,4 @@
|
|||
#
|
||||
# -*-makefile-*-
|
||||
# common.make
|
||||
#
|
||||
# Set all of the common environment variables.
|
||||
|
|
@ -239,6 +239,12 @@ GS_LIBRARY_PATH = $(dir)/Library/Libraries
|
|||
|
||||
endif
|
||||
|
||||
ifeq ($(FOUNDATION_LIB), apple)
|
||||
GS_FRAMEWORK_PATH = $(dir)/Library/Frameworks
|
||||
else
|
||||
GS_FRAMEWORK_PATH =
|
||||
endif
|
||||
|
||||
# First, we add paths based on GNUSTEP_USER_ROOT.
|
||||
|
||||
# Please note that the following causes GS_HEADER_PATH to be evaluated
|
||||
|
|
@ -246,6 +252,7 @@ endif
|
|||
# effect we wanted.
|
||||
GNUSTEP_HEADERS_DIRS = $(foreach dir,$(GNUSTEP_USER_ROOT),$(GS_HEADER_PATH))
|
||||
GNUSTEP_LIBRARIES_DIRS = $(foreach dir,$(GNUSTEP_USER_ROOT),$(GS_LIBRARY_PATH))
|
||||
GNUSTEP_FRAMEWORKS_DIRS = $(foreach dir,$(GNUSTEP_USER_ROOT),$(GS_FRAMEWORK_PATH))
|
||||
|
||||
# Second, if GNUSTEP_LOCAL_ROOT is different from GNUSTEP_USER_ROOT
|
||||
# (which has already been added), we add the paths based on
|
||||
|
|
@ -253,6 +260,7 @@ GNUSTEP_LIBRARIES_DIRS = $(foreach dir,$(GNUSTEP_USER_ROOT),$(GS_LIBRARY_PATH))
|
|||
ifneq ($(GNUSTEP_LOCAL_ROOT), $(GNUSTEP_USER_ROOT))
|
||||
GNUSTEP_HEADERS_DIRS += $(foreach dir,$(GNUSTEP_LOCAL_ROOT),$(GS_HEADER_PATH))
|
||||
GNUSTEP_LIBRARIES_DIRS += $(foreach dir,$(GNUSTEP_LOCAL_ROOT),$(GS_LIBRARY_PATH))
|
||||
GNUSTEP_FRAMEWORKS_DIRS += $(foreach dir,$(GNUSTEP_LOCAL_ROOT),$(GS_FRAMEWORK_PATH))
|
||||
endif
|
||||
|
||||
# Third, if GNUSTEP_NETWORK_ROOT is different from GNUSTEP_USER_ROOT and
|
||||
|
|
@ -262,6 +270,7 @@ ifneq ($(GNUSTEP_NETWORK_ROOT), $(GNUSTEP_USER_ROOT))
|
|||
ifneq ($(GNUSTEP_NETWORK_ROOT), $(GNUSTEP_LOCAL_ROOT))
|
||||
GNUSTEP_HEADERS_DIRS += $(foreach dir,$(GNUSTEP_NETWORK_ROOT),$(GS_HEADER_PATH))
|
||||
GNUSTEP_LIBRARIES_DIRS += $(foreach dir,$(GNUSTEP_NETWORK_ROOT),$(GS_LIBRARY_PATH))
|
||||
GNUSTEP_FRAMEWORKS_DIRS += $(foreach dir,$(GNUSTEP_NETWORK_ROOT),$(GS_FRAMEWORK_PATH))
|
||||
endif
|
||||
endif
|
||||
|
||||
|
|
@ -273,6 +282,7 @@ ifneq ($(GNUSTEP_SYSTEM_ROOT), $(GNUSTEP_LOCAL_ROOT))
|
|||
ifneq ($(GNUSTEP_SYSTEM_ROOT), $(GNUSTEP_NETWORK_ROOT))
|
||||
GNUSTEP_HEADERS_DIRS += $(foreach dir,$(GNUSTEP_SYSTEM_ROOT),$(GS_HEADER_PATH))
|
||||
GNUSTEP_LIBRARIES_DIRS += $(foreach dir,$(GNUSTEP_SYSTEM_ROOT),$(GS_LIBRARY_PATH))
|
||||
GNUSTEP_FRAMEWORKS_DIRS += $(foreach dir,$(GNUSTEP_SYSTEM_ROOT),$(GS_FRAMEWORK_PATH))
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
|
@ -301,10 +311,13 @@ ifeq ($(REMOVE_EMPTY_DIRS),yes)
|
|||
$(addprefix -I,$(foreach dir,$(GNUSTEP_HEADERS_DIRS),$(remove_if_empty)))
|
||||
GNUSTEP_LIBRARIES_FLAGS = \
|
||||
$(addprefix -L,$(foreach dir,$(GNUSTEP_LIBRARIES_DIRS),$(remove_if_empty)))
|
||||
GNUSTEP_FRAMEWORKS_FLAGS = \
|
||||
$(addprefix -F,$(foreach dir,$(GNUSTEP_FRAMEWORKS_DIRS),$(remove_if_empty))
|
||||
else
|
||||
# Default case, just add -I / -L
|
||||
GNUSTEP_HEADERS_FLAGS = $(addprefix -I,$(GNUSTEP_HEADERS_DIRS))
|
||||
GNUSTEP_LIBRARIES_FLAGS = $(addprefix -L,$(GNUSTEP_LIBRARIES_DIRS))
|
||||
GNUSTEP_FRAMEWORKS_FLAGS = $(addprefix -F,$(GNUSTEP_FRAMEWORKS_DIRS))
|
||||
endif
|
||||
|
||||
ifeq ($(FOUNDATION_LIB), fd)
|
||||
|
|
|
|||
|
|
@ -41,6 +41,10 @@ endif
|
|||
|
||||
set lib_paths="${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_USER_ROOT}/${tool_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${tool_path_part}:${GNUSTEP_NETWORK_ROOT}/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${tool_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${tool_path_part}"
|
||||
|
||||
set last_path_part="Library/Frameworks"
|
||||
|
||||
set fw_paths="${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}"
|
||||
|
||||
switch ( "${host_os}" )
|
||||
|
||||
case *nextstep4* :
|
||||
|
|
@ -79,6 +83,28 @@ switch ( "${host_os}" )
|
|||
setenv DYLD_LIBRARY_PATH="${additional}${DYLD_LIBRARY_PATH}"
|
||||
endif
|
||||
endif
|
||||
|
||||
if ( ( "${LIBRARY_COMBO}" == "apple-apple-apple" ) \
|
||||
|| ( "${LIBRARY_COMBO}" == "apple") ) then
|
||||
unset additional
|
||||
|
||||
if ( $?DYLD_FRAMEWORK_PATH == 0 ) then
|
||||
setenv DYLD_FRAMEWORK_PATH "${fw_paths}"
|
||||
else if ( { (echo "${DYLD_FRAMEWORK_PATH}" | fgrep -v "${fw_paths}" >/dev/null) } ) then
|
||||
setenv DYLD_FRAMEWORK_PATH "${fw_paths}:${DYLD_FRAMEWORK_PATH}"
|
||||
endif
|
||||
if ( $?additional_framework_paths == 1) then
|
||||
foreach dir (${additional_framework_paths})
|
||||
set additional="${additional}${dir}:"
|
||||
end
|
||||
endif
|
||||
|
||||
if ( "${?additional}" == "1" ) then
|
||||
if ( { (echo "${DYLD_FRAMEWORK_PATH}" | fgrep -v "${additional}" >/dev/null) } ) then
|
||||
setenv DYLD_FRAMEWORK_PATH="${additional}${DYLD_FRAMEWORK_PATH}"
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
breaksw
|
||||
|
||||
case *hpux* :
|
||||
|
|
@ -139,5 +165,5 @@ switch ( "${host_os}" )
|
|||
|
||||
endsw
|
||||
|
||||
unset tool_path_part last_path_part host_os additional dir lib_paths
|
||||
unset tool_path_part last_path_part host_os additional dir lib_paths fw_paths
|
||||
|
||||
|
|
|
|||
|
|
@ -40,9 +40,10 @@ fi
|
|||
old_IFS="$IFS"
|
||||
IFS=:
|
||||
lib_paths=
|
||||
fw_paths=
|
||||
for dir in $GNUSTEP_PATHLIST; do
|
||||
|
||||
# prepare the path_fragment for this dir
|
||||
# prepare the path_fragment for libraries and this dir
|
||||
if [ -z "$GNUSTEP_FLATTENED" ]; then
|
||||
path_fragment="$dir/Library/Libraries/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO:$dir/Library/Libraries/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS"
|
||||
else
|
||||
|
|
@ -56,6 +57,16 @@ for dir in $GNUSTEP_PATHLIST; do
|
|||
lib_paths="$lib_paths:$path_fragment"
|
||||
fi
|
||||
|
||||
# prepare the path_fragment for frameworks and this dir
|
||||
path_fragment="$dir/Library/Frameworks"
|
||||
|
||||
# Append the path_fragment to fw_paths
|
||||
if [ -z "$fw_paths" ]; then
|
||||
fw_paths="$path_fragment"
|
||||
else
|
||||
fw_paths="$fw_paths:$path_fragment"
|
||||
fi
|
||||
|
||||
unset path_fragment
|
||||
|
||||
done
|
||||
|
|
@ -81,6 +92,23 @@ if [ -n "$additional_library_paths" ]; then
|
|||
unset old_IFS
|
||||
fi
|
||||
|
||||
if [ -n "$additional_framework_paths" ]; then
|
||||
old_IFS="$IFS"
|
||||
IFS="
|
||||
"
|
||||
additional=""
|
||||
for dir in $additional_framework_paths; do
|
||||
additional="${additional}${dir}:"
|
||||
done
|
||||
unset dir
|
||||
|
||||
fw_paths="${additional}${fw_paths}"
|
||||
|
||||
unset additional
|
||||
IFS="$old_IFS"
|
||||
unset old_IFS
|
||||
fi
|
||||
|
||||
case "$host_os" in
|
||||
|
||||
*nextstep4*)
|
||||
|
|
@ -103,6 +131,18 @@ case "$host_os" in
|
|||
fi
|
||||
fi
|
||||
export DYLD_LIBRARY_PATH
|
||||
if [ "$LIBRARY_COMBO" = "apple-apple-apple" -o \
|
||||
"$LIBRARY_COMBO" = "apple" ]; then
|
||||
if [ -z "$DYLD_FRAMEWORK_PATH" ]; then
|
||||
DYLD_FRAMEWORK_PATH="$fw_paths"
|
||||
else
|
||||
if ( echo ${DYLD_FRAMEWORK_PATH}|
|
||||
fgrep -v "${fw_paths}" >/dev/null ); then
|
||||
DYLD_FRAMEWORK_PATH="$fw_paths:$DYLD_FRAMEWORK_PATH"
|
||||
fi
|
||||
fi
|
||||
export DYLD_FRAMEWORK_PATH
|
||||
fi
|
||||
;;
|
||||
|
||||
*hpux*)
|
||||
|
|
@ -137,4 +177,5 @@ esac
|
|||
|
||||
unset host_os
|
||||
unset lib_paths
|
||||
unset fw_paths
|
||||
|
||||
|
|
|
|||
|
|
@ -235,14 +235,16 @@ ALL_OBJCFLAGS = $(INTERNAL_OBJCFLAGS) $(ADDITIONAL_OBJCFLAGS) \
|
|||
$(AUXILIARY_INCLUDE_DIRS) \
|
||||
$(DERIVED_SOURCES_HEADERS_FLAG) \
|
||||
-I. $(SYSTEM_INCLUDES) \
|
||||
$(GNUSTEP_HEADERS_FLAGS)
|
||||
$(GNUSTEP_HEADERS_FLAGS) \
|
||||
$(GNUSTEP_FRAMEWORKS_FLAGS)
|
||||
|
||||
ALL_CFLAGS = $(INTERNAL_CFLAGS) $(ADDITIONAL_CFLAGS) \
|
||||
$(AUXILIARY_CFLAGS) $(ADDITIONAL_INCLUDE_DIRS) \
|
||||
$(AUXILIARY_INCLUDE_DIRS) \
|
||||
$(DERIVED_SOURCES_HEADERS_FLAG) \
|
||||
-I. $(SYSTEM_INCLUDES) \
|
||||
$(GNUSTEP_HEADERS_FLAGS)
|
||||
$(GNUSTEP_HEADERS_FLAGS) \
|
||||
$(GNUSTEP_FRAMEWORKS_FLAGS)
|
||||
|
||||
# if you need, you can define ADDITIONAL_CCFLAGS to add C++ specific flags
|
||||
ALL_CCFLAGS = $(ADDITIONAL_CCFLAGS) $(AUXILIARY_CCFLAGS)
|
||||
|
|
@ -266,6 +268,7 @@ ALL_LDFLAGS += $(ADDITIONAL_LDFLAGS) $(AUXILIARY_LDFLAGS) $(GUI_LDFLAGS) \
|
|||
ALL_LIB_DIRS = $(ADDITIONAL_FRAMEWORK_DIRS) $(AUXILIARY_FRAMEWORK_DIRS) \
|
||||
$(ADDITIONAL_LIB_DIRS) $(AUXILIARY_LIB_DIRS) \
|
||||
$(GNUSTEP_LIBRARIES_FLAGS) \
|
||||
$(GNUSTEP_FRAMEWORKS_FLAGS) \
|
||||
$(SYSTEM_LIB_DIR)
|
||||
|
||||
# We use .plist (property-list files, see gnustep-base) in quite a few
|
||||
|
|
|
|||
Loading…
Reference in a new issue