mirror of
https://github.com/gnustep/tools-make.git
synced 2025-05-12 06:11:04 +00:00
Minor changes.
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@2589 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
4a4bf85ae4
commit
fd25dcbb78
4 changed files with 26 additions and 15 deletions
|
@ -1,3 +1,10 @@
|
||||||
|
Thu Oct 30 09:35:34 1997 Ovidiu Predescu <ovidiu@net-community.com>
|
||||||
|
|
||||||
|
* common.make: Add the cpu/os/runtime include flag only for
|
||||||
|
libFoundation since only it requires this for the exception files.
|
||||||
|
* debugapp.in: Support for GDBbundle under OPENSTEP.
|
||||||
|
* rules.make: Don't show the recursive make command.
|
||||||
|
|
||||||
Wed Oct 29 09:32:26 1997 Ovidiu Predescu <ovidiu@net-community.com>
|
Wed Oct 29 09:32:26 1997 Ovidiu Predescu <ovidiu@net-community.com>
|
||||||
|
|
||||||
* core.make: Renamed to brain.make to avoid removing it accidentally by
|
* core.make: Renamed to brain.make to avoid removing it accidentally by
|
||||||
|
|
|
@ -134,11 +134,14 @@ FOUNDATION_LIBRARY_DEFINE = -DSun_Foundation_LIBRARY=1
|
||||||
endif
|
endif
|
||||||
|
|
||||||
GNUSTEP_HEADERS_FND_FLAG = -I$(GNUSTEP_USER_HEADERS)/$(GNUSTEP_FND_DIR) \
|
GNUSTEP_HEADERS_FND_FLAG = -I$(GNUSTEP_USER_HEADERS)/$(GNUSTEP_FND_DIR) \
|
||||||
-I$(GNUSTEP_USER_HEADERS)/$(GNUSTEP_FND_DIR)/$(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)/$(OBJC_RUNTIME) \
|
|
||||||
-I$(GNUSTEP_LOCAL_HEADERS)/$(GNUSTEP_FND_DIR) \
|
-I$(GNUSTEP_LOCAL_HEADERS)/$(GNUSTEP_FND_DIR) \
|
||||||
|
-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) \
|
||||||
-I$(GNUSTEP_LOCAL_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) \
|
|
||||||
-I$(GNUSTEP_SYSTEM_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
|
||||||
|
|
||||||
#
|
#
|
||||||
# Determine AppKit header subdirectory based upon library combo
|
# Determine AppKit header subdirectory based upon library combo
|
||||||
|
|
17
debugapp.in
17
debugapp.in
|
@ -73,16 +73,15 @@ 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
|
||||||
|
|
||||||
|
|
||||||
if [ "$library_combo" = nx-nx-nx-nil -a $GNUSTEP_HOST_OS = nextstep4 ]; then
|
if [ "$library_combo" = nx-nx-nx-nil -a $GNUSTEP_HOST_OS = nextstep4 ]; then
|
||||||
if [ ! -f $full_appname/$appname ]; then
|
if [ ! -f $full_appname/$appname ]; then
|
||||||
echo "$full_appname application does not have a binary for this kind of machine and operating system."
|
echo "$full_appname application does not have a binary for this kind of machine and operating system."
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# From some reasons $@ does not correctly pass the arguments to the binary
|
# Support for GDBbundle under OPENSTEP
|
||||||
# so I use xargs to do this.
|
gdb -connect TextEdit $gdbargs $full_appname/$appname
|
||||||
# echo $@ | xargs $full_appname/$appname
|
|
||||||
gdb $full_appname/$appname
|
|
||||||
|
|
||||||
else
|
else
|
||||||
# Determine if the application has a binary for this operating system
|
# Determine if the application has a binary for this operating system
|
||||||
|
@ -96,9 +95,11 @@ else
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# From some reasons $@ does not correctly pass the arguments to the binary
|
# Support for GDBbundle under OPENSTEP
|
||||||
# so I use xargs to do this.
|
if [ $GNUSTEP_HOST_OS = nextstep4 ]; then
|
||||||
# echo $@ | xargs $full_appname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$library_combo/$appname
|
gdb -connect TextEdit $full_appname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$library_combo/$appname
|
||||||
gdb $full_appname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$library_combo/$appname
|
else
|
||||||
|
gdb $full_appname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$library_combo/$appname
|
||||||
|
fi
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
10
rules.make
10
rules.make
|
@ -188,7 +188,7 @@ ALL_TEST_GUI_LIBS := \
|
||||||
|
|
||||||
%.testlib : FORCE
|
%.testlib : FORCE
|
||||||
@echo Making $*...
|
@echo Making $*...
|
||||||
$(MAKE) --no-print-directory internal-testlib-all \
|
@$(MAKE) --no-print-directory internal-testlib-all \
|
||||||
TEST_LIBRARY_NAME=$* \
|
TEST_LIBRARY_NAME=$* \
|
||||||
OBJC_FILES="$($*_OBJC_FILES)" \
|
OBJC_FILES="$($*_OBJC_FILES)" \
|
||||||
C_FILES="$($*_C_FILES)" \
|
C_FILES="$($*_C_FILES)" \
|
||||||
|
@ -242,7 +242,7 @@ ALL_TEST_GUI_LIBS := \
|
||||||
|
|
||||||
%.checklib : FORCE
|
%.checklib : FORCE
|
||||||
@echo Checking $*...
|
@echo Checking $*...
|
||||||
$(MAKE) --no-print-directory internal-check-LIBRARY \
|
@$(MAKE) --no-print-directory internal-check-LIBRARY \
|
||||||
TEST_LIBRARY_NAME=$* \
|
TEST_LIBRARY_NAME=$* \
|
||||||
ADDITIONAL_LD_LIB_DIRS="$($*_LD_LIB_DIRS)" \
|
ADDITIONAL_LD_LIB_DIRS="$($*_LD_LIB_DIRS)" \
|
||||||
CHECK_SCRIPT_DIRS="$($*_SCRIPT_DIRS)" \
|
CHECK_SCRIPT_DIRS="$($*_SCRIPT_DIRS)" \
|
||||||
|
@ -250,7 +250,7 @@ ALL_TEST_GUI_LIBS := \
|
||||||
|
|
||||||
%.checkbundle : FORCE
|
%.checkbundle : FORCE
|
||||||
@echo Checking $*...
|
@echo Checking $*...
|
||||||
$(MAKE) --no-print-directory internal-check-BUNDLE \
|
@$(MAKE) --no-print-directory internal-check-BUNDLE \
|
||||||
TEST_BUNDLE_NAME=$* \
|
TEST_BUNDLE_NAME=$* \
|
||||||
ADDITIONAL_LD_LIB_DIRS="$($*_LD_LIB_DIRS)" \
|
ADDITIONAL_LD_LIB_DIRS="$($*_LD_LIB_DIRS)" \
|
||||||
CHECK_SCRIPT_DIRS="$($*_SCRIPT_DIRS)" \
|
CHECK_SCRIPT_DIRS="$($*_SCRIPT_DIRS)" \
|
||||||
|
@ -258,7 +258,7 @@ ALL_TEST_GUI_LIBS := \
|
||||||
|
|
||||||
%.checktool : FORCE
|
%.checktool : FORCE
|
||||||
@echo Checking $*...
|
@echo Checking $*...
|
||||||
$(MAKE) --no-print-directory internal-check-TOOL \
|
@$(MAKE) --no-print-directory internal-check-TOOL \
|
||||||
TEST_TOOL_NAME=$* \
|
TEST_TOOL_NAME=$* \
|
||||||
ADDITIONAL_LD_LIB_DIRS="$($*_LD_LIB_DIRS)" \
|
ADDITIONAL_LD_LIB_DIRS="$($*_LD_LIB_DIRS)" \
|
||||||
CHECK_SCRIPT_DIRS="$($*_SCRIPT_DIRS)" \
|
CHECK_SCRIPT_DIRS="$($*_SCRIPT_DIRS)" \
|
||||||
|
@ -266,7 +266,7 @@ ALL_TEST_GUI_LIBS := \
|
||||||
|
|
||||||
%.checkapp : FORCE
|
%.checkapp : FORCE
|
||||||
@echo Checking $*...
|
@echo Checking $*...
|
||||||
$(MAKE) --no-print-directory internal-check-APP \
|
@$(MAKE) --no-print-directory internal-check-APP \
|
||||||
TEST_APP_NAME=$* \
|
TEST_APP_NAME=$* \
|
||||||
ADDITIONAL_LD_LIB_DIRS="$($*_LD_LIB_DIRS)" \
|
ADDITIONAL_LD_LIB_DIRS="$($*_LD_LIB_DIRS)" \
|
||||||
CHECK_SCRIPT_DIRS="$($*_SCRIPT_DIRS)" \
|
CHECK_SCRIPT_DIRS="$($*_SCRIPT_DIRS)" \
|
||||||
|
|
Loading…
Reference in a new issue