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

Fixed some bugs related to openapp.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@2514 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
ovidiu 1997-10-16 18:52:02 +00:00
parent 94f2a05a9d
commit 0e500a216e
5 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
Thu Oct 16 11:23:05 1997 Ovidiu Predescu <ovidiu@net-community.com>
* ld_lib_path.sh: Set IFS to blank and newline to make the for loop
run correctly. Remove double quotes around $additional_library_paths
in the for loop.
* openapp.in: Put double quotes around the cat command when obtaining
the value for additional_library_paths.
* transform_paths.sh: Search through all the directories in $@,
not in "$*".
Wed Oct 15 12:14:42 1997 Ovidiu Predescu <ovidiu@net-community.com>
Better support for building applications.

5
application.make
View file

@ -59,10 +59,9 @@ endif
#
$(APP_FILE): $(C_OBJ_FILES) $(OBJC_OBJ_FILES)
$(LD) $(ALL_LDFLAGS) $(LDOUT)$@ \
$(C_OBJ_FILES) $(OBJC_OBJ_FILES) \
$(LD) $(ALL_LDFLAGS) $(LDOUT)$@ $(C_OBJ_FILES) $(OBJC_OBJ_FILES) \
$(ALL_LIB_DIRS) $(ALL_GUI_LIBS)
@$(TRANSFORM_PATHS_SCRIPT) `echo $(ALL_LIB_DIRS) | sed 's/-L//g'` \
$(TRANSFORM_PATHS_SCRIPT) `echo $(ALL_LIB_DIRS) | sed 's/-L//g'` \
>$(APP_DIR_NAME)/library_paths.openapp
ifeq ($(OBJC_COMPILER), NeXT)
# This is a hack for OPENSTEP systems to remove the iconheader file

11
ld_lib_path.sh
View file

@ -35,6 +35,9 @@ if [ -z "$host_os" ]; then
host_os=$1
fi
old_IFS="$IFS"
IFS="
"
case "$host_os" in
@ -42,7 +45,7 @@ case "$host_os" in
ld_lib_path="DYLD_LIBRARY_PATH"
DYLD_LIBRARY_PATH="$GNUSTEP_USER_ROOT/$last_path_part:$GNUSTEP_LOCAL_ROOT/$last_path_part:$GNUSTEP_SYSTEM_ROOT/$last_path_part:$DYLD_LIBRARY_PATH"
if [ -n "$additional_library_paths" ]; then
for dir in "$additional_library_paths"; do
for dir in $additional_library_paths; do
additional="${additional}${dir}:"
done
fi
@ -53,7 +56,7 @@ case "$host_os" in
ld_lib_path="LD_LIBRARY_PATH"
LD_LIBRARY_PATH="$GNUSTEP_USER_ROOT/$last_path_part;$GNUSTEP_LOCAL_ROOT/$last_path_part;$GNUSTEP_SYSTEM_ROOT/$last_path_part;$LD_LIBRARY_PATH"
if [ -n "$additional_library_paths" ]; then
for dir in "$additional_library_paths"; do
for dir in $additional_library_paths; do
additional="${additional}${dir};"
done
fi
@ -64,7 +67,7 @@ case "$host_os" in
ld_lib_path="LD_LIBRARY_PATH"
LD_LIBRARY_PATH="$GNUSTEP_USER_ROOT/$last_path_part:$GNUSTEP_LOCAL_ROOT/$last_path_part:$GNUSTEP_SYSTEM_ROOT/$last_path_part:$LD_LIBRARY_PATH"
if [ -n "$additional_library_paths" ]; then
for dir in "$additional_library_paths"; do
for dir in $additional_library_paths; do
additional="${additional}${dir}:"
done
fi
@ -77,3 +80,5 @@ esac
if [ "$export_variable" != yes ]; then
echo $ld_lib_path
fi
IFS="$old_IFS"

2
openapp.in
View file

@ -67,7 +67,7 @@ if [ -z "$full_appname" ]; then
fi
if [ -f "$full_appname/library_paths.openapp" ]; then
additional_library_paths=`cat $full_appname/library_paths.openapp`
additional_library_paths="`cat $full_appname/library_paths.openapp`"
fi
appname=`echo $app | sed 's/\.[a-z]*$//'`

4
transform_paths.sh
View file

@ -27,8 +27,8 @@ fi
curdir=`pwd`
for dir in "$*"; do
for dir in $@; do
if [ -d $curdir/$dir ]; then
echo `(cd $curdir/$dir; pwd)`
echo "`(cd $curdir/$dir; pwd)`"
fi
done