gnustep/tools-make
0
0
Fork 0
mirror of https://github.com/gnustep/tools-make.git synced 2025-04-23 22:33:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Many updates for flattened directory structure.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@8252 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2000-12-05 16:11:55 +00:00
parent b40914bbc8
commit 5e4f567731
25 changed files with 1047 additions and 810 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
ChangeLog
View file

@ -1,3 +1,33 @@
2000-12-05 Richard Frith-Macdonald <rfm@gnu.org>
* make/GNUmakefile.in:
* make/GNUstep.csh.in:
* make/GNUstep.sh.in:
* make/MediaBook.func:
* make/README:
* make/application.make:
* make/brain.make:
* make/bundle.make:
* make/common.make:
* make/configure:
* make/configure.in:
* make/ctool.make:
* make/framework.make:
* make/gswapp.make:
* make/gswbundle.make:
* make/ld_lib_path.csh:
* make/ld_lib_path.sh:
* make/library.make:
* make/palette.make:
* make/service.make:
* make/target.make:
* make/tool.make:
* make/woapp.make:
* make/wobundle.make:
Updated for flattened directory structure - use GNUSTEP_XXX_DIR and
GNUASTEP_XXX_LDIR for referring to directories with and without the
library combo. Localise changes as much as possible.
Mon Nov 27 16:28:12 2000 Nicola Pero <n.pero@mi.flashnet.it>
* documentation.make (internal-doc-clean): Ignore errors when

16
GNUmakefile.in
View file

@ -38,18 +38,28 @@ libdir = @libdir@
includedir = @includedir@
datadir = @datadir@
GNUSTEP_FLATTENED := @GNUSTEP_FLATTENED@
GNUSTEP_TARGET_CPU := @target_cpu@
GNUSTEP_TARGET_OS := @target_os@
GNUSTEP_LIB_COMBO := @ac_cv_library_combo@
GNUSTEP_TARGET_VENDOR := @target_vendor@
GNUSTEP_TARGET_CPU := $(shell ./clean_cpu.sh $(GNUSTEP_TARGET_CPU))
GNUSTEP_TARGET_VENDOR := $(shell ./clean_vendor.sh $(GNUSTEP_TARGET_VENDOR))
GNUSTEP_TARGET_OS := $(shell ./clean_os.sh $(GNUSTEP_TARGET_OS))
GNUSTEP_LIB_COMBO := @ac_cv_library_combo@
ifeq ($(GNUSTEP_FLATTENED),)
GNUSTEP_TARGET_DIR = $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)
GNUSTEP_TARGET_LDIR = $(GNUSTEP_TARGET_DIR)/$(GNUSTEP_LIB_COMBO)
else
GNUSTEP_TARGET_DIR = .
GNUSTEP_TARGET_LDIR = .
endif
makedir = $(prefix)/Makefiles
tooldir = $(prefix)/Tools
librarydir = $(prefix)/Libraries
GNUSTEP_TARGET_DIR = $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@ -76,7 +86,7 @@ install: all
$(prefix)/share \
$(prefix)/Apps \
$(prefix)/Libraries/$(GNUSTEP_TARGET_DIR) \
$(prefix)/Libraries/$(GNUSTEP_TARGET_DIR)/$(GNUSTEP_LIB_COMBO) \
$(prefix)/Libraries/$(GNUSTEP_TARGET_LDIR) \
$(prefix)/Headers/$(GNUSTEP_TARGET_DIR) \
$(prefix)/Tools/$(GNUSTEP_TARGET_DIR) \
$(prefix)/Library \

18
GNUstep.csh.in
View file

@ -26,6 +26,7 @@
#
setenv GNUSTEP_ROOT @GNUSTEP_ROOT@
setenv GNUSTEP_SYSTEM_ROOT @prefix@
setenv GNUSTEP_FLATTENED @GNUSTEP_FLATTENED@
if ( ! ${?LIBRARY_COMBO} ) then
setenv LIBRARY_COMBO @ac_cv_library_combo@
endif
@ -74,7 +75,9 @@ endif
set tp = ""
foreach dir ( `/bin/sh -c 'IFS=:; for i in ${GNUSTEP_PATHPREFIX}; do echo $i; done'` )
set tp=${tp}${dir}/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}:
if ( ! ${?GNUSTEP_FLATTENED} ) then
set tp=${tp}${dir}/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}:
endif
set tp=${tp}${dir}/Tools:
end
setenv GNUSTEP_PATHPREFIX_LIST $GNUSTEP_PATHPREFIX
@ -89,9 +92,16 @@ if ( -e ~/.GNUstep/GNUstep.csh ) then
. ~/.GNUstep/GNUstep.csh
endif
set TDIR=${GNUSTEP_SYSTEM_ROOT}/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}
if ( -e $TDIR/$LIBRARY_COMBO/make_services ) then
$TDIR/$LIBRARY_COMBO/make_services &
if ( ${?GNUSTEP_FLATTENED} ) then
set TDIR=${GNUSTEP_SYSTEM_ROOT}/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}
if ( -e $TDIR/$LIBRARY_COMBO/make_services ) then
$TDIR/$LIBRARY_COMBO/make_services &
if ( -e $TDIR/make_services ) then
$TDIR/make_services &
endif
endif
else
set TDIR=${GNUSTEP_SYSTEM_ROOT}/Tools
if ( -e $TDIR/make_services ) then
$TDIR/make_services &
endif

25
GNUstep.sh.in
View file

@ -26,10 +26,11 @@
#
GNUSTEP_ROOT=@GNUSTEP_ROOT@
GNUSTEP_SYSTEM_ROOT=@prefix@
GNUSTEP_FLATTENED=@GNUSTEP_FLATTENED@
if [ -z "$LIBRARY_COMBO" ]; then
LIBRARY_COMBO=@ac_cv_library_combo@
fi
export GNUSTEP_ROOT GNUSTEP_SYSTEM_ROOT LIBRARY_COMBO
export GNUSTEP_ROOT GNUSTEP_SYSTEM_ROOT GNUSTEP_FLATTENED LIBRARY_COMBO
GNUSTEP_LOCAL_ROOT=$GNUSTEP_ROOT/Local
GNUSTEP_NETWORK_ROOT=$GNUSTEP_ROOT/Network
@ -80,8 +81,10 @@ tmp_IFS="$IFS"
IFS=:
temp_path=
for dir in $GNUSTEP_PATHPREFIX_LIST; do
temp_path=$temp_path$dir/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/${LIBRARY_COMBO}:
temp_path=$temp_path$dir/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}:
if [ -z "$GNUSTEP_FLATTENED" ]; then
temp_path=$temp_path$dir/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/${LIBRARY_COMBO}:
temp_path=$temp_path$dir/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}:
fi
temp_path=$temp_path$dir/Tools:
done
IFS="$tmp_IFS"
@ -102,11 +105,19 @@ fi
# Run 'make_services' in background if possible - updates cache of services
# and applications/file-extensions known to the applications.
#
TDIR=$GNUSTEP_SYSTEM_ROOT/Tools/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS
if [ -f $TDIR/$LIBRARY_COMBO/make_services ]
then
$TDIR/$LIBRARY_COMBO/make_services &
if [ -z "$GNUSTEP_FLATTENED" ]; then
TDIR=$GNUSTEP_SYSTEM_ROOT/Tools/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS
if [ -f $TDIR/$LIBRARY_COMBO/make_services ]
then
$TDIR/$LIBRARY_COMBO/make_services &
else
if [ -f $TDIR/make_services ]
then
$TDIR/make_services &
fi
fi
else
TDIR=$GNUSTEP_SYSTEM_ROOT/Tools
if [ -f $TDIR/make_services ]
then
$TDIR/make_services &

741
MediaBook.func
View file

@ -23,366 +23,368 @@
#
# Change to a different version for the current system
#
function ver {
if [ -z $1 ]
then
echo Need to specify a version number
echo Or \"default\" for the default version
return 0
fi
function ver
{
if [ -z $1 ]
then
echo Need to specify a version number
echo Or \"default\" for the default version
return 0
fi
if [ -z $MB_CUR ]
then
echo No current system!
return 0
fi
if [ -z $MB_CUR ]
then
echo No current system!
return 0
fi
# default version
pushd $MB_CUR_SYS >/dev/null
if [ $1 = default ]
then
if [ -e MB.version ]
then
MB_CUR_VER=`cat MB.version`
fi
# default version
pushd $MB_CUR_SYS >/dev/null
if [ $1 = default ]
then
if [ -e MB.version ]
then
MB_CUR_VER=`cat MB.version`
fi
# Abort if no default version
if [ -z $MB_CUR_VER ]
then
echo No default version!
popd >/dev/null
return 0
fi
else
# An explicit version
if [ -e $1 ]
then
MB_CUR_VER=$1
else
echo Version $1 does not exist!
popd >/dev/null
return 0
fi
fi
popd >/dev/null
# Abort if no default version
if [ -z $MB_CUR_VER ]
then
echo No default version!
popd >/dev/null
return 0
fi
else
# An explicit version
if [ -e $1 ]
then
MB_CUR_VER=$1
else
echo Version $1 does not exist!
popd >/dev/null
return 0
fi
fi
popd >/dev/null
# Set the current system directories
MB_CUR_TOP=$MB_CUR_SYS/$MB_CUR_VER
# Set the current system directories
MB_CUR_TOP=$MB_CUR_SYS/$MB_CUR_VER
# Apps
if [ -d $MB_CUR_TOP/Apps ]
then
MB_CUR_BIN=$MB_CUR_TOP/Apps
else if [ -d $MB_CUR_TOP/bin ]
then
MB_CUR_BIN=$MB_CUR_TOP/bin
else
MB_CUR_BIN=$MB_CUR_TOP
fi fi
# Apps
if [ -d $MB_CUR_TOP/Apps ]
then
MB_CUR_BIN=$MB_CUR_TOP/Apps
else if [ -d $MB_CUR_TOP/bin ]
then
MB_CUR_BIN=$MB_CUR_TOP/bin
else
MB_CUR_BIN=$MB_CUR_TOP
fi fi
# Source
if [ -d $MB_CUR_TOP/Source ]
then
MB_CUR_SOU=$MB_CUR_TOP/Source
else if [ -d $MB_CUR_TOP/src ]
then
MB_CUR_SOU=$MB_CUR_TOP/src
else
MB_CUR_SOU=$MB_CUR_TOP
fi fi
# Source
if [ -d $MB_CUR_TOP/Source ]
then
MB_CUR_SOU=$MB_CUR_TOP/Source
else if [ -d $MB_CUR_TOP/src ]
then
MB_CUR_SOU=$MB_CUR_TOP/src
else
MB_CUR_SOU=$MB_CUR_TOP
fi fi
# Headers
if [ -d $MB_CUR_TOP/Headers/$MB_CUR ]
then
MB_CUR_H=$MB_CUR_TOP/Headers/$MB_CUR
else if [ -d $MB_CUR_TOP/Headers ]
then
MB_CUR_H=$MB_CUR_TOP/Headers
else if [ -d $MB_CUR_TOP/include/$MB_CUR ]
then
MB_CUR_H=$MB_CUR_TOP/include/$MB_CUR
else if [ -d $MB_CUR_TOP/include ]
then
MB_CUR_H=$MB_CUR_TOP/include
else
MB_CUR_H=$MB_CUR_TOP
fi fi fi fi
# Headers
if [ -d $MB_CUR_TOP/Headers/$MB_CUR ]
then
MB_CUR_H=$MB_CUR_TOP/Headers/$MB_CUR
else if [ -d $MB_CUR_TOP/Headers ]
then
MB_CUR_H=$MB_CUR_TOP/Headers
else if [ -d $MB_CUR_TOP/include/$MB_CUR ]
then
MB_CUR_H=$MB_CUR_TOP/include/$MB_CUR
else if [ -d $MB_CUR_TOP/include ]
then
MB_CUR_H=$MB_CUR_TOP/include
else
MB_CUR_H=$MB_CUR_TOP
fi fi fi fi
# Tests
if [ -d $MB_CUR_TOP/Testing ]
then
MB_CUR_TST=$MB_CUR_TOP/Testing
else if [ -d $MB_CUR_TOP/checks ]
then
MB_CUR_TST=$MB_CUR_TOP/checks
else
MB_CUR_TST=$MB_CUR_TOP
fi fi
# Tests
if [ -d $MB_CUR_TOP/Testing ]
then
MB_CUR_TST=$MB_CUR_TOP/Testing
else if [ -d $MB_CUR_TOP/checks ]
then
MB_CUR_TST=$MB_CUR_TOP/checks
else
MB_CUR_TST=$MB_CUR_TOP
fi fi
# Documentation
if [ -d $MB_CUR_TOP/Documentation ]
then
MB_CUR_DOC=$MB_CUR_TOP/Documentation
else if [ -d $MB_CUR_TOP/doc ]
then
MB_CUR_DOC=$MB_CUR_TOP/doc
else
MB_CUR_DOC=$MB_CUR_TOP
fi fi
# Documentation
if [ -d $MB_CUR_TOP/Documentation ]
then
MB_CUR_DOC=$MB_CUR_TOP/Documentation
else if [ -d $MB_CUR_TOP/doc ]
then
MB_CUR_DOC=$MB_CUR_TOP/doc
else
MB_CUR_DOC=$MB_CUR_TOP
fi fi
if [ -e $MB_CUR_TOP ]
then
cd $MB_CUR_TOP
else
echo Current version directory does not exist!
cd $MB_CUR_SYS
fi
return 1
if [ -e $MB_CUR_TOP ]
then
cd $MB_CUR_TOP
else
echo Current version directory does not exist!
cd $MB_CUR_SYS
fi
return 1
}
#
# Functions for moving between systems
#
function c {
case $1 in
# Show help
--help | --hel | --he | --h )
echo " "
echo "Parameters"
echo "----------"
echo "--help : Show help"
echo "--status : Show environment status"
echo "--list : List available source systems"
echo " "
echo "Usage"
echo "-----"
echo "c name : Where 'name' is a system name"
echo " or environment directory;"
echo " list systems and directories"
echo " with --list parameter."
echo " "
echo "Additional Shell Functions"
echo "--------------------------"
echo "c : Move between system and directories"
echo " within the MediaBook Environment."
echo "ver : Move to different version directory"
echo " within the same source system."
echo "sys : Move to top-level directory"
echo " for the current source system."
echo "devswitch : Change Development root."
echo "prodswitch: Change Production root."
echo " "
echo "These commands move between various directories"
echo "within the current source system version."
echo " "
echo "bin : Move to bin or Apps"
echo "h : Move to include or Headers"
echo "sou : Move to src or Source"
echo "tst : Move to checks or Testing"
echo "doc : Move to doc or Documentation"
echo "gde : Move to version root"
echo " "
echo "GNUstep source specific commands"
echo "make : Move to root dir of GNUstep Make"
echo "base : Move to root dir of GNUstep Base"
echo "gui : Move to root dir of GNUstep GUI"
echo "xraw : Move to root dir of GNUstep XRaw"
echo "xdps : Move to root dir of GNUstep XDPS"
echo "gtests : Move to root dir of GNUstep tests"
echo " "
;;
function c
{
case $1 in
# Show help
--help | --hel | --he | --h )
echo " "
echo "Parameters"
echo "----------"
echo "--help : Show help"
echo "--status : Show environment status"
echo "--list : List available source systems"
echo " "
echo "Usage"
echo "-----"
echo "c name : Where 'name' is a system name"
echo " or environment directory;"
echo " list systems and directories"
echo " with --list parameter."
echo " "
echo "Additional Shell Functions"
echo "--------------------------"
echo "c : Move between system and directories"
echo " within the MediaBook Environment."
echo "ver : Move to different version directory"
echo " within the same source system."
echo "sys : Move to top-level directory"
echo " for the current source system."
echo "devswitch : Change Development root."
echo "prodswitch: Change Production root."
echo " "
echo "These commands move between various directories"
echo "within the current source system version."
echo " "
echo "bin : Move to bin or Apps"
echo "h : Move to include or Headers"
echo "sou : Move to src or Source"
echo "tst : Move to checks or Testing"
echo "doc : Move to doc or Documentation"
echo "gde : Move to version root"
echo " "
echo "GNUstep source specific commands"
echo "make : Move to root dir of GNUstep Make"
echo "base : Move to root dir of GNUstep Base"
echo "gui : Move to root dir of GNUstep GUI"
echo "xraw : Move to root dir of GNUstep XRaw"
echo "xdps : Move to root dir of GNUstep XDPS"
echo "gtests : Move to root dir of GNUstep tests"
echo " "
;;
# Show current MB environment status
--status | --statu | --stat | --sta | --st | --s )
echo " "
echo " System Root: $GNUSTEP_SYSTEM_ROOT"
echo " Local Root: $GNUSTEP_LOCAL_ROOT"
echo " User Root: $GNUSTEP_USER_ROOT"
echo "Library Combo: $LIBRARY_COMBO"
echo " CVS Root: $CVSROOT"
echo "--------------"
echo " System Name: $MB_CUR"
echo " Version: $MB_CUR_VER"
echo " Description: $MB_SYS"
echo "--------------"
echo " Current: $PWD"
echo " Version Top: $MB_CUR_TOP"
echo " Source: $MB_CUR_SOU"
echo " Headers: $MB_CUR_H"
echo " Tests: $MB_CUR_TST"
echo "Documentation: $MB_CUR_DOC"
echo " "
return
;;
# Show current MB environment status
--status | --statu | --stat | --sta | --st | --s )
echo " "
echo " System Root: $GNUSTEP_SYSTEM_ROOT"
echo " Local Root: $GNUSTEP_LOCAL_ROOT"
echo " User Root: $GNUSTEP_USER_ROOT"
echo "Library Combo: $LIBRARY_COMBO"
echo " CVS Root: $CVSROOT"
echo "--------------"
echo " System Name: $MB_CUR"
echo " Version: $MB_CUR_VER"
echo " Description: $MB_SYS"
echo "--------------"
echo " Current: $PWD"
echo " Version Top: $MB_CUR_TOP"
echo " Source: $MB_CUR_SOU"
echo " Headers: $MB_CUR_H"
echo " Tests: $MB_CUR_TST"
echo "Documentation: $MB_CUR_DOC"
echo " "
return
;;
# List Systems
--list | --lis | --li | --l )
pushd $MB_ROOT >/dev/null
echo " "
echo "Directories"
echo "-----------"
echo "apps : System Applications"
echo "localapps : Local Applications"
echo "userapps : User Applications"
echo "tools : System Command Line Tools"
echo "localtools : Local Command Line Tools"
echo "usertools : User Command Line Tools"
echo "libs : System Libraries"
echo "locallibs : Local Libraries"
echo "userlibs : User Libraries"
echo "head : System Headers"
echo "localhead : Local Headers"
echo "userhead : User Headers"
echo "source : Development Source"
echo " "
echo "List of Available Source Systems"
echo -e "Name \t\t Description"
echo -e "------------ \t -------------------------"
for dir in [ * ]
do
if [ -d $dir ]
then
pushd $dir >/dev/null
# Get system description
if [ -e MB.name ]
then
temp=`cat MB.name`
len=${#dir}
if [ $len -lt 8 ]
then
tabtmp="\t\t"
else
tabtmp="\t"
fi
echo -e "$dir$tabtmp: $temp"
fi
popd >/dev/null
fi
done
echo " "
echo "Type 'c name' to goto that system."
echo " "
popd >/dev/null
return
;;
# List Systems
--list | --lis | --li | --l )
pushd $MB_ROOT >/dev/null
echo " "
echo "Directories"
echo "-----------"
echo "apps : System Applications"
echo "localapps : Local Applications"
echo "userapps : User Applications"
echo "tools : System Command Line Tools"
echo "localtools : Local Command Line Tools"
echo "usertools : User Command Line Tools"
echo "libs : System Libraries"
echo "locallibs : Local Libraries"
echo "userlibs : User Libraries"
echo "head : System Headers"
echo "localhead : Local Headers"
echo "userhead : User Headers"
echo "source : Development Source"
echo " "
echo "List of Available Source Systems"
echo -e "Name \t\t Description"
echo -e "------------ \t -------------------------"
for dir in [ * ]
do
if [ -d $dir ]
then
pushd $dir >/dev/null
# Get system description
if [ -e MB.name ]
then
temp=`cat MB.name`
len=${#dir}
if [ $len -lt 8 ]
then
tabtmp="\t\t"
else
tabtmp="\t"
fi
echo -e "$dir$tabtmp: $temp"
fi
popd >/dev/null
fi
done
echo " "
echo "Type 'c name' to goto that system."
echo " "
popd >/dev/null
return
;;
# System apps
apps )
cd $GNUSTEP_SYSTEM_ROOT/Apps
return
;;
# Local apps
localapps )
cd $GNUSTEP_LOCAL_ROOT/Apps
return
;;
# System command line tools
tools )
cd $GNUSTEP_SYSTEM_ROOT/Tools/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS
return
;;
# Local command line tools
localtools )
cd $GNUSTEP_LOCAL_ROOT/Tools/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS
return
;;
# System libraries
libs )
cd $GNUSTEP_SYSTEM_ROOT/Libraries/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS
return
;;
# Local libraries
locallibs )
cd $GNUSTEP_LOCAL_ROOT/Libraries/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS
return
;;
# System headers
head )
cd $GNUSTEP_SYSTEM_ROOT/Headers
return
;;
# Local headers
localhead )
cd $GNUSTEP_LOCAL_ROOT/Headers
return
;;
# Development directory
source )
cd $MB_ROOT
return
;;
# MB systems
* )
# Perform any user initialization
if [ -e ~/MB.init ]
then
. ~/MB.init
fi
# System apps
apps )
cd $GNUSTEP_SYSTEM_ROOT/Apps
return
;;
# Local apps
localapps )
cd $GNUSTEP_LOCAL_ROOT/Apps
return
;;
# System command line tools
tools )
cd $GNUSTEP_SYSTEM_ROOT/Tools/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS
return
;;
# Local command line tools
localtools )
cd $GNUSTEP_LOCAL_ROOT/Tools/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS
return
;;
# System libraries
libs )
cd $GNUSTEP_SYSTEM_ROOT/Libraries/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS
return
;;
# Local libraries
locallibs )
cd $GNUSTEP_LOCAL_ROOT/Libraries/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS
return
;;
# System headers
head )
cd $GNUSTEP_SYSTEM_ROOT/Headers
return
;;
# Local headers
localhead )
cd $GNUSTEP_LOCAL_ROOT/Headers
return
;;
# Development directory
source )
cd $MB_ROOT
return
;;
# MB systems
* )
# Perform any user initialization
if [ -e ~/MB.init ]
then
. ~/MB.init
fi
pushd $MB_ROOT >/dev/null
if [ -e $1 ]
then
popd >/dev/null
pushd $MB_ROOT >/dev/null
if [ -e $1 ]
then
popd >/dev/null
if [ -z $1 ]
then
pwd
return
fi
if [ -z $1 ]
then
pwd
return
fi
HOLD_CUR=$MB_CUR
MB_CUR=$1
pushd $MB_ROOT/$1 >/dev/null
HOLD_CUR=$MB_CUR
MB_CUR=$1
pushd $MB_ROOT/$1 >/dev/null
# Get system description
HOLD_SYS=$MB_SYS
if [ -e MB.name ]
then
MB_SYS=`cat MB.name`
else
MB_SYS=
fi
# Get system description
HOLD_SYS=$MB_SYS
if [ -e MB.name ]
then
MB_SYS=`cat MB.name`
else
MB_SYS=
fi
HOLD_CUR_SYS=$MB_CUR_SYS
MB_CUR_SYS=$MB_ROOT/$MB_CUR
HOLD_CUR_SYS=$MB_CUR_SYS
MB_CUR_SYS=$MB_ROOT/$MB_CUR
# Get default version
HOLD_CUR_VER=$MB_CUR_VER
MB_CUR_VER=
ver default
if [ $? -eq 0 ]
then
MB_CUR=$HOLD_CUR
MB_SYS=$HOLD_SYS
MB_CUR_SYS=$HOLD_CUR_SYS
MB_CUR_VER=$HOLD_CUR_VER
popd >/dev/null
return
fi
# Get default version
HOLD_CUR_VER=$MB_CUR_VER
MB_CUR_VER=
ver default
if [ $? -eq 0 ]
then
MB_CUR=$HOLD_CUR
MB_SYS=$HOLD_SYS
MB_CUR_SYS=$HOLD_CUR_SYS
MB_CUR_VER=$HOLD_CUR_VER
popd >/dev/null
return
fi
popd >/dev/null
if [ -e $MB_CUR_TOP ]
then
cd $MB_CUR_TOP
else
cd $MB_CUR_SYS
fi
popd >/dev/null
if [ -e $MB_CUR_TOP ]
then
cd $MB_CUR_TOP
else
cd $MB_CUR_SYS
fi
# If there is an MB.init shell file
# then execute for system customizations
if [ -f $MB_CUR_SYS/MB.init ]
then
. $MB_CUR_SYS/MB.init
fi
else
# no system then just return
popd >/dev/null
echo Unknown system or command
echo Type \"c --help\" for help
return
fi
;;
esac
# If there is an MB.init shell file
# then execute for system customizations
if [ -f $MB_CUR_SYS/MB.init ]
then
. $MB_CUR_SYS/MB.init
fi
else
# no system then just return
popd >/dev/null
echo Unknown system or command
echo Type \"c --help\" for help
return
fi
;;
esac
}
# Go to apps directory for current system
@ -527,45 +529,46 @@ function hostinfo {
}
# assign the paths based upon the root variables
function assignpaths {
function assignpaths
{
hostinfo
hostinfo
PATH=$GNUSTEP_SYSTEM_ROOT/Tools:$MB_ORIG_PATH
if [ -n "$GNUSTEP_HOST_CPU" ]
PATH=$GNUSTEP_SYSTEM_ROOT/Tools:$MB_ORIG_PATH
if [ -n "$GNUSTEP_HOST_CPU" -a -z "$GNUSTEP_FLATTENED" ]
then
if [ -n "$LIBRARY_COMBO" ]
then
PATH=$GNUSTEP_SYSTEM_ROOT/Tools/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO:$PATH
fi
PATH=$GNUSTEP_SYSTEM_ROOT/Tools/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS:$PATH
fi
if [ -n "$GNUSTEP_LOCAL_ROOT" ]
then
PATH=$GNUSTEP_LOCAL_ROOT/Tools:$PATH
if [ -n "$GNUSTEP_HOST_CPU" -a -z "$GNUSTEP_FLATTENED" ]
then
if [ -n "$LIBRARY_COMBO" ]
then
PATH=$GNUSTEP_LOCAL_ROOT/Tools/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO:$PATH
fi
PATH=$GNUSTEP_LOCAL_ROOT/Tools/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS:$PATH
fi
fi
if [ -n "$GNUSTEP_USER_ROOT" ]
then
PATH=$GNUSTEP_USER_ROOT/Tools:$PATH
if [ -n "$GNUSTEP_HOST_CPU" -a -z "$GNUSTEP_FLATTENED" ]
then
if [ -n "$LIBRARY_COMBO" ]
then
if [ -n "$LIBRARY_COMBO" ]
then
PATH=$GNUSTEP_SYSTEM_ROOT/Tools/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO:$PATH
fi
PATH=$GNUSTEP_SYSTEM_ROOT/Tools/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS:$PATH
fi
if [ -n "$GNUSTEP_LOCAL_ROOT" ]
then
PATH=$GNUSTEP_LOCAL_ROOT/Tools:$PATH
if [ -n "$GNUSTEP_HOST_CPU" ]
then
if [ -n "$LIBRARY_COMBO" ]
then
PATH=$GNUSTEP_LOCAL_ROOT/Tools/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO:$PATH
fi
PATH=$GNUSTEP_LOCAL_ROOT/Tools/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS:$PATH
fi
fi
if [ -n "$GNUSTEP_USER_ROOT" ]
then
PATH=$GNUSTEP_USER_ROOT/Tools:$PATH
if [ -n "$GNUSTEP_HOST_CPU" ]
then
if [ -n "$LIBRARY_COMBO" ]
then
PATH=$GNUSTEP_USER_ROOT/Tools/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO:$PATH
fi
PATH=$GNUSTEP_USER_ROOT/Tools/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS:$PATH
fi
PATH=$GNUSTEP_USER_ROOT/Tools/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO:$PATH
fi
PATH=$GNUSTEP_USER_ROOT/Tools/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS:$PATH
fi
fi
}
# switch the LIBRARY_COMBO

15
README
View file

@ -132,6 +132,21 @@ make install
./configure --target=alpha-linux-gnu
make install
Configuring the GNUstep makefile package for a flattened structure
==================================================================
On systems where you know you are only interested in supporting a single
operating system, cpu type, and library combination, it's possible to
configure GNUstep to use a 'flattened' directory structure.
You do this by supplying the '--enable-flattened' argument to configure.
In a flattened structure, files are stotred at the top-level rather than
in a $(GNUSTEP_CPU)/$(GNUSTEP_OS)/$(LIBRARY_COMBO) subdirectory.
You lose a lot of versatility with this layout, but it's simpler (less
intimidating) for naive users to handle.
History
=======

16
application.make
View file

@ -102,7 +102,7 @@ endif
# Support building NeXT applications
ifneq ($(OBJC_COMPILER), NeXT)
APP_FILE = \
$(APP_DIR_NAME)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO)/$(INTERNAL_app_NAME)$(EXEEXT)
$(APP_DIR_NAME)/$(GNUSTEP_TARGET_LDIR)/$(INTERNAL_app_NAME)$(EXEEXT)
else
APP_FILE = $(APP_DIR_NAME)/$(INTERNAL_app_NAME)$(EXEEXT)
endif
@ -123,7 +123,7 @@ ifeq ($(OBJC_COMPILER), NeXT)
rm -f $(INTERNAL_app_NAME).iconheader
else
@$(TRANSFORM_PATHS_SCRIPT) `echo $(ALL_LIB_DIRS) | sed 's/-L//g'` \
>$(APP_DIR_NAME)/$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/$(LIBRARY_COMBO)/library_paths.openapp
>$(APP_DIR_NAME)/$(GNUSTEP_TARGET_LDIR)/library_paths.openapp
endif
#
@ -148,7 +148,7 @@ $(APP_DIR_NAME):
else
internal-app-all:: before-$(TARGET)-all $(GNUSTEP_OBJ_DIR) \
$(APP_DIR_NAME)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO) $(APP_FILE) \
$(APP_DIR_NAME)/$(GNUSTEP_TARGET_LDIR) $(APP_FILE) \
$(APP_DIR_NAME)/$(INTERNAL_app_NAME) app-resource-files \
app-localized-resource-files after-$(TARGET)-all
@ -156,13 +156,15 @@ before-$(TARGET)-all::
after-$(TARGET)-all::
$(APP_DIR_NAME)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO):
@$(MKDIRS) $(APP_DIR_NAME)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO)
$(APP_DIR_NAME)/$(GNUSTEP_TARGET_LDIR):
@$(MKDIRS) $(APP_DIR_NAME)/$(GNUSTEP_TARGET_LDIR)
ifeq ($(GNUSTEP_FLATTENED),)
$(APP_DIR_NAME)/$(INTERNAL_app_NAME):
cp $(GNUSTEP_MAKEFILES)/executable.template $(APP_DIR_NAME)/$(INTERNAL_app_NAME)
chmod a+x $(APP_DIR_NAME)/$(INTERNAL_app_NAME)
endif
endif
app-resource-dir::
@$(MKDIRS) $(APP_RESOURCE_DIRS)
@ -229,14 +231,14 @@ internal-app-uninstall::
# Cleaning targets
#
internal-app-clean::
rm -rf $(GNUSTEP_OBJ_PREFIX)/$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/$(LIBRARY_COMBO)
rm -rf $(GNUSTEP_OBJ_PREFIX)/$(GNUSTEP_TARGET_LDIR)
ifeq ($(OBJC_COMPILER), NeXT)
rm -f *.iconheader
for f in *.$(APP_EXTENSION); do \
rm -f $$f/`basename $$f .$(APP_EXTENSION)`; \
done
else
rm -rf *.$(APP_EXTENSION)/$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/$(LIBRARY_COMBO)
rm -rf *.$(APP_EXTENSION)/$(GNUSTEP_TARGET_LDIR)
endif

150
brain.make
View file

@ -72,25 +72,25 @@ GUI_BACKEND_LIB = $(word 4,$(combo_list))
# separate variables.
#
ifneq ($(runtime),)
OBJC_RUNTIME_LIB = $(runtime)
OBJC_RUNTIME_LIB = $(runtime)
endif
ifneq ($(foundation),)
FOUNDATION_LIB = $(foundation)
FOUNDATION_LIB = $(foundation)
endif
ifneq ($(gui),)
GUI_LIB = $(gui)
GUI_LIB = $(gui)
endif
ifneq ($(backend),)
GUI_BACKEND_LIB = $(backend)
GUI_BACKEND_LIB = $(backend)
endif
ifeq ($(gc), yes)
export LIBRARY_COMBO = $(OBJC_RUNTIME_LIB)-$(FOUNDATION_LIB)-$(GUI_LIB)-$(GUI_BACKEND_LIB)-gc
export LIBRARY_COMBO = $(OBJC_RUNTIME_LIB)-$(FOUNDATION_LIB)-$(GUI_LIB)-$(GUI_BACKEND_LIB)-gc
else
export 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)
endif
OBJC_LDFLAGS =
@ -99,21 +99,21 @@ OBJC_LIBS =
# Set the appropriate ObjC runtime library and other information
#
ifeq ($(OBJC_RUNTIME_LIB), gnu)
OBJC_LDFLAGS =
OBJC_LIB_DIR =
OBJC_LIBS = -lobjc
OBJC_RUNTIME = GNU
RUNTIME_DEFINE = -DGNU_RUNTIME=1
OBJC_LDFLAGS =
OBJC_LIB_DIR =
OBJC_LIBS = -lobjc
OBJC_RUNTIME = GNU
RUNTIME_DEFINE = -DGNU_RUNTIME=1
endif
ifeq ($(OBJC_RUNTIME_LIB), nx)
OBJC_RUNTIME = NeXT
RUNTIME_DEFINE = -DNeXT_RUNTIME=1
OBJC_RUNTIME = NeXT
RUNTIME_DEFINE = -DNeXT_RUNTIME=1
endif
ifeq ($(OBJC_RUNTIME_LIB), sun)
OBJC_RUNTIME = Sun
RUNTIME_DEFINE = -DSun_RUNTIME=1
OBJC_RUNTIME = Sun
RUNTIME_DEFINE = -DSun_RUNTIME=1
endif
FND_LDFLAGS =
@ -122,48 +122,48 @@ FND_LIBS =
# Set the appropriate Foundation library
#
ifeq ($(FOUNDATION_LIB),gnu)
FND_LDFLAGS =
FND_LIBS = -lgnustep-base
FND_DEFINE = -DGNUSTEP_BASE_LIBRARY=1
GNUSTEP_DEFINE = -DGNUSTEP
# If gc=yes was passed, use the appropriate library and defines
ifeq ($(gc), yes)
OBJC_LIBS = -lobjc_gc -lgc
AUXILIARY_CPPFLAGS += -DGS_WITH_GC=1
endif
FND_LDFLAGS =
FND_LIBS = -lgnustep-base
FND_DEFINE = -DGNUSTEP_BASE_LIBRARY=1
GNUSTEP_DEFINE = -DGNUSTEP
# If gc=yes was passed, use the appropriate library and defines
ifeq ($(gc), yes)
OBJC_LIBS = -lobjc_gc -lgc
AUXILIARY_CPPFLAGS += -DGS_WITH_GC=1
endif
endif
ifeq ($(FOUNDATION_LIB),fd)
-include $(GNUSTEP_MAKEFILES)/libFoundation.make
-include $(GNUSTEP_MAKEFILES)/libFoundation.make
FND_DEFINE = -DLIB_FOUNDATION_LIBRARY=1
FND_LDFLAGS =
FND_LIBS = -lFoundation
FND_DEFINE = -DLIB_FOUNDATION_LIBRARY=1
FND_LDFLAGS =
FND_LIBS = -lFoundation
# If gc=yes was passed and libFoundation was compiled with Boehm's
# GC support, use the appropriate libraries
# If gc=yes was passed and libFoundation was compiled with Boehm's
# GC support, use the appropriate libraries
ifeq ($(gc), yes)
ifeq ($(LIBFOUNDATION_WITH_GC), yes)
OBJC_LIBS = -lobjc $(LIBFOUNDATION_GC_LIBRARY)
ifeq ($(leak), yes)
AUXILIARY_CPPFLAGS += -DLIB_FOUNDATION_LEAK_GC=1
else
AUXILIARY_CPPFLAGS += -DLIB_FOUNDATION_BOEHM_GC=1
ifeq ($(gc), yes)
ifeq ($(LIBFOUNDATION_WITH_GC), yes)
OBJC_LIBS = -lobjc $(LIBFOUNDATION_GC_LIBRARY)
ifeq ($(leak), yes)
AUXILIARY_CPPFLAGS += -DLIB_FOUNDATION_LEAK_GC=1
else
AUXILIARY_CPPFLAGS += -DLIB_FOUNDATION_BOEHM_GC=1
endif
endif
endif
endif
endif
ifeq ($(FOUNDATION_LIB),nx)
FND_LDFLAGS = -framework Foundation
FND_LIBS =
FND_DEFINE = -DNeXT_Foundation_LIBRARY=1
FND_LDFLAGS = -framework Foundation
FND_LIBS =
FND_DEFINE = -DNeXT_Foundation_LIBRARY=1
endif
ifeq ($(FOUNDATION_LIB), sun)
FND_DEFINE = -DSun_Foundation_LIBRARY=1
FND_DEFINE = -DSun_Foundation_LIBRARY=1
endif
#
@ -181,21 +181,21 @@ GUI_LIBS =
# Set the GUI library
#
ifeq ($(GUI_LIB),gnu)
GUI_LDFLAGS =
GUI_LIBS = -lgnustep-gui -lgmodel -lgnustep-gui
GUI_DEFINE = -DGNU_GUI_LIBRARY=1
GNUSTEP_DEFINE = -DGNUSTEP
GUI_LDFLAGS =
GUI_LIBS = -lgnustep-gui -lgmodel -lgnustep-gui
GUI_DEFINE = -DGNU_GUI_LIBRARY=1
GNUSTEP_DEFINE = -DGNUSTEP
endif
ifeq ($(GUI_LIB),nx)
GUI_DEFINE = -DNeXT_GUI_LIBRARY=1
GUI_DEFINE = -DNeXT_GUI_LIBRARY=1
ifneq ($(INTERNAL_app_NAME),)
# If we're building an application pass the following additional flags to
# the linker
GUI_LDFLAGS = -sectcreate __ICON __header $(INTERNAL_app_NAME).iconheader \
-segprot __ICON r r -sectcreate __ICON app /NextLibrary/Frameworks/AppKit.framework/Resources/NSDefaultApplicationIcon.tiff \
-framework AppKit
GUI_LIBS =
GUI_LIBS =
endif
endif
@ -205,26 +205,26 @@ BACKEND_LIBS =
# Set the GUI Backend library
#
ifeq ($(GUI_BACKEND_LIB),xdps)
BACKEND_LDFLAGS =
BACKEND_LIBS = -lgnustep-xdps
BACKEND_DEFINE = -DXDPS_BACKEND_LIBRARY=1
BACKEND_LDFLAGS =
BACKEND_LIBS = -lgnustep-xdps
BACKEND_DEFINE = -DXDPS_BACKEND_LIBRARY=1
endif
ifeq ($(GUI_BACKEND_LIB),xraw)
BACKEND_LDFLAGS =
BACKEND_LIBS = -lgnustep-xraw
BACKEND_DEFINE = -DXRAW_BACKEND_LIBRARY=1
BACKEND_LDFLAGS =
BACKEND_LIBS = -lgnustep-xraw
BACKEND_DEFINE = -DXRAW_BACKEND_LIBRARY=1
endif
ifeq ($(GUI_BACKEND_LIB),xgps)
BACKEND_LDFLAGS =
BACKEND_LIBS = -lgnustep-xgps
BACKEND_DEFINE = -DXGPS_BACKEND_LIBRARY=1
BACKEND_LDFLAGS =
BACKEND_LIBS = -lgnustep-xgps
BACKEND_DEFINE = -DXGPS_BACKEND_LIBRARY=1
endif
ifeq ($(GUI_BACKEND_LIB),w32)
BACKEND_LDFLAGS =
BACKEND_LIBS = -lMBKit
BACKEND_LDFLAGS =
BACKEND_LIBS = -lMBKit
endif
SYSTEM_INCLUDES =
@ -236,10 +236,10 @@ SYSTEM_LIBS =
# then add X headers and libraries
#
ifeq ($(GUI_BACKEND_LIB),xdps)
SYSTEM_INCLUDES = $(GRAPHIC_CFLAGS)
SYSTEM_LDFLAGS =
SYSTEM_LIB_DIR = $(GRAPHIC_LFLAGS)
SYSTEM_LIBS = -ldpstk -ldps -lpsres -lXt $(X_PRE_LIBS) $(GRAPHIC_LIBS)
SYSTEM_INCLUDES = $(GRAPHIC_CFLAGS)
SYSTEM_LDFLAGS =
SYSTEM_LIB_DIR = $(GRAPHIC_LFLAGS)
SYSTEM_LIBS = -ldpstk -ldps -lpsres -lXt $(X_PRE_LIBS) $(GRAPHIC_LIBS)
endif
#
@ -247,17 +247,17 @@ endif
# then add X headers and libraries
#
ifeq ($(GUI_BACKEND_LIB),xraw)
SYSTEM_INCLUDES = $(GRAPHIC_CFLAGS)
SYSTEM_LDFLAGS =
SYSTEM_LIB_DIR = $(GRAPHIC_LFLAGS)
SYSTEM_LIBS = $(GRAPHIC_LIBS)
SYSTEM_INCLUDES = $(GRAPHIC_CFLAGS)
SYSTEM_LDFLAGS =
SYSTEM_LIB_DIR = $(GRAPHIC_LFLAGS)
SYSTEM_LIBS = $(GRAPHIC_LIBS)
endif
ifeq ($(GUI_BACKEND_LIB),xgps)
SYSTEM_INCLUDES = $(GRAPHIC_CFLAGS)
SYSTEM_LDFLAGS =
SYSTEM_LIB_DIR = $(GRAPHIC_LFLAGS)
SYSTEM_LIBS = $(GRAPHIC_LIBS)
SYSTEM_INCLUDES = $(GRAPHIC_CFLAGS)
SYSTEM_LDFLAGS =
SYSTEM_LIB_DIR = $(GRAPHIC_LFLAGS)
SYSTEM_LIBS = $(GRAPHIC_LIBS)
endif
#
@ -265,10 +265,10 @@ endif
# then add Win32 headers and libraries
#
ifeq ($(GUI_BACKEND_LIB),w32)
SYSTEM_INCLUDES =
SYSTEM_LDFLAGS =
SYSTEM_LIB_DIR =
SYSTEM_LIBS = -ltiff -lwsock32 -ladvapi32 -lcomctl32 -luser32 \
SYSTEM_INCLUDES =
SYSTEM_LDFLAGS =
SYSTEM_LIB_DIR =
SYSTEM_LIBS = -ltiff -lwsock32 -ladvapi32 -lcomctl32 -luser32 \
-lgdi32 -lcomdlg32
endif

6
bundle.make
View file

@ -107,7 +107,7 @@ after-$(TARGET)-all::
BUNDLE_DIR_NAME := $(INTERNAL_bundle_NAME:=$(BUNDLE_EXTENSION))
BUNDLE_FILE := \
$(BUNDLE_DIR_NAME)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO)/$(BUNDLE_NAME)$(BUNDLE_OBJ_EXT)
$(BUNDLE_DIR_NAME)/$(GNUSTEP_TARGET_LDIR)/$(BUNDLE_NAME)$(BUNDLE_OBJ_EXT)
BUNDLE_RESOURCE_DIRS = $(foreach d, $(RESOURCE_DIRS), $(BUNDLE_DIR_NAME)/Resources/$(d))
ifeq ($(strip $(RESOURCE_FILES)),)
override RESOURCE_FILES=""
@ -125,7 +125,7 @@ endif
build-bundle-dir::
@$(MKDIRS) \
$(BUNDLE_DIR_NAME)/Resources \
$(BUNDLE_DIR_NAME)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO) \
$(BUNDLE_DIR_NAME)/$(GNUSTEP_TARGET_LDIR) \
$(BUNDLE_RESOURCE_DIRS)
build-bundle:: $(BUNDLE_FILE) bundle-resource-files localized-bundle-resource-files
@ -178,7 +178,7 @@ endif
# MacOSX-S bundles
$(BUNDLE_DIR_NAME)/Resources/Info.plist: $(BUNDLE_DIR_NAME)/Resources
@(echo "{"; echo ' NOTE = "Automatically generated, do not edit!";'; \
echo " NSExecutable = \"$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO)/$(BUNDLE_NAME)${BUNDLE_OBJ_EXT}\";"; \
echo " NSExecutable = \"$(GNUSTEP_TARGET_LDIR)/$(BUNDLE_NAME)${BUNDLE_OBJ_EXT}\";"; \
if [ "$(MAIN_MODEL_FILE)" = "" ]; then \
echo " NSMainNibFile = \"\";"; \
else \

337
common.make
View file

@ -39,7 +39,12 @@ 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
ifeq ($(GNUSTEP_FLATTENED),)
WHICH_LIB_SCRIPT \
= $(GNUSTEP_MAKEFILES)/$(GNUSTEP_HOST_CPU)/$(GNUSTEP_HOST_OS)/which_lib
else
WHICH_LIB_SCRIPT = $(GNUSTEP_MAKEFILES)/which_lib
endif
LD_LIB_PATH_SCRIPT = $(GNUSTEP_MAKEFILES)/ld_lib_path.sh
TRANSFORM_PATHS_SCRIPT = $(GNUSTEP_MAKEFILES)/transform_paths.sh
@ -53,8 +58,17 @@ endif
#
include $(GNUSTEP_MAKEFILES)/names.make
GNUSTEP_HOST_DIR = $(GNUSTEP_HOST_CPU)/$(GNUSTEP_HOST_OS)
GNUSTEP_TARGET_DIR = $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)
ifeq ($(GNUSTEP_FLATTENED),)
GNUSTEP_HOST_DIR = $(GNUSTEP_HOST_CPU)/$(GNUSTEP_HOST_OS)
GNUSTEP_TARGET_DIR = $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)
GNUSTEP_HOST_LDIR = $(GNUSTEP_HOST_DIR)/$(LIBRARY_COMBO)
GNUSTEP_TARGET_LDIR = $(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO)
else
GNUSTEP_HOST_DIR = .
GNUSTEP_TARGET_DIR = .
GNUSTEP_HOST_LDIR = .
GNUSTEP_TARGET_LDIR = .
endif
#
# Get the config information
@ -95,19 +109,30 @@ GNUSTEP_HEADERS = $(GNUSTEP_INSTALLATION_DIR)/Headers
GNUSTEP_BUNDLES = $(GNUSTEP_INSTALLATION_DIR)/Library/Bundles
GNUSTEP_FRAMEWORKS = $(GNUSTEP_INSTALLATION_DIR)/Library/Frameworks
GNUSTEP_FRAMEWORKS_HEADERS = $(GNUSTEP_INSTALLATION_DIR)/Library/Headers
GNUSTEP_FRAMEWORKS_LIBRARIES_ROOT = $(GNUSTEP_INSTALLATION_DIR)/Library/Libraries
GNUSTEP_FRAMEWORKS_TARGET_LIBRARIES = $(GNUSTEP_FRAMEWORKS_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_DIR)
GNUSTEP_FRAMEWORKS_LIBRARIES = $(GNUSTEP_FRAMEWORKS_TARGET_LIBRARIES)/$(LIBRARY_COMBO)
GNUSTEP_FRAMEWORKS_LIBRARIES_ROOT \
= $(GNUSTEP_INSTALLATION_DIR)/Library/Libraries
GNUSTEP_PALETTES = $(GNUSTEP_INSTALLATION_DIR)/Developer/Palettes
GNUSTEP_LIBRARIES_ROOT = $(GNUSTEP_INSTALLATION_DIR)/Libraries
GNUSTEP_TARGET_LIBRARIES = $(GNUSTEP_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_DIR)
GNUSTEP_LIBRARIES = $(GNUSTEP_TARGET_LIBRARIES)/$(LIBRARY_COMBO)
GNUSTEP_RESOURCES = $(GNUSTEP_LIBRARIES_ROOT)/Resources
GNUSTEP_JAVA = $(GNUSTEP_LIBRARIES_ROOT)/Java
GNUSTEP_DOCUMENTATION = $(GNUSTEP_INSTALLATION_DIR)/Documentation
GNUSTEP_DOCUMENTATION_MAN = $(GNUSTEP_DOCUMENTATION)/man
GNUSTEP_DOCUMENTATION_INFO = $(GNUSTEP_DOCUMENTATION)/info
ifeq ($(GNUSTEP_FLATTENED),)
GNUSTEP_FRAMEWORKS_TARGET_LIBRARIES \
= $(GNUSTEP_FRAMEWORKS_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_DIR)
GNUSTEP_FRAMEWORKS_LIBRARIES \
= $(GNUSTEP_FRAMEWORKS_TARGET_LIBRARIES)/$(LIBRARY_COMBO)
GNUSTEP_TARGET_LIBRARIES = $(GNUSTEP_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_DIR)
GNUSTEP_LIBRARIES = $(GNUSTEP_TARGET_LIBRARIES)/$(LIBRARY_COMBO)
else
GNUSTEP_FRAMEWORKS_TARGET_LIBRARIES = $(GNUSTEP_FRAMEWORKS_LIBRARIES_ROOT)
GNUSTEP_FRAMEWORKS_LIBRARIES = $(GNUSTEP_FRAMEWORKS_TARGET_LIBRARIES)
GNUSTEP_TARGET_LIBRARIES = $(GNUSTEP_LIBRARIES_ROOT)
GNUSTEP_LIBRARIES = $(GNUSTEP_TARGET_LIBRARIES)
endif
# The default name of the makefile to be used in recursive invocations of make
ifeq ($(MAKEFILE_NAME),)
MAKEFILE_NAME = GNUmakefile
@ -116,141 +141,205 @@ endif
# In case we need to explicitly reference
# the system, local, and user library and framework's library directories
GNUSTEP_SYSTEM_LIBRARIES_ROOT = $(GNUSTEP_SYSTEM_ROOT)/Libraries
GNUSTEP_SYSTEM_TARGET_LIBRARIES = \
$(GNUSTEP_SYSTEM_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_DIR)
GNUSTEP_SYSTEM_LIBRARIES = $(GNUSTEP_SYSTEM_TARGET_LIBRARIES)/$(LIBRARY_COMBO)
GNUSTEP_SYSTEM_HEADERS = $(GNUSTEP_SYSTEM_ROOT)/Headers
GNUSTEP_SYSTEM_FRAMEWORKS_LIBRARIES_ROOT = $(GNUSTEP_SYSTEM_ROOT)/Library/Libraries
GNUSTEP_SYSTEM_FRAMEWORKS_TARGET_LIBRARIES = \
$(GNUSTEP_SYSTEM_FRAMEWORKS_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_DIR)
GNUSTEP_SYSTEM_FRAMEWORKS_LIBRARIES = $(GNUSTEP_SYSTEM_FRAMEWORKS_TARGET_LIBRARIES)/$(LIBRARY_COMBO)
GNUSTEP_SYSTEM_HEADERS = $(GNUSTEP_SYSTEM_ROOT)/Headers
# FIXME: parse -framework keyword
GNUSTEP_SYSTEM_FRAMEWORKS_HEADERS = $(GNUSTEP_SYSTEM_ROOT)/Library/Headers
ifeq ($(GNUSTEP_FLATTENED),)
GNUSTEP_SYSTEM_TARGET_LIBRARIES = \
$(GNUSTEP_SYSTEM_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_DIR)
GNUSTEP_SYSTEM_LIBRARIES = $(GNUSTEP_SYSTEM_TARGET_LIBRARIES)/$(LIBRARY_COMBO)
GNUSTEP_SYSTEM_FRAMEWORKS_TARGET_LIBRARIES = \
$(GNUSTEP_SYSTEM_FRAMEWORKS_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_DIR)
GNUSTEP_SYSTEM_FRAMEWORKS_LIBRARIES \
= $(GNUSTEP_SYSTEM_FRAMEWORKS_TARGET_LIBRARIES)/$(LIBRARY_COMBO)
else
GNUSTEP_SYSTEM_TARGET_LIBRARIES = $(GNUSTEP_SYSTEM_LIBRARIES_ROOT)
GNUSTEP_SYSTEM_LIBRARIES = $(GNUSTEP_SYSTEM_TARGET_LIBRARIES)
GNUSTEP_SYSTEM_FRAMEWORKS_TARGET_LIBRARIES = \
$(GNUSTEP_SYSTEM_FRAMEWORKS_LIBRARIES_ROOT)
GNUSTEP_SYSTEM_FRAMEWORKS_LIBRARIES = \
$(GNUSTEP_SYSTEM_FRAMEWORKS_TARGET_LIBRARIES)
endif
ifneq ($(GNUSTEP_LOCAL_ROOT),)
GNUSTEP_LOCAL_LIBRARIES_ROOT = $(GNUSTEP_LOCAL_ROOT)/Libraries
GNUSTEP_LOCAL_TARGET_LIBRARIES = \
GNUSTEP_LOCAL_LIBRARIES_ROOT = $(GNUSTEP_LOCAL_ROOT)/Libraries
GNUSTEP_LOCAL_HEADERS = $(GNUSTEP_LOCAL_ROOT)/Headers
GNUSTEP_LOCAL_FRAMEWORKS_LIBRARIES_ROOT \
= $(GNUSTEP_LOCAL_ROOT)/Library/Libraries
# FIXME: parse -framework keyword
GNUSTEP_LOCAL_FRAMEWORKS_HEADERS = $(GNUSTEP_LOCAL_ROOT)/Library/Headers
ifeq ($(GNUSTEP_FLATTENED),)
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)
GNUSTEP_LOCAL_FRAMEWORKS_LIBRARIES_ROOT = $(GNUSTEP_LOCAL_ROOT)/Library/Libraries
GNUSTEP_LOCAL_FRAMEWORKS_TARGET_LIBRARIES = \
GNUSTEP_LOCAL_LIBRARIES = $(GNUSTEP_LOCAL_TARGET_LIBRARIES)/$(LIBRARY_COMBO)
GNUSTEP_LOCAL_FRAMEWORKS_TARGET_LIBRARIES = \
$(GNUSTEP_LOCAL_FRAMEWORKS_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_DIR)
GNUSTEP_LOCAL_FRAMEWORKS_TARGET_LIBRARIES_FLAG = -L$(GNUSTEP_LOCAL_FRAMEWORKS_TARGET_LIBRARIES)
GNUSTEP_LOCAL_FRAMEWORKS_LIBRARIES = $(GNUSTEP_LOCAL_FRAMEWORKS_TARGET_LIBRARIES)/$(LIBRARY_COMBO)
GNUSTEP_LOCAL_FRAMEWORKS_LIBRARIES_FLAG = -L$(GNUSTEP_LOCAL_FRAMEWORKS_LIBRARIES)
# FIXME: parse -framework keyword
GNUSTEP_LOCAL_FRAMEWORKS_HEADERS = $(GNUSTEP_LOCAL_ROOT)/Library/Headers
GNUSTEP_LOCAL_FRAMEWORKS_HEADERS_FLAG = -I$(GNUSTEP_LOCAL_FRAMEWORKS_HEADERS)
GNUSTEP_LOCAL_FRAMEWORKS_LIBRARIES \
= $(GNUSTEP_LOCAL_FRAMEWORKS_TARGET_LIBRARIES)/$(LIBRARY_COMBO)
else
GNUSTEP_LOCAL_TARGET_LIBRARIES = $(GNUSTEP_LOCAL_LIBRARIES_ROOT)
GNUSTEP_LOCAL_LIBRARIES = $(GNUSTEP_LOCAL_TARGET_LIBRARIES)
GNUSTEP_LOCAL_FRAMEWORKS_TARGET_LIBRARIES = \
$(GNUSTEP_LOCAL_FRAMEWORKS_LIBRARIES_ROOT)
GNUSTEP_LOCAL_FRAMEWORKS_LIBRARIES \
= $(GNUSTEP_LOCAL_FRAMEWORKS_TARGET_LIBRARIES)
endif
GNUSTEP_LOCAL_LIBRARIES_FLAG = -L$(GNUSTEP_LOCAL_LIBRARIES)
GNUSTEP_LOCAL_HEADERS_FLAG = -I$(GNUSTEP_LOCAL_HEADERS)
GNUSTEP_LOCAL_FRAMEWORKS_LIBRARIES_FLAG \
= -L$(GNUSTEP_LOCAL_FRAMEWORKS_LIBRARIES)
GNUSTEP_LOCAL_FRAMEWORKS_TARGET_LIBRARIES_FLAG \
= -L$(GNUSTEP_LOCAL_FRAMEWORKS_TARGET_LIBRARIES)
# FIXME: parse -framework keyword
GNUSTEP_LOCAL_FRAMEWORKS_HEADERS_FLAG = -I$(GNUSTEP_LOCAL_FRAMEWORKS_HEADERS)
endif
ifneq ($(GNUSTEP_USER_ROOT),)
GNUSTEP_USER_LIBRARIES_ROOT = $(GNUSTEP_USER_ROOT)/Libraries
GNUSTEP_USER_TARGET_LIBRARIES = \
GNUSTEP_USER_LIBRARIES_ROOT = $(GNUSTEP_USER_ROOT)/Libraries
GNUSTEP_USER_HEADERS = $(GNUSTEP_USER_ROOT)/Headers
GNUSTEP_USER_FRAMEWORKS_LIBRARIES_ROOT \
= $(GNUSTEP_USER_ROOT)/Library/Libraries
# FIXME: parse -framework keyword
GNUSTEP_USER_FRAMEWORKS_HEADERS \
= $(GNUSTEP_USER_ROOT)/Library/Headers
ifeq ($(GNUSTEP_FLATTENED),)
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)
GNUSTEP_USER_FRAMEWORKS_LIBRARIES_ROOT = $(GNUSTEP_USER_ROOT)/Library/Libraries
GNUSTEP_USER_FRAMEWORKS_TARGET_LIBRARIES = \
GNUSTEP_USER_LIBRARIES \
= $(GNUSTEP_USER_TARGET_LIBRARIES)/$(LIBRARY_COMBO)
GNUSTEP_USER_FRAMEWORKS_TARGET_LIBRARIES = \
$(GNUSTEP_USER_FRAMEWORKS_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_DIR)
GNUSTEP_USER_FRAMEWORKS_TARGET_LIBRARIES_FLAG = -L$(GNUSTEP_USER_FRAMEWORKS_TARGET_LIBRARIES)
GNUSTEP_USER_FRAMEWORKS_LIBRARIES = $(GNUSTEP_USER_FRAMEWORKS_TARGET_LIBRARIES)/$(LIBRARY_COMBO)
GNUSTEP_USER_LIBRARIES_FLAG = -L$(GNUSTEP_USER_FRAMEWORKS_LIBRARIES)
# FIXME: parse -framework keyword
GNUSTEP_USER_FRAMEWORKS_HEADERS = $(GNUSTEP_USER_ROOT)/Library/Headers
GNUSTEP_USER_FRAMEWORKS_HEADERS_FLAG = -I$(GNUSTEP_USER_FRAMEWORKS_HEADERS)
GNUSTEP_USER_FRAMEWORKS_LIBRARIES \
= $(GNUSTEP_USER_FRAMEWORKS_TARGET_LIBRARIES)/$(LIBRARY_COMBO)
else
GNUSTEP_USER_TARGET_LIBRARIES = $(GNUSTEP_USER_LIBRARIES_ROOT)
GNUSTEP_USER_LIBRARIES = $(GNUSTEP_USER_TARGET_LIBRARIES)
GNUSTEP_USER_FRAMEWORKS_TARGET_LIBRARIES = \
$(GNUSTEP_USER_FRAMEWORKS_LIBRARIES_ROOT)
GNUSTEP_USER_FRAMEWORKS_LIBRARIES \
= $(GNUSTEP_USER_FRAMEWORKS_TARGET_LIBRARIES)
endif
GNUSTEP_USER_TARGET_LIBRARIES_FLAG = -L$(GNUSTEP_USER_TARGET_LIBRARIES)
GNUSTEP_USER_LIBRARIES_FLAG = -L$(GNUSTEP_USER_LIBRARIES)
GNUSTEP_USER_HEADERS_FLAG = -I$(GNUSTEP_USER_HEADERS)
GNUSTEP_USER_FRAMEWORKS_TARGET_LIBRARIES_FLAG \
= -L$(GNUSTEP_USER_FRAMEWORKS_TARGET_LIBRARIES)
GNUSTEP_USER_LIBRARIES_FLAG = -L$(GNUSTEP_USER_FRAMEWORKS_LIBRARIES)
# FIXME: parse -framework keyword
GNUSTEP_USER_FRAMEWORKS_HEADERS_FLAG \
= -I$(GNUSTEP_USER_FRAMEWORKS_HEADERS)
endif
ifneq ($(GNUSTEP_NETWORK_ROOT),)
GNUSTEP_NETWORK_LIBRARIES_ROOT = $(GNUSTEP_NETWORK_ROOT)/Libraries
GNUSTEP_NETWORK_TARGET_LIBRARIES = \
GNUSTEP_NETWORK_LIBRARIES_ROOT = $(GNUSTEP_NETWORK_ROOT)/Libraries
GNUSTEP_NETWORK_HEADERS = $(GNUSTEP_NETWORK_ROOT)/Headers
GNUSTEP_NETWORK_FRAMEWORKS_LIBRARIES_ROOT \
= $(GNUSTEP_NETWORK_ROOT)/Library/Libraries
# FIXME: parse -framework keyword
GNUSTEP_NETWORK_FRAMEWORKS_HEADERS = $(GNUSTEP_NETWORK_ROOT)/Library/Headers
ifeq ($(GNUSTEP_FLATTENED),)
GNUSTEP_NETWORK_TARGET_LIBRARIES = \
$(GNUSTEP_NETWORK_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_DIR)
GNUSTEP_NETWORK_TARGET_LIBRARIES_FLAG = -L$(GNUSTEP_NETWORK_TARGET_LIBRARIES)
GNUSTEP_NETWORK_LIBRARIES = $(GNUSTEP_NETWORK_TARGET_LIBRARIES)/$(LIBRARY_COMBO)
GNUSTEP_NETWORK_LIBRARIES_FLAG = -L$(GNUSTEP_NETWORK_LIBRARIES)
GNUSTEP_NETWORK_HEADERS = $(GNUSTEP_NETWORK_ROOT)/Headers
GNUSTEP_NETWORK_HEADERS_FLAG = -I$(GNUSTEP_NETWORK_HEADERS)
GNUSTEP_NETWORK_FRAMEWORKS_LIBRARIES_ROOT = $(GNUSTEP_NETWORK_ROOT)/Library/Libraries
GNUSTEP_NETWORK_FRAMEWORKS_TARGET_LIBRARIES = \
GNUSTEP_NETWORK_LIBRARIES \
= $(GNUSTEP_NETWORK_TARGET_LIBRARIES)/$(LIBRARY_COMBO)
GNUSTEP_NETWORK_FRAMEWORKS_TARGET_LIBRARIES = \
$(GNUSTEP_NETWORK_FRAMEWORKS_LIBRARIES_ROOT)/$(GNUSTEP_TARGET_DIR)
GNUSTEP_NETWORK_FRAMEWORKS_TARGET_LIBRARIES_FLAG = -L$(GNUSTEP_NETWORK_FRAMEWORKS_TARGET_LIBRARIES)
GNUSTEP_NETWORK_FRAMEWORKS_LIBRARIES = $(GNUSTEP_NETWORK_FRAMEWORKS_TARGET_LIBRARIES)/$(LIBRARY_COMBO)
GNUSTEP_NETWORK_FRAMEWORKS_LIBRARIES_FLAG = -L$(GNUSTEP_NETWORK_FRAMEWORKS_LIBRARIES)
# FIXME: parse -framework keyword
GNUSTEP_NETWORK_FRAMEWORKS_HEADERS = $(GNUSTEP_NETWORK_ROOT)/Library/Headers
GNUSTEP_NETWORK_FRAMEWORKS_HEADERS_FLAG = -I$(GNUSTEP_NETWORK_FRAMEWORKS_HEADERS)
GNUSTEP_NETWORK_FRAMEWORKS_LIBRARIES \
= $(GNUSTEP_NETWORK_FRAMEWORKS_TARGET_LIBRARIES)/$(LIBRARY_COMBO)
else
GNUSTEP_NETWORK_TARGET_LIBRARIES = $(GNUSTEP_NETWORK_LIBRARIES_ROOT)
GNUSTEP_NETWORK_LIBRARIES = $(GNUSTEP_NETWORK_TARGET_LIBRARIES)
GNUSTEP_NETWORK_FRAMEWORKS_TARGET_LIBRARIES = \
$(GNUSTEP_NETWORK_FRAMEWORKS_LIBRARIES_ROOT)
GNUSTEP_NETWORK_FRAMEWORKS_LIBRARIES \
= $(GNUSTEP_NETWORK_FRAMEWORKS_TARGET_LIBRARIES)
endif
GNUSTEP_NETWORK_LIBRARIES_FLAG = -L$(GNUSTEP_NETWORK_LIBRARIES)
GNUSTEP_NETWORK_TARGET_LIBRARIES_FLAG = -L$(GNUSTEP_NETWORK_TARGET_LIBRARIES)
GNUSTEP_NETWORK_HEADERS_FLAG = -I$(GNUSTEP_NETWORK_HEADERS)
GNUSTEP_NETWORK_FRAMEWORKS_LIBRARIES_FLAG \
= -L$(GNUSTEP_NETWORK_FRAMEWORKS_LIBRARIES)
GNUSTEP_NETWORK_FRAMEWORKS_TARGET_LIBRARIES_FLAG \
= -L$(GNUSTEP_NETWORK_FRAMEWORKS_TARGET_LIBRARIES)
# FIXME: parse -framework keyword
GNUSTEP_NETWORK_FRAMEWORKS_HEADERS_FLAG \
= -I$(GNUSTEP_NETWORK_FRAMEWORKS_HEADERS)
endif
#
# Target specific header include directories
#
ifneq ($(GNUSTEP_NETWORK_ROOT),)
GNUSTEP_HEADERS_TARGET_FLAG += \
ifeq ($(GNUSTEP_FLATTENED),)
#
# Target specific header include directories
#
ifneq ($(GNUSTEP_NETWORK_ROOT),)
GNUSTEP_HEADERS_TARGET_FLAG += \
-I$(GNUSTEP_NETWORK_HEADERS)/$(GNUSTEP_TARGET_DIR)
endif
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)
endif
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
FOUNDATION_LIBRARY_NAME = gnustep-base
FOUNDATION_LIBRARY_DEFINE = -DGNUSTEP_BASE_LIBRARY=1
GNUSTEP_FND_DIR = gnustep
FOUNDATION_LIBRARY_NAME = gnustep-base
FOUNDATION_LIBRARY_DEFINE = -DGNUSTEP_BASE_LIBRARY=1
endif
ifeq ($(FOUNDATION_LIB),fd)
GNUSTEP_FND_DIR = libFoundation
FOUNDATION_LIBRARY_NAME = Foundation
FOUNDATION_LIBRARY_DEFINE = -DLIB_FOUNDATION_LIBRARY=1
ifeq ($(gc),yes)
ifneq ($(leak),yes)
FOUNDATION_LIBRARY_DEFINE += -DLIB_FOUNDATION_BOEHM_GC=1
else
FOUNDATION_LIBRARY_DEFINE += -DLIB_FOUNDATION_LEAK_GC=1
endif
endif
GNUSTEP_FND_DIR = libFoundation
FOUNDATION_LIBRARY_NAME = Foundation
FOUNDATION_LIBRARY_DEFINE = -DLIB_FOUNDATION_LIBRARY=1
ifeq ($(gc),yes)
ifneq ($(leak),yes)
FOUNDATION_LIBRARY_DEFINE += -DLIB_FOUNDATION_BOEHM_GC=1
else
FOUNDATION_LIBRARY_DEFINE += -DLIB_FOUNDATION_LEAK_GC=1
endif
endif
endif
ifeq ($(FOUNDATION_LIB),nx)
GNUSTEP_FND_DIR = NeXT
FOUNDATION_LIBRARY_NAME =
FOUNDATION_LIBRARY_DEFINE = -DNeXT_Foundation_LIBRARY=1
GNUSTEP_FND_DIR = NeXT
FOUNDATION_LIBRARY_NAME =
FOUNDATION_LIBRARY_DEFINE = -DNeXT_Foundation_LIBRARY=1
endif
ifeq ($(FOUNDATION_LIB),sun)
GNUSTEP_FND_DIR = sun
FOUNDATION_LIBRARY_DEFINE = -DSun_Foundation_LIBRARY=1
GNUSTEP_FND_DIR = sun
FOUNDATION_LIBRARY_DEFINE = -DSun_Foundation_LIBRARY=1
endif
ifneq ($(GNUSTEP_NETWORK_ROOT),)
GNUSTEP_HEADERS_FND_FLAG += -I$(GNUSTEP_NETWORK_HEADERS)/$(GNUSTEP_FND_DIR)
GNUSTEP_HEADERS_FND_FLAG += -I$(GNUSTEP_NETWORK_HEADERS)/$(GNUSTEP_FND_DIR)
endif
ifneq ($(GNUSTEP_USER_ROOT),)
GNUSTEP_HEADERS_FND_FLAG += -I$(GNUSTEP_USER_HEADERS)/$(GNUSTEP_FND_DIR)
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)
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) \
GNUSTEP_HEADERS_FND_FLAG += -I$(GNUSTEP_USER_HEADERS)/$(GNUSTEP_FND_DIR)/$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/$(OBJC_RUNTIME) \
-I$(GNUSTEP_LOCAL_HEADERS)/$(GNUSTEP_FND_DIR)/$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/$(OBJC_RUNTIME) \
-I$(GNUSTEP_SYSTEM_HEADERS)/$(GNUSTEP_FND_DIR)/$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/$(OBJC_RUNTIME)
endif
@ -263,24 +352,24 @@ CFLAGS =
OBJ_DIR_PREFIX =
ifeq ($(OBJC_RUNTIME_LIB),gnu)
RUNTIME_FLAG = -fgnu-runtime
RUNTIME_DEFINE = -DGNU_RUNTIME=1
RUNTIME_FLAG = -fgnu-runtime
RUNTIME_DEFINE = -DGNU_RUNTIME=1
endif
# GNU runtime compiled with Boehm GC
ifeq ($(OBJC_RUNTIME_LIB),gnugc)
RUNTIME_FLAG = -fgnu-runtime
RUNTIME_DEFINE = -DGNU_RUNTIME=1 -DOBJC_WITH_GC=1
ifeq ($(debug),yes)
RUNTIME_DEFINE += -DGC_DEBUG
endif
RUNTIME_FLAG = -fgnu-runtime
RUNTIME_DEFINE = -DGNU_RUNTIME=1 -DOBJC_WITH_GC=1
ifeq ($(debug),yes)
RUNTIME_DEFINE += -DGC_DEBUG
endif
endif
ifeq ($(OBJC_RUNTIME_LIB),nx)
ifneq ($(OBJC_COMPILER), NeXT)
RUNTIME_FLAG = -fnext-runtime
endif
RUNTIME_DEFINE = -DNeXT_RUNTIME=1
RUNTIME_DEFINE = -DNeXT_RUNTIME=1
endif
# Enable building shared libraries by default. If the user wants to build a
@ -309,32 +398,32 @@ else
endif
ifeq ($(profile), yes)
ADDITIONAL_FLAGS += -pg
ifeq ($(LD), $(CC))
LDFLAGS += -pg
endif
OBJ_DIR_PREFIX += profile_
LIBRARY_NAME_SUFFIX := p$(LIBRARY_NAME_SUFFIX)
ADDITIONAL_FLAGS += -pg
ifeq ($(LD), $(CC))
LDFLAGS += -pg
endif
OBJ_DIR_PREFIX += profile_
LIBRARY_NAME_SUFFIX := p$(LIBRARY_NAME_SUFFIX)
endif
ifeq ($(debug), yes)
OPTFLAG := $(filter-out -O%, $(OPTFLAG))
ADDITIONAL_FLAGS += -g -Wall -DDEBUG -fno-omit-frame-pointer
ADDITIONAL_JAVAFLAGS += -g
OBJ_DIR_PREFIX += debug_
OPTFLAG := $(filter-out -O%, $(OPTFLAG))
ADDITIONAL_FLAGS += -g -Wall -DDEBUG -fno-omit-frame-pointer
ADDITIONAL_JAVAFLAGS += -g
OBJ_DIR_PREFIX += debug_
LIBRARY_NAME_SUFFIX := d$(LIBRARY_NAME_SUFFIX)
endif
OBJ_DIR_PREFIX += obj
ifeq ($(warn), no)
ADDITIONAL_FLAGS += -UGSWARN
ADDITIONAL_FLAGS += -UGSWARN
else
ADDITIONAL_FLAGS += -DGSWARN
ADDITIONAL_FLAGS += -DGSWARN
endif
ifneq ($(LIBRARY_NAME_SUFFIX),)
LIBRARY_NAME_SUFFIX := _$(LIBRARY_NAME_SUFFIX)
LIBRARY_NAME_SUFFIX := _$(LIBRARY_NAME_SUFFIX)
endif
AUXILIARY_CPPFLAGS += $(GNUSTEP_DEFINE) $(GNUSTEP_VERSION_DEFINE) \
@ -352,13 +441,17 @@ GNUSTEP_OBJ_PREFIX = $(shell echo $(OBJ_DIR_PREFIX) | sed 's/ //g')
# directory will be something like shared_obj/ix86_m68k_sun/
#
ifeq ($(arch),)
ARCH_OBJ_DIR = $(GNUSTEP_TARGET_DIR)
ARCH_OBJ_DIR = $(GNUSTEP_TARGET_DIR)
else
ARCH_OBJ_DIR = \
ARCH_OBJ_DIR = \
$(shell echo $(CLEANED_ARCH) | sed -e 's/ /_/g')/$(GNUSTEP_TARGET_OS)
endif
GNUSTEP_OBJ_DIR = $(GNUSTEP_OBJ_PREFIX)/$(ARCH_OBJ_DIR)/$(LIBRARY_COMBO)
ifeq ($(GNUSTEP_FLATTENED),)
GNUSTEP_OBJ_DIR = $(GNUSTEP_OBJ_PREFIX)/$(ARCH_OBJ_DIR)/$(LIBRARY_COMBO)
else
GNUSTEP_OBJ_DIR = $(GNUSTEP_OBJ_PREFIX)
endif
#
# Common variables for building documentation

355
configure vendored
View file

File diff suppressed because it is too large Load diff

20
configure.in
View file

@ -59,6 +59,26 @@ fi
AC_SUBST(GNUSTEP_ROOT)
AC_SUBST(GNUSTEP_PREFIX)
#--------------------------------------------------------------------
# Is the system flattened?
#--------------------------------------------------------------------
AC_ARG_ENABLE(flattened,
[ --enable-flattened Use flattened directory structure],
ac_cv_flattened=$enableval,
ac_cv_flattened="undefined")
if test "$ac_cv_flattened" = "yes"; then
GNUSTEP_FLATTENED=yes;
else
if test "$ac_cv_flattened" = "no"; then
GNUSTEP_FLATTENED=;
else
GNUSTEP_FLATTENED=$GNUSTEP_FLATTENED;
fi
fi
AC_SUBST(GNUSTEP_FLATTENED)
#--------------------------------------------------------------------
# Setup the library combination
#--------------------------------------------------------------------

8
ctool.make
View file

@ -107,11 +107,15 @@ internal-ctool-install:: internal-ctool-all internal-install-dirs install-ctool
internal-install-dirs::
$(MKDIRS) $(CTOOL_INSTALLATION_DIR)
ifeq ($(GNUSTEP_FLATTENED),)
install-ctool::
$(INSTALL_PROGRAM) -m 0755 $(GNUSTEP_OBJ_DIR)/$(INTERNAL_ctool_NAME)$(EXEEXT) \
$(CTOOL_INSTALLATION_DIR);
$(INSTALL_PROGRAM) -m 0755 $(GNUSTEP_OBJ_DIR)/$(INTERNAL_ctool_NAME)$(EXEEXT) $(CTOOL_INSTALLATION_DIR);
cp $(GNUSTEP_MAKEFILES)/executable.template $(GNUSTEP_INSTALLATION_DIR)/Tools/$(INTERNAL_ctool_NAME)
chmod a+x $(GNUSTEP_INSTALLATION_DIR)/Tools/$(INTERNAL_ctool_NAME)
else
install-ctool::
$(INSTALL_PROGRAM) -m 0755 $(GNUSTEP_OBJ_DIR)/$(INTERNAL_ctool_NAME)$(EXEEXT) $(CTOOL_INSTALLATION_DIR);
endif
internal-ctool-uninstall::
rm -f $(CTOOL_INSTALLATION_DIR)/$(INTERNAL_ctool_NAME)$(EXEEXT)

10
framework.make
View file

@ -95,9 +95,9 @@ FRAMEWORK_HEADER_FILES := $(patsubst %.h,$(FRAMEWORK_VERSION_DIR_NAME)/Headers/%
ifneq ($(BUILD_DLL),yes)
FRAMEWORK_CURRENT_DIR_NAME := $(FRAMEWORK_DIR_NAME)/Versions/Current
FRAMEWORK_LIBRARY_DIR_NAME := $(FRAMEWORK_VERSION_DIR_NAME)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO)
FRAMEWORK_CURRENT_LIBRARY_DIR_NAME := $(FRAMEWORK_CURRENT_DIR_NAME)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO)
FRAMEWORK_CURRENT_DIR_NAME := $(FRAMEWORK_VERSION_DIR_NAME)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO)
FRAMEWORK_LIBRARY_DIR_NAME := $(FRAMEWORK_VERSION_DIR_NAME)/$(GNUSTEP_TARGET_LDIR)
FRAMEWORK_CURRENT_LIBRARY_DIR_NAME := $(FRAMEWORK_CURRENT_DIR_NAME)/$(GNUSTEP_TARGET_LDIR)
FRAMEWORK_CURRENT_DIR_NAME := $(FRAMEWORK_VERSION_DIR_NAME)/$(GNUSTEP_TARGET_LDIR)
FRAMEWORK_LIBRARY_FILE = lib$(INTERNAL_framework_NAME)$(SHARED_LIBEXT)
FRAMEWORK_LIBRARY_FILE_EXT = $(SHARED_LIBEXT)
@ -117,7 +117,7 @@ DLL_EXP_DEF = $(INTERNAL_framework_NAME)$(FRAMEWORK_NAME_SUFFIX).def
ifeq ($(DLL_INSTALLATION_DIR),)
DLL_INSTALLATION_DIR = \
$(GNUSTEP_TOOLS)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO)
$(GNUSTEP_TOOLS)/$(GNUSTEP_TARGET_LDIR)
endif
endif # BUILD_DLL
@ -392,7 +392,7 @@ endif
# MacOSX-S frameworks
$(FRAMEWORK_VERSION_DIR_NAME)/Resources/Info.plist: $(FRAMEWORK_VERSION_DIR_NAME)/Resources
@(echo "{"; echo ' NOTE = "Automatically generated, do not edit!";'; \
echo " NSExecutable = \"$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO)/$(FRAMEWORK_NAME)${FRAMEWORK_OBJ_EXT}\";"; \
echo " NSExecutable = \"$(GNUSTEP_TARGET_LDIR)/$(FRAMEWORK_NAME)${FRAMEWORK_OBJ_EXT}\";"; \
if [ "$(MAIN_MODEL_FILE)" = "" ]; then \
echo " NSMainNibFile = \"\";"; \
else \

16
gswapp.make
View file

@ -116,7 +116,7 @@ endif
# Support building NeXT applications
ifneq ($(OBJC_COMPILER), NeXT)
GSWAPP_FILE = \
$(GSWAPP_DIR_NAME)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO)/$(INTERNAL_gswapp_NAME)$(EXEEXT)
$(GSWAPP_DIR_NAME)/$(GNUSTEP_TARGET_LDIR)/$(INTERNAL_gswapp_NAME)$(EXEEXT)
else
GSWAPP_FILE = $(GSWAPP_DIR_NAME)/$(INTERNAL_gswapp_NAME)$(EXEEXT)
endif
@ -138,7 +138,7 @@ ifeq ($(OBJC_COMPILER), NeXT)
rm -f $(INTERNAL_gswapp_NAME).iconheader
else
@$(TRANSFORM_PATHS_SCRIPT) `echo $(ALL_LIB_DIRS) | sed 's/-L//g'` \
>$(GSWAPP_DIR_NAME)/$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/$(LIBRARY_COMBO)/library_paths.openapp
>$(GSWAPP_DIR_NAME)/$(GNUSTEP_TARGET_LDIR)/library_paths.openapp
endif
#
@ -170,7 +170,7 @@ else
internal-gswapp-all:: \
before-$(TARGET)-all $(GNUSTEP_OBJ_DIR) \
$(GSWAPP_DIR_NAME)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO) $(GSWAPP_FILE) \
$(GSWAPP_DIR_NAME)/$(GNUSTEP_TARGET_LDIR) $(GSWAPP_FILE) \
gswapp-components \
gswapp-localized-webresource-files \
gswapp-webresource-files \
@ -183,15 +183,15 @@ before-$(TARGET)-all::
after-$(TARGET)-all::
$(GSWAPP_DIR_NAME)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO):
@$(MKDIRS) $(GSWAPP_DIR_NAME)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO)
$(GSWAPP_DIR_NAME)/$(GNUSTEP_TARGET_LDIR):
@$(MKDIRS) $(GSWAPP_DIR_NAME)/$(GNUSTEP_TARGET_LDIR)
endif
ifeq ($(GSWAPP_NAME)_GEN_SCRIPT,yes) #<==
$(GSWAPP_DIR_NAME)/$(GSWAPP_NAME).sh: $(GSWAPP_DIR_NAME)
@(echo "#!/bin/sh"; \
echo '# Automatically generated, do not edit!'; \
echo '$${GNUSTEP_HOST_CPU}/$${GNUSTEP_HOST_OS}/$${LIBRARY_COMBO}/$(INTERNAL_gswapp_NAME) $$1 $$2 $$3 $$4 $$5 $$6 $$7 $$8') >$@
echo '$${GNUSTEP_HOST_LDIR}/$(INTERNAL_gswapp_NAME) $$1 $$2 $$3 $$4 $$5 $$6 $$7 $$8') >$@
chmod +x $@
else
$(GSWAPP_DIR_NAME)/$(GSWAPP_NAME).sh:
@ -319,14 +319,14 @@ internal-gswapp-uninstall::
# Cleaning targets
#
internal-gswapp-clean::
rm -rf $(GNUSTEP_OBJ_PREFIX)/$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/$(LIBRARY_COMBO)
rm -rf $(GNUSTEP_OBJ_PREFIX)/$(GNUSTEP_TARGET_LDIR)
ifeq ($(OBJC_COMPILER), NeXT)
rm -f *.iconheader
for f in *.$(GSWAPP_EXTENSION); do \
rm -f $$f/`basename $$f .$(GSWAPP_EXTENSION)`; \
done
else
rm -rf *.$(GSWAPP_EXTENSION)/$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/$(LIBRARY_COMBO)
rm -rf *.$(GSWAPP_EXTENSION)/$(GNUSTEP_TARGET_LDIR)
endif

4
gswbundle.make
View file

@ -96,7 +96,7 @@ after-$(TARGET)-all::
GSWBUNDLE_DIR_NAME := $(INTERNAL_bundle_NAME:=$(GSWBUNDLE_EXTENSION))
GSWBUNDLE_FILE := \
$(GSWBUNDLE_DIR_NAME)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO)/$(GSWBUNDLE_NAME)
$(GSWBUNDLE_DIR_NAME)/$(GNUSTEP_TARGET_LDIR)/$(GSWBUNDLE_NAME)
GSWBUNDLE_RESOURCE_DIRS = $(foreach d, $(RESOURCE_DIRS), $(GSWBUNDLE_DIR_NAME)/Resources/$(d))
GSWBUNDLE_WEBSERVER_RESOURCE_DIRS = $(foreach d, $(WEBSERVER_RESOURCE_DIRS), $(GSWBUNDLE_DIR_NAME)/WebServerResources/$(d))
@ -126,7 +126,7 @@ endif
build-bundle-dir::
@$(MKDIRS) \
$(GSWBUNDLE_DIR_NAME)/Resources \
$(GSWBUNDLE_DIR_NAME)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO) \
$(GSWBUNDLE_DIR_NAME)/$(GNUSTEP_TARGET_LDIR) \
$(GSWBUNDLE_RESOURCE_DIRS)
build-bundle:: $(GSWBUNDLE_FILE) gswbundle-components gswbundle-resource-files localized-gswbundle-resource-files gswbundle-localized-webresource-files gswbundle-webresource-files

25
ld_lib_path.csh
View file

@ -26,8 +26,13 @@
# The first (and only) parameter to this script is the canonical
# operating system name.
set last_path_part="Libraries/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/${LIBRARY_COMBO}"
set tool_path_part="Libraries/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}"
if ( "$GNUSTEP_FLATTENED" == "" ) then
set last_path_part="Libraries/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/${LIBRARY_COMBO}"
set tool_path_part="Libraries/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}"
else
set last_path_part="Libraries"
set tool_path_part="Libraries"
endif
set host_os=${GNUSTEP_HOST_OS}
@ -39,9 +44,9 @@ switch ( "${host_os}" )
case *nextstep4* :
if ( $?DYLD_LIBRARY_PATH == 0 ) then
setenv DYLD_LIBRARY_PATH "${GNUSTEP_NETWORK_ROOT}/Library/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${tool_path_part}:${GNUSTEP_USER_ROOT}/Library/${last_path_part}:${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_USER_ROOT}/${tool_path_part}:${GNUSTEP_LOCAL_ROOT}/Library/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${tool_path_part}:${GNUSTEP_SYSTEM_ROOT}/Library/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${tool_path_part}"
setenv DYLD_LIBRARY_PATH "${GNUSTEP_NETWORK_ROOT}/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${tool_path_part}:${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_USER_ROOT}/${tool_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${tool_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${tool_path_part}"
else
setenv DYLD_LIBRARY_PATH "${GNUSTEP_NETWORK_ROOT}/Library/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${tool_path_part}:${GNUSTEP_USER_ROOT}/Library/${last_path_part}:${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_USER_ROOT}/${tool_path_part}:${GNUSTEP_LOCAL_ROOT}/Library/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${tool_path_part}:${GNUSTEP_SYSTEM_ROOT}/Library/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${tool_path_part}:${DYLD_LIBRARY_PATH}"
setenv DYLD_LIBRARY_PATH "${GNUSTEP_NETWORK_ROOT}/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${tool_path_part}:${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_USER_ROOT}/${tool_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${tool_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${tool_path_part}:${DYLD_LIBRARY_PATH}"
endif
if ( $?additional_lib_paths == 1) then
foreach dir (${additional_lib_paths})
@ -56,9 +61,9 @@ switch ( "${host_os}" )
case *hpux* :
if ( $?SHLIB_PATH == 0 ) then
setenv SHLIB_PATH "${GNUSTEP_NETWORK_ROOT}/Library/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${tool_path_part}:${GNUSTEP_USER_ROOT}/Library/${last_path_part}:${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_USER_ROOT}/${tool_path_part}:${GNUSTEP_LOCAL_ROOT}/Library/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${tool_path_part}:${GNUSTEP_SYSTEM_ROOT}/Library/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${tool_path_part}"
setenv SHLIB_PATH "${GNUSTEP_NETWORK_ROOT}/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${tool_path_part}:${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_USER_ROOT}/${tool_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${tool_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${tool_path_part}"
else
setenv SHLIB_PATH "${GNUSTEP_NETWORK_ROOT}/Library/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${tool_path_part}:${GNUSTEP_USER_ROOT}/Library/${last_path_part}:${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_USER_ROOT}/${tool_path_part}:${GNUSTEP_LOCAL_ROOT}/Library/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${tool_path_part}:${GNUSTEP_SYSTEM_ROOT}/Library/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${tool_path_part}:${SHLIB_PATH}"
setenv SHLIB_PATH "${GNUSTEP_NETWORK_ROOT}/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${tool_path_part}:${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_USER_ROOT}/${tool_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${tool_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${tool_path_part}:${SHLIB_PATH}"
endif
if ( $?additional_lib_paths == 1) then
foreach dir (${additional_lib_paths})
@ -71,9 +76,9 @@ switch ( "${host_os}" )
endif
if ( $?LD_LIBRARY_PATH == 0 ) then
setenv LD_LIBRARY_PATH "${GNUSTEP_NETWORK_ROOT}/Library/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${tool_path_part}:${GNUSTEP_USER_ROOT}/Library/${last_path_part}:${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_USER_ROOT}/${tool_path_part}:${GNUSTEP_LOCAL_ROOT}/Library/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${tool_path_part}:${GNUSTEP_SYSTEM_ROOT}/Library/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${tool_path_part}"
setenv LD_LIBRARY_PATH "${GNUSTEP_NETWORK_ROOT}/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${tool_path_part}:${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_USER_ROOT}/${tool_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${tool_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${tool_path_part}"
else
setenv LD_LIBRARY_PATH "${GNUSTEP_NETWORK_ROOT}/Library/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/{tool_path_part}:${GNUSTEP_USER_ROOT}/Library/${last_path_part}:${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_USER_ROOT}/${tool_path_part}:${GNUSTEP_LOCAL_ROOT}/Library/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${tool_path_part}:${GNUSTEP_SYSTEM_ROOT}/Library/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${tool_path_part}:${LD_LIBRARY_PATH}"
setenv LD_LIBRARY_PATH "${GNUSTEP_NETWORK_ROOT}/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/{tool_path_part}:${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_USER_ROOT}/${tool_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${tool_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${tool_path_part}:${LD_LIBRARY_PATH}"
endif
if ( $?additional_lib_paths == 1) then
foreach dir (${additional_lib_paths})
@ -88,9 +93,9 @@ switch ( "${host_os}" )
case * :
if ( $?LD_LIBRARY_PATH == 0 ) then
setenv LD_LIBRARY_PATH "${GNUSTEP_NETWORK_ROOT}/Library/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${tool_path_part}:${GNUSTEP_USER_ROOT}/Library/${last_path_part}:${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_USER_ROOT}/${tool_path_part}:${GNUSTEP_LOCAL_ROOT}/Library/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${tool_path_part}:${GNUSTEP_SYSTEM_ROOT}/Library/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${tool_path_part}"
setenv LD_LIBRARY_PATH "${GNUSTEP_NETWORK_ROOT}/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${tool_path_part}:${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_USER_ROOT}/${tool_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${tool_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${tool_path_part}"
else
setenv LD_LIBRARY_PATH "${GNUSTEP_NETWORK_ROOT}/Library/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/{tool_path_part}:${GNUSTEP_USER_ROOT}/Library/${last_path_part}:${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_USER_ROOT}/${tool_path_part}:${GNUSTEP_LOCAL_ROOT}/Library/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${tool_path_part}:${GNUSTEP_SYSTEM_ROOT}/Library/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${tool_path_part}:${LD_LIBRARY_PATH}"
setenv LD_LIBRARY_PATH "${GNUSTEP_NETWORK_ROOT}/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/${last_path_part}:${GNUSTEP_NETWORK_ROOT}/{tool_path_part}:${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_USER_ROOT}/${last_path_part}:${GNUSTEP_USER_ROOT}/${tool_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${last_path_part}:${GNUSTEP_LOCAL_ROOT}/${tool_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${last_path_part}:${GNUSTEP_SYSTEM_ROOT}/${tool_path_part}:${LD_LIBRARY_PATH}"
endif
if ( $?additional_lib_paths == 1) then
foreach dir (${additional_lib_paths})

11
ld_lib_path.sh
View file

@ -26,9 +26,6 @@
# The first (and only) parameter to this script is the canonical
# operating system name.
last_path_part=Libraries/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO
tool_path_part=Libraries/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS
host_os=$GNUSTEP_HOST_OS
if [ -z "$host_os" ]; then
@ -39,7 +36,13 @@ old_IFS="$IFS"
IFS="
"
lib_paths="$GNUSTEP_USER_ROOT/Library/$last_path_part:$GNUSTEP_USER_ROOT/$last_path_part:$GNUSTEP_USER_ROOT/$tool_path_part:$GNUSTEP_LOCAL_ROOT/Library/$last_path_part:$GNUSTEP_LOCAL_ROOT/$last_path_part:$GNUSTEP_LOCAL_ROOT/$tool_path_part:$GNUSTEP_SYSTEM_ROOT/Library/$last_path_part:$GNUSTEP_SYSTEM_ROOT/$last_path_part:$GNUSTEP_SYSTEM_ROOT/$tool_path_part"
if [ -z "$GNUSTEP_FLATTENED" ]; then
last_path_part=Libraries/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO
tool_path_part=Libraries/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS
lib_paths="$GNUSTEP_USER_ROOT/$last_path_part:$GNUSTEP_USER_ROOT/$last_path_part:$GNUSTEP_USER_ROOT/$tool_path_part:$GNUSTEP_LOCAL_ROOT/$last_path_part:$GNUSTEP_LOCAL_ROOT/$last_path_part:$GNUSTEP_LOCAL_ROOT/$tool_path_part:$GNUSTEP_SYSTEM_ROOT/$last_path_part:$GNUSTEP_SYSTEM_ROOT/$last_path_part:$GNUSTEP_SYSTEM_ROOT/$tool_path_part"
else
lib_paths="$GNUSTEP_USER_ROOT/Libraries:$GNUSTEP_LOCAL_ROOT/Libraries:$GNUSTEP_SYSTEM_ROOT/Libraries"
fi
if [ -n "$additional_library_paths" ]; then
for dir in $additional_library_paths; do

2
library.make
View file

@ -109,7 +109,7 @@ DLL_EXP_DEF = $(INTERNAL_library_NAME)$(LIBRARY_NAME_SUFFIX).def
ifeq ($(DLL_INSTALLATION_DIR),)
DLL_INSTALLATION_DIR = \
$(GNUSTEP_TOOLS)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO)
$(GNUSTEP_TOOLS)/$(GNUSTEP_TARGET_LDIR)
endif
endif # BUILD_DLL

4
palette.make
View file

@ -86,7 +86,7 @@ after-$(TARGET)-all::
PALETTE_DIR_NAME := $(INTERNAL_palette_NAME).palette
PALETTE_FILE := \
$(PALETTE_DIR_NAME)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO)/$(PALETTE_NAME)
$(PALETTE_DIR_NAME)/$(GNUSTEP_TARGET_LDIR)/$(PALETTE_NAME)
PALETTE_RESOURCE_DIRS = $(foreach d, $(RESOURCE_DIRS), $(PALETTE_DIR_NAME)/Resources/$(d))
ifeq ($(strip $(RESOURCE_FILES)),)
override RESOURCE_FILES=""
@ -95,7 +95,7 @@ endif
build-palette-dir::
@$(MKDIRS) \
$(PALETTE_DIR_NAME)/Resources \
$(PALETTE_DIR_NAME)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO) \
$(PALETTE_DIR_NAME)/$(GNUSTEP_TARGET_LDIR) \
$(PALETTE_RESOURCE_DIRS)
build-palette:: $(PALETTE_FILE) palette-resource-files

12
service.make
View file

@ -80,7 +80,7 @@ endif
#
# Internal targets
#
SERVICE_FILE = $(SERVICE_DIR_NAME)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO)/$(INTERNAL_svc_NAME)
SERVICE_FILE = $(SERVICE_DIR_NAME)/$(GNUSTEP_TARGET_LDIR)/$(INTERNAL_svc_NAME)
$(SERVICE_FILE): $(C_OBJ_FILES) $(OBJC_OBJ_FILES) $(SUBPROJECT_OBJ_FILES)
@ -92,15 +92,15 @@ $(SERVICE_FILE): $(C_OBJ_FILES) $(OBJC_OBJ_FILES) $(SUBPROJECT_OBJ_FILES)
# Compilation targets
#
internal-svc-all:: before-$(TARGET)-all $(GNUSTEP_OBJ_DIR) \
$(SERVICE_DIR_NAME)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO) $(SERVICE_FILE) \
$(SERVICE_DIR_NAME)/$(GNUSTEP_TARGET_LDIR) $(SERVICE_FILE) \
svc-resource-files after-$(TARGET)-all
before-$(TARGET)-all::
after-$(TARGET)-all::
$(SERVICE_DIR_NAME)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO):
@$(MKDIRS) $(SERVICE_DIR_NAME)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO)
$(SERVICE_DIR_NAME)/$(GNUSTEP_TARGET_LDIR):
@$(MKDIRS) $(SERVICE_DIR_NAME)/$(GNUSTEP_TARGET_LDIR)
svc-resource-dir::
@$(MKDIRS) $(SERVICE_RESOURCE_DIRS)
@ -134,14 +134,14 @@ internal-svc-uninstall::
# Cleaning targets
#
internal-svc-clean::
rm -rf $(GNUSTEP_OBJ_PREFIX)/$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/$(LIBRARY_COMBO)
rm -rf $(GNUSTEP_OBJ_PREFIX)/$(GNUSTEP_TARGET_LDIR)
ifeq ($(OBJC_COMPILER), NeXT)
rm -f *.iconheader
for f in *.service; do \
rm -f $$f/`basename $$f .service`; \
done
else
rm -rf *.service/$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/$(LIBRARY_COMBO)
rm -rf *.service/$(GNUSTEP_TARGET_LDIR)
endif

6
target.make
View file

@ -140,7 +140,7 @@ ifeq ($(FOUNDATION_LIB),nx)
endif
TARGET_LIB_DIR = \
Libraries/$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/$(LIBRARY_COMBO)
Libraries/$(GNUSTEP_TARGET_LDIR)
ifneq ($(OBJC_COMPILER), NeXT)
SHARED_LIB_LINK_CMD = \
@ -224,7 +224,7 @@ ifeq ($(FOUNDATION_LIB),nx)
endif
TARGET_LIB_DIR = \
Libraries/$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/$(LIBRARY_COMBO)
Libraries/$(GNUSTEP_TARGET_LDIR)
ifneq ($(OBJC_COMPILER), NeXT)
SHARED_LIB_LINK_CMD = \
@ -300,7 +300,7 @@ ifeq ($(FOUNDATION_LIB),nx)
endif
TARGET_LIB_DIR = \
Libraries/$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/$(LIBRARY_COMBO)
Libraries/$(GNUSTEP_TARGET_LDIR)
ifneq ($(OBJC_COMPILER), NeXT)
SHARED_LIB_LINK_CMD = \

10
tool.make
View file

@ -40,7 +40,7 @@ include $(GNUSTEP_MAKEFILES)/rules.make
# directory they will get installed in the GNUstep system root.
ifeq ($(TOOL_INSTALLATION_DIR),)
TOOL_INSTALLATION_DIR = \
$(GNUSTEP_TOOLS)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO)
$(GNUSTEP_TOOLS)/$(GNUSTEP_TARGET_LDIR)
endif
ifeq ($(INTERNAL_tool_NAME),)
@ -107,11 +107,15 @@ internal-tool-install:: internal-tool-all internal-install-dirs install-tool
internal-install-dirs::
$(MKDIRS) $(TOOL_INSTALLATION_DIR)
ifeq ($(GNUSTEP_FLATTENED),)
install-tool::
$(INSTALL_PROGRAM) -m 0755 $(GNUSTEP_OBJ_DIR)/$(INTERNAL_tool_NAME)$(EXEEXT) \
$(TOOL_INSTALLATION_DIR);
$(INSTALL_PROGRAM) -m 0755 $(GNUSTEP_OBJ_DIR)/$(INTERNAL_tool_NAME)$(EXEEXT) $(TOOL_INSTALLATION_DIR);
cp $(GNUSTEP_MAKEFILES)/executable.template $(GNUSTEP_INSTALLATION_DIR)/Tools/$(INTERNAL_tool_NAME)
chmod a+x $(GNUSTEP_INSTALLATION_DIR)/Tools/$(INTERNAL_tool_NAME)
else
install-tool::
$(INSTALL_PROGRAM) -m 0755 $(GNUSTEP_OBJ_DIR)/$(INTERNAL_tool_NAME)$(EXEEXT) $(TOOL_INSTALLATION_DIR)
endif
internal-tool-uninstall::
rm -f $(TOOL_INSTALLATION_DIR)/$(INTERNAL_tool_NAME)$(EXEEXT)

16
woapp.make
View file

@ -135,7 +135,7 @@ endif
# Support building NeXT applications
ifneq ($(OBJC_COMPILER), NeXT)
WOAPP_FILE = \
$(WOAPP_DIR_NAME)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO)/$(INTERNAL_woapp_NAME)$(EXEEXT)
$(WOAPP_DIR_NAME)/$(GNUSTEP_TARGET_LDIR)/$(INTERNAL_woapp_NAME)$(EXEEXT)
else
WOAPP_FILE = $(WOAPP_DIR_NAME)/$(INTERNAL_woapp_NAME)$(EXEEXT)
endif
@ -155,7 +155,7 @@ ifeq ($(OBJC_COMPILER), NeXT)
rm -f $(INTERNAL_woapp_NAME).iconheader
else
@$(TRANSFORM_PATHS_SCRIPT) `echo $(ALL_LIB_DIRS) | sed 's/-L//g'` \
>$(WOAPP_DIR_NAME)/$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/$(LIBRARY_COMBO)/library_paths.openapp
>$(WOAPP_DIR_NAME)/$(GNUSTEP_TARGET_LDIR)/library_paths.openapp
endif
#
@ -187,7 +187,7 @@ else
internal-woapp-all:: \
before-$(TARGET)-all $(GNUSTEP_OBJ_DIR) \
$(WOAPP_DIR_NAME)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO) $(WOAPP_FILE) \
$(WOAPP_DIR_NAME)/$(GNUSTEP_TARGET_LDIR) $(WOAPP_FILE) \
woapp-components \
woapp-localized-webresource-files \
woapp-webresource-files \
@ -200,15 +200,15 @@ before-$(TARGET)-all::
after-$(TARGET)-all::
$(WOAPP_DIR_NAME)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO):
@$(MKDIRS) $(WOAPP_DIR_NAME)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO)
$(WOAPP_DIR_NAME)/$(GNUSTEP_TARGET_LDIR):
@$(MKDIRS) $(WOAPP_DIR_NAME)/$(GNUSTEP_TARGET_LDIR)
endif
ifeq ($(WOAPP_NAME)_GEN_SCRIPT,yes)
$(WOAPP_DIR_NAME)/$(WOAPP_NAME).sh: $(WOAPP_DIR_NAME)
@(echo "#!/bin/sh"; \
echo '# Automatically generated, do not edit!'; \
echo '$${GNUSTEP_HOST_CPU}/$${GNUSTEP_HOST_OS}/$${LIBRARY_COMBO}/$(INTERNAL_woapp_NAME) $$1 $$2 $$3 $$4 $$5 $$6 $$7 $$8') >$@
echo '$${GNUSTEP_HOST_LDIR}/$(INTERNAL_woapp_NAME) $$1 $$2 $$3 $$4 $$5 $$6 $$7 $$8') >$@
chmod +x $@
else
$(WOAPP_DIR_NAME)/$(WOAPP_NAME).sh:
@ -306,14 +306,14 @@ internal-woapp-uninstall::
# Cleaning targets
#
internal-woapp-clean::
rm -rf $(GNUSTEP_OBJ_PREFIX)/$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/$(LIBRARY_COMBO)
rm -rf $(GNUSTEP_OBJ_PREFIX)/$(GNUSTEP_TARGET_LDIR)
ifeq ($(OBJC_COMPILER), NeXT)
rm -f *.iconheader
for f in *.$(WOAPP_EXTENSION); do \
rm -f $$f/`basename $$f .$(WOAPP_EXTENSION)`; \
done
else
rm -rf *.$(WOAPP_EXTENSION)/$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/$(LIBRARY_COMBO)
rm -rf *.$(WOAPP_EXTENSION)/$(GNUSTEP_TARGET_LDIR)
endif

4
wobundle.make
View file

@ -107,7 +107,7 @@ after-$(TARGET)-all::
BUNDLE_DIR_NAME := $(INTERNAL_bundle_NAME:=$(BUNDLE_EXTENSION))
BUNDLE_FILE := \
$(BUNDLE_DIR_NAME)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO)/$(BUNDLE_NAME)$(BUNDLE_OBJ_EXT)
$(BUNDLE_DIR_NAME)/$(GNUSTEP_TARGET_LDIR)/$(BUNDLE_NAME)$(BUNDLE_OBJ_EXT)
BUNDLE_RESOURCE_DIRS = $(foreach d, $(RESOURCE_DIRS), $(BUNDLE_DIR_NAME)/Resources/$(d))
ifeq ($(strip $(HEADER_FILES_DIR)),)
@ -130,7 +130,7 @@ endif
build-bundle-dir::
@$(MKDIRS) \
$(BUNDLE_DIR_NAME)/Resources \
$(BUNDLE_DIR_NAME)/$(GNUSTEP_TARGET_DIR)/$(LIBRARY_COMBO) \
$(BUNDLE_DIR_NAME)/$(GNUSTEP_TARGET_LDIR) \
$(BUNDLE_RESOURCE_DIRS)
build-bundle:: $(BUNDLE_FILE) bundle-components bundle-resource-files localized-bundle-resource-files