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

Better support for the dynamic linker.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@2645 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Ovidiu Predescu 1997-11-17 22:55:20 +00:00
parent 34a31cdaa9
commit cd05e3c49a
5 changed files with 35 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
Mon Nov 17 13:05:44 1997 Ovidiu Predescu <ovidiu@net-community.com>
* application.make: Output the file containing the paths for the
dynamic linker for each library combo instead of a global file for all
the combinations.
* openapp.in: Support the above change.
* debugapp.in: Likewise.
* rules.m (ALL_OBJCFLAGS, ALL_CFLAGS): Remove unnecessary -I.
Fri Nov 14 12:51:16 1997 Scott Christley <scottc@net-community.com> Fri Nov 14 12:51:16 1997 Scott Christley <scottc@net-community.com>
* test-application.make: New file. * test-application.make: New file.

5
application.make
View file

@ -96,12 +96,15 @@ endif
$(APP_FILE): $(C_OBJ_FILES) $(OBJC_OBJ_FILES) $(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) $(ALL_LIB_DIRS) $(ALL_GUI_LIBS)
ifeq ($(OBJC_COMPILER), NeXT)
@$(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 >$(APP_DIR_NAME)/library_paths.openapp
ifeq ($(OBJC_COMPILER), NeXT)
# This is a hack for OPENSTEP systems to remove the iconheader file # This is a hack for OPENSTEP systems to remove the iconheader file
# automatically generated by the makefile package. # automatically generated by the makefile package.
rm -f $(INTERNAL_app_NAME).iconheader 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
endif endif
# #

14
debugapp.in
View file

@ -74,10 +74,6 @@ if [ -z "$full_appname" ]; then
exit 1 exit 1
fi fi
if [ -f "$full_appname/library_paths.openapp" ]; then
additional_library_paths="`cat $full_appname/library_paths.openapp`"
fi
# #
# Determine the host information # Determine the host information
# #
@ -101,6 +97,16 @@ if [ -z "$GNUSTEP_HOST_OS" ]; then
export GNUSTEP_HOST_OS export GNUSTEP_HOST_OS
fi fi
if [ "$LIBRARY_COMBO" = nx-nx-nx-nil -a $GNUSTEP_HOST_OS = nextstep4 ]; then
if [ -f "$full_appname/library_paths.openapp" ]; then
additional_library_paths="`cat $full_appname/library_paths.openapp`"
fi
else
if [ -f "$full_appname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO/library_paths.openapp" ]; then
additional_library_paths="`cat $full_appname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO/library_paths.openapp`"
fi
fi
appname=`echo $app | sed 's/\.[a-z]*$//'` appname=`echo $app | sed 's/\.[a-z]*$//'`
. $GNUSTEP_SYSTEM_ROOT/Makefiles/ld_lib_path.sh . $GNUSTEP_SYSTEM_ROOT/Makefiles/ld_lib_path.sh

14
openapp.in
View file

@ -74,10 +74,6 @@ if [ -z "$full_appname" ]; then
exit 1 exit 1
fi fi
if [ -f "$full_appname/library_paths.openapp" ]; then
additional_library_paths="`cat $full_appname/library_paths.openapp`"
fi
# #
# Determine the host information # Determine the host information
# #
@ -101,6 +97,16 @@ if [ -z "$GNUSTEP_HOST_OS" ]; then
export GNUSTEP_HOST_OS export GNUSTEP_HOST_OS
fi fi
if [ "$LIBRARY_COMBO" = nx-nx-nx-nil -a $GNUSTEP_HOST_OS = nextstep4 ]; then
if [ -f "$full_appname/library_paths.openapp" ]; then
additional_library_paths="`cat $full_appname/library_paths.openapp`"
fi
else
if [ -f "$full_appname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO/library_paths.openapp" ]; then
additional_library_paths="`cat $full_appname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO/library_paths.openapp`"
fi
fi
appname=`echo $app | sed 's/\.[a-z]*$//'` appname=`echo $app | sed 's/\.[a-z]*$//'`
. $GNUSTEP_SYSTEM_ROOT/Makefiles/ld_lib_path.sh . $GNUSTEP_SYSTEM_ROOT/Makefiles/ld_lib_path.sh

4
rules.make
View file

@ -110,14 +110,14 @@ ALL_OBJCFLAGS = $(INTERNAL_OBJCFLAGS) $(ADDITIONAL_OBJCFLAGS) \
$(AUXILIARY_OBJCFLAGS) $(ADDITIONAL_INCLUDE_DIRS) \ $(AUXILIARY_OBJCFLAGS) $(ADDITIONAL_INCLUDE_DIRS) \
$(AUXILIARY_INCLUDE_DIRS) -I. $(SYSTEM_INCLUDES) \ $(AUXILIARY_INCLUDE_DIRS) -I. $(SYSTEM_INCLUDES) \
$(GNUSTEP_HEADERS_FND_FLAG) $(GNUSTEP_HEADERS_GUI_FLAG) \ $(GNUSTEP_HEADERS_FND_FLAG) $(GNUSTEP_HEADERS_GUI_FLAG) \
-I$(GNUSTEP_HEADERS_TARGET_FLAG) -I$(GNUSTEP_USER_HEADERS) \ $(GNUSTEP_HEADERS_TARGET_FLAG) -I$(GNUSTEP_USER_HEADERS) \
-I$(GNUSTEP_LOCAL_HEADERS) -I$(GNUSTEP_SYSTEM_HEADERS) -I$(GNUSTEP_LOCAL_HEADERS) -I$(GNUSTEP_SYSTEM_HEADERS)
ALL_CFLAGS = $(INTERNAL_CFLAGS) $(ADDITIONAL_CFLAGS) \ ALL_CFLAGS = $(INTERNAL_CFLAGS) $(ADDITIONAL_CFLAGS) \
$(AUXILIARY_CFLAGS) $(ADDITIONAL_INCLUDE_DIRS) \ $(AUXILIARY_CFLAGS) $(ADDITIONAL_INCLUDE_DIRS) \
$(AUXILIARY_INCLUDE_DIRS) -I. $(SYSTEM_INCLUDES) \ $(AUXILIARY_INCLUDE_DIRS) -I. $(SYSTEM_INCLUDES) \
$(GNUSTEP_HEADERS_FND_FLAG) $(GNUSTEP_HEADERS_GUI_FLAG) \ $(GNUSTEP_HEADERS_FND_FLAG) $(GNUSTEP_HEADERS_GUI_FLAG) \
-I$(GNUSTEP_HEADERS_TARGET_FLAG) -I$(GNUSTEP_USER_HEADERS) \ $(GNUSTEP_HEADERS_TARGET_FLAG) -I$(GNUSTEP_USER_HEADERS) \
-I$(GNUSTEP_LOCAL_HEADERS) -I$(GNUSTEP_SYSTEM_HEADERS) -I$(GNUSTEP_LOCAL_HEADERS) -I$(GNUSTEP_SYSTEM_HEADERS)
ALL_LDFLAGS = $(ADDITIONAL_LDFLAGS) $(AUXILIARY_LDFLAGS) $(GUI_LDFLAGS) \ ALL_LDFLAGS = $(ADDITIONAL_LDFLAGS) $(AUXILIARY_LDFLAGS) $(GUI_LDFLAGS) \