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

Introduced new variable GNUSTEP_IS_FLATTENED to switch the default flattened status from no to yes

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@23718 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2006-10-02 15:54:56 +00:00
parent e7c0f84dac
commit 1db9347273
22 changed files with 111 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
ChangeLog
View file

@ -1,3 +1,39 @@
2006-10-02 Nicola Pero <nicola.pero@meta-innovation.com>
All checks for GNUSTEP_FLATTENED should be updated to check the
new variable GNUSTEP_IS_FLATTENED instead, and to compare it
explicitly to 'yes' and 'no', and assume that '' means 'yes'.
* configure.ac: New variable GNUSTEP_IS_FLATTENED that is 'yes'
when flattened, and 'no' when not.
* configure: Regenerated.
* config-noarch.make.in: Added GNUSTEP_IS_FLATTENED.
* GNUmakefile.in: Same change.
* GNUstep-reset.sh: Same change.
* GNUstep.csh.in: Same change.
* GNUstep.sh.in: Same change.
* config.site: Updated checks for GNUSTEP_FLATTENED to
check GNUSTEP_IS_FLATTENED instead.
* common.make: Same change.
* debugapp.in: Same change.
* GNUmakefile.in: Same change.
* GNUstep.csh.in: Same change.
* GNUstep.sh.in: Same change.
* ld_lib_path.csh: Same change.
* ld_lib_path.sh: Same change.
* openapp.in: Same change.
* opentool.in: Same change.
* rules.make: Same change.
* Master/application.make: Same change.
* Master/gswapp.make: Same change.
* Master/palette.make: Same change.
* Master/service.make: Same change.
* Master/test-application.make: Same change.
* Instance/application.make: Same change.
2006-10-01 Adam Fedor <fedor@gnu.org>
* config.guess, config.sub: Update to latest version.

5
GNUmakefile.in
View file

@ -49,14 +49,17 @@ makedir = $(DESTDIR)@GNUSTEP_MAKEFILES@
srcdir = @srcdir@
VPATH = @srcdir@
# GNUSTEP_FLATTENED is obsolete, please use GNUSTEP_IS_FLATTENED
# instead
GNUSTEP_FLATTENED = @GNUSTEP_FLATTENED@
GNUSTEP_IS_FLATTENED = @GNUSTEP_IS_FLATTENED@
GNUSTEP_TARGET_CPU = @clean_target_cpu@
GNUSTEP_TARGET_VENDOR = @clean_target_vendor@
GNUSTEP_TARGET_OS = @clean_target_os@
GNUSTEP_LIB_COMBO = @ac_cv_library_combo@
ifeq ($(GNUSTEP_FLATTENED),)
ifeq ($(GNUSTEP_IS_FLATTENED), no)
GNUSTEP_TARGET_DIR = $(GNUSTEP_TARGET_CPU)/$(GNUSTEP_TARGET_OS)
GNUSTEP_TARGET_LDIR = $(GNUSTEP_TARGET_DIR)/$(GNUSTEP_LIB_COMBO)
MAYBE_LIBRARY_COMBO = $(GNUSTEP_LIB_COMBO)

1
GNUstep-reset.sh
View file

@ -102,6 +102,7 @@ unset GNUSTEP_NETWORK_ROOT
unset GNUSTEP_LOCAL_ROOT
unset GNUSTEP_MAKEFILES
unset GNUSTEP_FLATTENED
unset GNUSTEP_IS_FLATTENED
unset GNUSTEP_SYSTEM_ROOT
unset GNUSTEP_ROOT
unset LIBRARY_COMBO

5
GNUstep.csh.in
View file

@ -107,7 +107,10 @@ if ( ! ${?GNUSTEP_NETWORK_ROOT} ) then
endif
# GNUSTEP_FLATTENED is obsolete, please use GNUSTEP_IS_FLATTENED
# instead
setenv GNUSTEP_FLATTENED "@GNUSTEP_FLATTENED@"
setenv GNUSTEP_IS_FLATTENED "@GNUSTEP_IS_FLATTENED@"
if ( ! ${?LIBRARY_COMBO} ) then
setenv LIBRARY_COMBO "@ac_cv_library_combo@"
endif
@ -178,7 +181,7 @@ endif
set temp_path = ""
foreach dir ( `/bin/sh -c 'IFS=:; for i in ${GNUSTEP_PATHLIST}; do echo $i; done'` )
set temp_path="${temp_path}${dir}/Tools:"
if ( "${GNUSTEP_FLATTENED}" == "" ) then
if ( "${GNUSTEP_IS_FLATTENED}" == "no" ) then
set temp_path="${temp_path}${dir}/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/${LIBRARY_COMBO}:"
set temp_path="${temp_path}${dir}/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}:"
endif

7
GNUstep.sh.in
View file

@ -125,11 +125,14 @@ fi
export GNUSTEP_SYSTEM_ROOT GNUSTEP_LOCAL_ROOT GNUSTEP_NETWORK_ROOT
# GNUSTEP_FLATTENED is obsolete, please use GNUSTEP_IS_FLATTENED
# instead
GNUSTEP_FLATTENED=@GNUSTEP_FLATTENED@
GNUSTEP_IS_FLATTENED=@GNUSTEP_IS_FLATTENED@
if [ -z "$LIBRARY_COMBO" ]; then
LIBRARY_COMBO=@ac_cv_library_combo@
fi
export GNUSTEP_FLATTENED LIBRARY_COMBO
export GNUSTEP_IS_FLATTENED GNUSTEP_FLATTENED LIBRARY_COMBO
if [ -z "$GNUSTEP_MAKEFILES" ]; then
GNUSTEP_MAKEFILES=$GNUSTEP_SYSTEM_ROOT/Library/Makefiles
@ -265,7 +268,7 @@ temp_path=
for dir in $GNUSTEP_PATHLIST; do
# Prepare the path_fragment
if [ -z "$GNUSTEP_FLATTENED" ]; then
if [ "$GNUSTEP_IS_FLATTENED" = "no" ]; then
path_fragment="$dir/Tools:$dir/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/${LIBRARY_COMBO}:$dir/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}"
else
path_fragment="$dir/Tools"

2
Instance/application.make
View file

@ -147,7 +147,7 @@ internal-app-all_:: $(GNUSTEP_OBJ_DIR) \
$(APP_DIR)/$(GNUSTEP_TARGET_LDIR):
$(ECHO_CREATING)$(MKDIRS) $@$(END_ECHO)
ifeq ($(GNUSTEP_FLATTENED),)
ifeq ($(GNUSTEP_IS_FLATTENED), no)
internal-application-build-template: $(APP_DIR)/$(GNUSTEP_INSTANCE)
$(APP_DIR)/$(GNUSTEP_INSTANCE):

4
Master/application.make
View file

@ -42,7 +42,7 @@ _PSWRAP_H_FILES = $(foreach app,$(APP_NAME),$($(app)_PSWRAP_FILES:.psw=.h))
_PLIST_INFO_FILES = $(addsuffix Info.plist,$(foreach app,$(APP_NAME),$(patsubst yes,$(app),$($(app)_PREPROCESS_INFO_PLIST))))
internal-clean::
ifeq ($(GNUSTEP_FLATTENED),)
ifeq ($(GNUSTEP_IS_FLATTENED), no)
(cd $(GNUSTEP_BUILD_DIR); \
rm -rf $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES) $(_PLIST_INFO_FILES) *.$(APP_EXTENSION)/$(GNUSTEP_TARGET_LDIR))
else
@ -51,7 +51,7 @@ else
endif
internal-distclean::
ifeq ($(GNUSTEP_FLATTENED),)
ifeq ($(GNUSTEP_IS_FLATTENED), no)
(cd $(GNUSTEP_BUILD_DIR); rm -rf *.$(APP_EXTENSION))
endif

4
Master/gswapp.make
View file

@ -38,7 +38,7 @@ internal-install:: $(GSWAPP_NAME:=.install.gswapp.variables)
internal-uninstall:: $(GSWAPP_NAME:=.uninstall.gswapp.variables)
internal-clean::
ifeq ($(GNUSTEP_FLATTENED),)
ifeq ($(GNUSTEP_IS_FLATTENED), no)
(cd $(GNUSTEP_BUILD_DIR); \
rm -rf *.$(GSWAPP_EXTENSION)/$(GNUSTEP_TARGET_LDIR))
else
@ -47,7 +47,7 @@ else
endif
internal-distclean::
ifeq ($(GNUSTEP_FLATTENED),)
ifeq ($(GNUSTEP_IS_FLATTENED), no)
(cd $(GNUSTEP_BUILD_DIR); \
rm -rf *.$(GSWAPP_EXTENSION))
endif

4
Master/palette.make
View file

@ -38,7 +38,7 @@ _PSWRAP_C_FILES = $(foreach palette,$(PALETTE_NAME),$($(palette)_PSWRAP_FILES:.p
_PSWRAP_H_FILES = $(foreach palette,$(PALETTE_NAME),$($(palette)_PSWRAP_FILES:.psw=.h))
internal-clean::
ifeq ($(GNUSTEP_FLATTENED),)
ifeq ($(GNUSTEP_IS_FLATTENED), no)
(cd $(GNUSTEP_BUILD_DIR); \
rm -rf $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES) *.palette/$(GNUSTEP_TARGET_LDIR))
else
@ -47,7 +47,7 @@ else
endif
internal-distclean::
ifeq ($(GNUSTEP_FLATTENED),)
ifeq ($(GNUSTEP_IS_FLATTENED), no)
(cd $(GNUSTEP_BUILD_DIR); rm -rf *.palette)
endif

4
Master/service.make
View file

@ -37,7 +37,7 @@ _PSWRAP_C_FILES = $(foreach service,$(SERVICE_NAME),$($(service)_PSWRAP_FILES:.p
_PSWRAP_H_FILES = $(foreach service,$(SERVICE_NAME),$($(service)_PSWRAP_FILES:.psw=.h))
internal-clean::
ifeq ($(GNUSTEP_FLATTENED),)
ifeq ($(GNUSTEP_IS_FLATTENED), no)
(cd $(GNUSTEP_BUILD_DIR); \
rm -rf $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES) *.service/$(GNUSTEP_TARGET_LDIR))
else
@ -46,7 +46,7 @@ else
endif
internal-distclean::
ifeq ($(GNUSTEP_FLATTENED),)
ifeq ($(GNUSTEP_IS_FLATTENED), no)
(cd $(GNUSTEP_BUILD_DIR); rm -rf *.service)
endif

4
Master/test-application.make
View file

@ -33,7 +33,7 @@ _PSWRAP_C_FILES = $(foreach app,$(TEST_APP_NAME),$($(app)_PSWRAP_FILES:.psw=.c))
_PSWRAP_H_FILES = $(foreach app,$(TEST_APP_NAME),$($(app)_PSWRAP_FILES:.psw=.h))
internal-clean::
ifeq ($(GNUSTEP_FLATTENED),)
ifeq ($(GNUSTEP_IS_FLATTENED), no)
(cd $(GNUSTEP_BUILD_DIR); \
rm -rf $(_PSWRAP_C_FILES) $(_PSWRAP_H_FILES) *.$(APP_EXTENSION)/$(GNUSTEP_TARGET_LDIR))
else
@ -42,7 +42,7 @@ else
endif
internal-distclean::
ifeq ($(GNUSTEP_FLATTENED),)
ifeq ($(GNUSTEP_IS_FLATTENED), no)
(cd $(GNUSTEP_BUILD_DIR); rm -rf *.$(APP_EXTENSION))
endif

12
common.make
View file

@ -28,7 +28,7 @@ SHELL = /bin/sh
#
# Get the global config information. This includes
# GNUSTEP_SYSTEM_ROOT, GNUSTEP_MAKE_VERSION, GNUSTEP_FLATTENED,
# GNUSTEP_SYSTEM_ROOT, GNUSTEP_MAKE_VERSION, GNUSTEP_IS_FLATTENED,
# default_library_combo, and, if multi-platform support is disabled,
# it will also load GNUSTEP_HOST, GNUSTEP_HOST_CPU, etc.
#
@ -54,7 +54,7 @@ REL_PATH_SCRIPT = $(GNUSTEP_MAKEFILES)/relative_path.sh
#
include $(GNUSTEP_MAKEFILES)/names.make
ifeq ($(GNUSTEP_FLATTENED),)
ifeq ($(GNUSTEP_IS_FLATTENED), no)
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)
@ -173,7 +173,7 @@ GNUSTEP_APPS = $(GNUSTEP_INSTALLATION_DIR)/Applications
GNUSTEP_TOOLS = $(GNUSTEP_INSTALLATION_DIR)/Tools
GNUSTEP_LIBRARY = $(GNUSTEP_INSTALLATION_DIR)/Library
GNUSTEP_SERVICES = $(GNUSTEP_LIBRARY)/Services
ifeq ($(GNUSTEP_FLATTENED),yes)
ifeq ($(GNUSTEP_IS_FLATTENED),yes)
GNUSTEP_HEADERS = $(GNUSTEP_INSTALLATION_DIR)/Library/Headers
else
GNUSTEP_HEADERS = $(GNUSTEP_INSTALLATION_DIR)/Library/Headers/$(LIBRARY_COMBO)
@ -197,7 +197,7 @@ endif
# Now prepare the library and header flags - we first prepare the list
# of directories (trying to avoid duplicates in the list), then
# optionally remove the empty ones, then prepend -I / -L to them.
ifeq ($(GNUSTEP_FLATTENED),)
ifeq ($(GNUSTEP_IS_FLATTENED), no)
# The following variables have to be evaluated after setting dir to
# something, such as GNUSTEP_USER_ROOT. When you evaluate them in
@ -335,7 +335,7 @@ endif
# GNUSTEP_TARGET_DIR, maybe we should key all of our headers in a
# GNUSTEP_TARGET_LDIR directory (rather than just a LIBRARY_COMBO
# directory). But does it really matter in practice anyway ?
ifeq ($(GNUSTEP_FLATTENED),yes)
ifeq ($(GNUSTEP_IS_FLATTENED),yes)
GNUSTEP_HEADERS_FND_DIRS = \
$(GNUSTEP_USER_ROOT)/Library/Headers/libFoundation \
$(GNUSTEP_LOCAL_ROOT)/Library/Headers/libFoundation \
@ -483,7 +483,7 @@ else
$(shell echo $(CLEANED_ARCH) | sed -e 's/ /_/g')/$(GNUSTEP_TARGET_OS)
endif
ifeq ($(GNUSTEP_FLATTENED),)
ifeq ($(GNUSTEP_IS_FLATTENED), no)
GNUSTEP_OBJ_DIR_NAME = obj/$(ARCH_OBJ_DIR)/$(LIBRARY_COMBO)
else
GNUSTEP_OBJ_DIR_NAME = obj

5
config-noarch.make.in
View file

@ -7,7 +7,7 @@
# being used at the same time!).
#
# In practice, this file should containg global gnustep-make options
# (like GNUSTEP_FLATTENED or GNUSTEP_SYSTEM_ROOT), as opposed to
# (like GNUSTEP_IS_FLATTENED or GNUSTEP_SYSTEM_ROOT), as opposed to
# config info needed to build or compile or do things on a certain
# platform (like CC or OPTFLAG), which should go into config.make
#
@ -88,7 +88,10 @@ ifneq ($(GNUSTEP_USER_CONFIG_FILE),)
endif
# GNUSTEP_FLATTENED is obsolete, please use GNUSTEP_IS_FLATTENED
# instead
GNUSTEP_FLATTENED = @GNUSTEP_FLATTENED@
GNUSTEP_IS_FLATTENED = @GNUSTEP_IS_FLATTENED@
#
# Set GNUSTEP_USER_ROOT from GNUSTEP_USER_DIR; GNUSTEP_USER_ROOT is

8
config.site
View file

@ -50,7 +50,7 @@ fi
# Change the binary directory default
if test "$bindir" = "\${exec_prefix}/bin" ; then
if [ -z "$GNUSTEP_FLATTENED" ]; then
if [ "$GNUSTEP_IS_FLATTENED" = "no" ]; then
bindir="\${exec_prefix}/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}"
else
bindir="\${exec_prefix}/Tools"
@ -58,7 +58,7 @@ if test "$bindir" = "\${exec_prefix}/bin" ; then
bindirtop="\${exec_prefix}/Tools"
fi
if test "$DIR_BIN" = "/usr/local/bin" ; then
if [ -z "$GNUSTEP_FLATTENED" ]; then
if [ "$GNUSTEP_IS_FLATTENED" = "no" ]; then
DIR_BIN="\${prefix}/Tools/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}"
else
DIR_BIN="\${exec_prefix}/Tools"
@ -80,7 +80,7 @@ fi
# Change the library directory default
if test "$libdir" = "\${exec_prefix}/lib" ; then
if [ -z "$GNUSTEP_FLATTENED" ]; then
if [ "$GNUSTEP_IS_FLATTENED" = "no" ]; then
libdir="\${exec_prefix}/Library/Libraries/${GNUSTEP_TARGET_CPU}/${GNUSTEP_TARGET_OS}"
else
libdir="\${exec_prefix}/Library/Libraries"
@ -89,7 +89,7 @@ fi
# Change the include directory default
if test "$includedir" = "\${prefix}/include" ; then
if [ -z "$GNUSTEP_FLATTENED" ]; then
if [ "$GNUSTEP_IS_FLATTENED" = "no" ]; then
includedir="\${prefix}/Library/Headers/${LIBRARY_COMBO}"
else
includedir="\${prefix}/Library/Headers"

14
configure vendored
View file

@ -277,7 +277,7 @@ ac_default_prefix=`if test -d C: ; then
else
echo /usr/GNUstep ;
fi`
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os ac_cv_library_combo cc_cppprecomp cc_bundle CYGWIN RANLIB AR DLLTOOL ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S TAR CHOWN GNUSTEP_CONFIG_FILE GNUSTEP_SYSTEM_ROOT GNUSTEP_LOCAL_ROOT GNUSTEP_NETWORK_ROOT GNUSTEP_USER_CONFIG_FILE GNUSTEP_USER_DIR GNUSTEP_USER_DEFAULTS_DIR GNUSTEP_MAKEFILES HOST_INSTALL GNUSTEP_FLATTENED GNUSTEP_MULTI_PLATFORM BACKEND_BUNDLE objc_threaded ac_cv_objc_threaded USE_OBJC_EXCEPTIONS AUTO_DEPENDENCIES INCLUDES LIB_DIR OBJCFLAGS GNUSTEP_STRIP_MAKEFILES GNUSTEP_MAKE_VERSION GNUSTEP_MAKE_MAJOR_VERSION GNUSTEP_MAKE_MINOR_VERSION GNUSTEP_MAKE_SUBMINOR_VERSION clean_target_os clean_target_cpu clean_target_vendor LIBOBJS LTLIBOBJS'
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os ac_cv_library_combo cc_cppprecomp cc_bundle CYGWIN RANLIB AR DLLTOOL ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S TAR CHOWN GNUSTEP_CONFIG_FILE GNUSTEP_SYSTEM_ROOT GNUSTEP_LOCAL_ROOT GNUSTEP_NETWORK_ROOT GNUSTEP_USER_CONFIG_FILE GNUSTEP_USER_DIR GNUSTEP_USER_DEFAULTS_DIR GNUSTEP_MAKEFILES HOST_INSTALL GNUSTEP_FLATTENED GNUSTEP_IS_FLATTENED GNUSTEP_MULTI_PLATFORM BACKEND_BUNDLE objc_threaded ac_cv_objc_threaded USE_OBJC_EXCEPTIONS AUTO_DEPENDENCIES INCLUDES LIB_DIR OBJCFLAGS GNUSTEP_STRIP_MAKEFILES GNUSTEP_MAKE_VERSION GNUSTEP_MAKE_MAJOR_VERSION GNUSTEP_MAKE_MINOR_VERSION GNUSTEP_MAKE_SUBMINOR_VERSION clean_target_os clean_target_cpu clean_target_vendor LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@ -3658,13 +3658,22 @@ else
fi;
if test "$ac_cv_flattened" = "no"; then
# GNUSTEP_FLATTENED is here for backwards compatibility only and
# should be removed at some point. It has the problem that it
# defaults to 'no' while we want the default to be 'yes'!
# The new GNUSTEP_IS_FLATTENED variable defaults to 'yes'. :-)
GNUSTEP_FLATTENED=;
GNUSTEP_IS_FLATTENED=no;
else
GNUSTEP_FLATTENED=yes;
GNUSTEP_IS_FLATTENED=yes;
fi
if test "$GNUSTEP_FLATTENED" = "yes"; then
if test "$GNUSTEP_IS_FLATTENED" = "yes"; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6;
else
@ -5102,6 +5111,7 @@ s,@GNUSTEP_USER_DEFAULTS_DIR@,$GNUSTEP_USER_DEFAULTS_DIR,;t t
s,@GNUSTEP_MAKEFILES@,$GNUSTEP_MAKEFILES,;t t
s,@HOST_INSTALL@,$HOST_INSTALL,;t t
s,@GNUSTEP_FLATTENED@,$GNUSTEP_FLATTENED,;t t
s,@GNUSTEP_IS_FLATTENED@,$GNUSTEP_IS_FLATTENED,;t t
s,@GNUSTEP_MULTI_PLATFORM@,$GNUSTEP_MULTI_PLATFORM,;t t
s,@BACKEND_BUNDLE@,$BACKEND_BUNDLE,;t t
s,@objc_threaded@,$objc_threaded,;t t

11
configure.ac
View file

@ -583,13 +583,22 @@ AC_ARG_ENABLE(flattened, [
ac_cv_flattened="undefined")
if test "$ac_cv_flattened" = "no"; then
# GNUSTEP_FLATTENED is here for backwards compatibility only and
# should be removed at some point. It has the problem that it
# defaults to 'no' while we want the default to be 'yes'!
# The new GNUSTEP_IS_FLATTENED variable defaults to 'yes'. :-)
GNUSTEP_FLATTENED=;
GNUSTEP_IS_FLATTENED=no;
else
GNUSTEP_FLATTENED=yes;
GNUSTEP_IS_FLATTENED=yes;
fi
AC_SUBST(GNUSTEP_FLATTENED)
AC_SUBST(GNUSTEP_IS_FLATTENED)
if test "$GNUSTEP_FLATTENED" = "yes"; then
if test "$GNUSTEP_IS_FLATTENED" = "yes"; then
AC_MSG_RESULT(yes);
else
AC_MSG_RESULT(no);

8
debugapp.in
View file

@ -145,7 +145,7 @@ if [ -z "$GNUSTEP_MAKEFILES" ]; then
GNUSTEP_MAKEFILES = $GNUSTEP_SYSTEM_ROOT/Library/Makefiles
fi
if [ -z "$GNUSTEP_FLATTENED" ]; then
if [ "$GNUSTEP_IS_FLATTENED" = "no" ]; then
#
# Determine the host information
#
@ -201,17 +201,17 @@ if [ "$LIBRARY_COMBO" = "apple-apple-apple" ]; then
else
# Determine if the application has a binary for this operating system
if [ -z "$GNUSTEP_FLATTENED" -a ! -d "$full_appname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS" ]; then
if [ "$GNUSTEP_IS_FLATTENED" = "no" -a ! -d "$full_appname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS" ]; then
echo "$full_appname application does not have a binary for this kind of machine and operating system."
exit 1
fi
if [ -z "$GNUSTEP_FLATTENED" -a ! -d "$full_appname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO" ]; then
if [ "$GNUSTEP_IS_FLATTENED" = "no" -a ! -d "$full_appname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO" ]; then
echo "$full_appname application does not have a binary for this combination of libraries: $LIBRARY_COMBO."
exit 1
fi
if [ -z "$GNUSTEP_FLATTENED" ]; then
if [ "$GNUSTEP_IS_FLATTENED" = "no" ]; then
file_appname="$full_appname/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO/$appname"
else
file_appname="$full_appname/$appname"

2
ld_lib_path.csh
View file

@ -25,7 +25,7 @@
# The first (and only) parameter to this script is the canonical
# operating system name.
if ( "$GNUSTEP_FLATTENED" == "" ) then
if ( "$GNUSTEP_IS_FLATTENED" == "no" ) then
set last_path_part="Library/Libraries/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}/${LIBRARY_COMBO}"
set tool_path_part="Library/Libraries/${GNUSTEP_HOST_CPU}/${GNUSTEP_HOST_OS}"
else

2
ld_lib_path.sh
View file

@ -44,7 +44,7 @@ fw_paths=
for dir in $GNUSTEP_PATHLIST; do
# prepare the path_fragment for libraries and this dir
if [ -z "$GNUSTEP_FLATTENED" ]; then
if [ "$GNUSTEP_IS_FLATTENED" = "no" ]; then
path_fragment="$dir/Library/Libraries/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS/$LIBRARY_COMBO:$dir/Library/Libraries/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS"
else
path_fragment="$dir/Library/Libraries"

6
openapp.in
View file

@ -39,8 +39,8 @@ fi
. $GNUSTEP_SYSTEM_ROOT/Library/Makefiles/GNUstep.sh
if [ -z "$GNUSTEP_FLATTENED" ]; then
GNUSTEP_FLATTENED=@GNUSTEP_FLATTENED@
if [ -z "$GNUSTEP_IS_FLATTENED" ]; then
GNUSTEP_IS_FLATTENED=@GNUSTEP_IS_FLATTENED@
fi
only_find=
@ -134,7 +134,7 @@ if [ -z "$appname" ]; then
fi
appname="`basename \"$appname\"`"
if [ -n "$GNUSTEP_FLATTENED" ]; then
if [ "$GNUSTEP_IS_FLATTENED" = "no" ]; then
if [ -z "$EXEEXT" ]; then
EXEEXT=@EXEEXT@

5
opentool.in
View file

@ -20,6 +20,9 @@
# If not, write to the Free Software Foundation,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# 'opentool' is obsolete. You can invoke your tools directly, just
# put them in your PATH :-)
# Try to execute the GNUstep tool passed as argument. The tool is
# searched through the GNUstep directories if a complete or relative path name
# is not specified. The arguments passed after the tool name are passed
@ -126,7 +129,7 @@ case "$tool" in
#
for dir in "$GNUSTEP_USER_ROOT" "$GNUSTEP_LOCAL_ROOT" "$GNUSTEP_NETWORK_ROOT" "$GNUSTEP_SYSTEM_ROOT" ; do
tmpdir="$dir/Tools"
if [ -z "$GNUSTEP_FLATTENED" ]; then
if [ "$GNUSTEP_IS_FLATTENED" = "no" ]; then
tmpgnudir="$dir/Tools/$GNUSTEP_HOST_CPU/$GNUSTEP_HOST_OS"
tmplibdir="$tmpgnudir/$LIBRARY_COMBO"
# echo "$tmplibdir/$tool";

2
rules.make
View file

@ -542,7 +542,7 @@ endif
$(GNUSTEP_MAKEFILES)/*.make: ;
ifeq ($(GNUSTEP_FLATTENED),)
ifeq ($(GNUSTEP_IS_FLATTENED), no)
# If this file can't be found, we can't load the config for that
# library combo / target, so we can't do anything. We print an
# error and exit.