mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-23 22:33:28 +00:00
Put headers in a library-combo keyed directory if library combos are used
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@17388 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero
parent
9abaa2ed17
commit
ecdde45764
7 changed files with 71 additions and 18 deletions
15
ChangeLog
15
ChangeLog
|
|
@ -1,3 +1,18 @@
|
|||
Tue Jul 29 12:06:02 2003 Nicola Pero <n.pero@mi.flashnet.it>
|
||||
|
||||
* configure.ac: If flattened, add library combo to headers
|
||||
directory.
|
||||
* configure: Regenerated.
|
||||
* config.site (includedir): If flattened, add library combo.
|
||||
* GNUmakefile.in (MAYBE_LIBRARY_COMBO): Define.
|
||||
Export GNUSTEP_TARGET_DIR, GNUSTEP_TARGET_LDIR and
|
||||
MAYBE_LIBRARY_COMBO.
|
||||
* create_domain_dir_tree.sh: Use MAYBE_LIBRARY_COMBO when creating
|
||||
the headers dir.
|
||||
* common.make (GNUSTEP_HEADERS): Define using library combo if
|
||||
not flattened.
|
||||
(GNUSTEP_HEADERS_DIRS): Use library combo if not flattened.
|
||||
|
||||
Mon Jul 28 11:49:18 2003 Pete French <pete@twisted.org.uk>
|
||||
|
||||
* Instance/application.make (MAIN_MARKUP_FILE): New variable.
|
||||
|
|
|
|||
|
|
@ -49,11 +49,17 @@ 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)
|
||||
MAYBE_LIBRARY_COMBO = $(GNUSTEP_LIB_COMBO)
|
||||
else
|
||||
GNUSTEP_TARGET_DIR = .
|
||||
GNUSTEP_TARGET_LDIR = .
|
||||
MAYBE_LIBRARY_COMBO = .
|
||||
endif
|
||||
|
||||
export GNUSTEP_TARGET_DIR
|
||||
export GNUSTEP_TARGET_LDIR
|
||||
export MAYBE_LIBRARY_COMBO
|
||||
|
||||
makedir = $(GNUSTEP_SYSTEM_ROOT)/@MAKEFILES_SUFFIX@
|
||||
tooldir = $(GNUSTEP_SYSTEM_ROOT)/Tools
|
||||
|
||||
|
|
|
|||
43
common.make
43
common.make
|
|
@ -188,7 +188,11 @@ GNUSTEP_APPS = $(GNUSTEP_INSTALLATION_DIR)/Applications
|
|||
GNUSTEP_TOOLS = $(GNUSTEP_INSTALLATION_DIR)/Tools
|
||||
GNUSTEP_LIBRARY = $(GNUSTEP_INSTALLATION_DIR)/Library
|
||||
GNUSTEP_SERVICES = $(GNUSTEP_INSTALLATION_DIR)/Library/Services
|
||||
GNUSTEP_HEADERS = $(GNUSTEP_INSTALLATION_DIR)/Library/Headers
|
||||
ifeq ($(GNUSTEP_FLATTENED),yes)
|
||||
GNUSTEP_HEADERS = $(GNUSTEP_INSTALLATION_DIR)/Library/Headers
|
||||
else
|
||||
GNUSTEP_HEADERS = $(GNUSTEP_INSTALLATION_DIR)/Library/Headers/$(LIBRARY_COMBO)
|
||||
endif
|
||||
GNUSTEP_BUNDLES = $(GNUSTEP_INSTALLATION_DIR)/Library/Bundles
|
||||
GNUSTEP_FRAMEWORKS = $(GNUSTEP_INSTALLATION_DIR)/Library/Frameworks
|
||||
GNUSTEP_PALETTES = $(GNUSTEP_LIBRARY)/ApplicationSupport/Palettes
|
||||
|
|
@ -210,14 +214,14 @@ endif
|
|||
ifeq ($(GNUSTEP_FLATTENED),)
|
||||
|
||||
GNUSTEP_HEADERS_DIRS = \
|
||||
$(GNUSTEP_USER_ROOT)/Library/Headers/$(GNUSTEP_TARGET_DIR) \
|
||||
$(GNUSTEP_USER_ROOT)/Library/Headers \
|
||||
$(GNUSTEP_LOCAL_ROOT)/Library/Headers/$(GNUSTEP_TARGET_DIR) \
|
||||
$(GNUSTEP_LOCAL_ROOT)/Library/Headers \
|
||||
$(GNUSTEP_NETWORK_ROOT)/Library/Headers/$(GNUSTEP_TARGET_DIR) \
|
||||
$(GNUSTEP_NETWORK_ROOT)/Library/Headers \
|
||||
$(GNUSTEP_SYSTEM_ROOT)/Library/Headers/$(GNUSTEP_TARGET_DIR) \
|
||||
$(GNUSTEP_SYSTEM_ROOT)/Library/Headers
|
||||
$(GNUSTEP_USER_ROOT)/Library/Headers/$(LIBRARY_COMBO)/$(GNUSTEP_TARGET_DIR) \
|
||||
$(GNUSTEP_USER_ROOT)/Library/Headers/$(LIBRARY_COMBO) \
|
||||
$(GNUSTEP_LOCAL_ROOT)/Library/Headers/$(LIBRARY_COMBO)/$(GNUSTEP_TARGET_DIR)\
|
||||
$(GNUSTEP_LOCAL_ROOT)/Library/Headers/$(LIBRARY_COMBO) \
|
||||
$(GNUSTEP_NETWORK_ROOT)/Library/Headers/$(LIBRARY_COMBO)/$(GNUSTEP_TARGET_DIR)\
|
||||
$(GNUSTEP_NETWORK_ROOT)/Library/Headers/$(LIBRARY_COMBO) \
|
||||
$(GNUSTEP_SYSTEM_ROOT)/Library/Headers/$(LIBRARY_COMBO)/$(GNUSTEP_TARGET_DIR)\
|
||||
$(GNUSTEP_SYSTEM_ROOT)/Library/Headers/$(LIBRARY_COMBO)
|
||||
|
||||
GNUSTEP_LIBRARIES_DIRS = \
|
||||
$(GNUSTEP_USER_ROOT)/Library/Libraries/$(GNUSTEP_TARGET_LDIR) \
|
||||
|
|
@ -281,17 +285,31 @@ endif
|
|||
#
|
||||
# Determine Foundation header subdirectory based upon library combo
|
||||
#
|
||||
# TODO: remove those as now all headers are in a LIBRARY_COMBO
|
||||
# directory if the system is not flattened; and if the system is
|
||||
# flattened, support for multiple foundation libs is simply not built
|
||||
# in.
|
||||
ifeq ($(GNUSTEP_FLATTENED),yes)
|
||||
GNUSTEP_HEADERS_FND_DIRS = \
|
||||
$(GNUSTEP_USER_ROOT)/Library/Headers/$(GNUSTEP_FND_DIR) \
|
||||
$(GNUSTEP_LOCAL_ROOT)/Library/Headers/$(GNUSTEP_FND_DIR) \
|
||||
$(GNUSTEP_NETWORK_ROOT)/Library/Headers/$(GNUSTEP_FND_DIR) \
|
||||
$(GNUSTEP_SYSTEM_ROOT)/Library/Headers/$(GNUSTEP_FND_DIR)
|
||||
else
|
||||
GNUSTEP_HEADERS_FND_DIRS = \
|
||||
$(GNUSTEP_USER_ROOT)/Library/Headers/$(LIBRARY_COMBO)/$(GNUSTEP_FND_DIR) \
|
||||
$(GNUSTEP_LOCAL_ROOT)/Library/Headers/$(LIBRARY_COMBO)/$(GNUSTEP_FND_DIR) \
|
||||
$(GNUSTEP_NETWORK_ROOT)/Library/Headers/$(LIBRARY_COMBO)/$(GNUSTEP_FND_DIR) \
|
||||
$(GNUSTEP_SYSTEM_ROOT)/Library/Headers/$(LIBRARY_COMBO)/$(GNUSTEP_FND_DIR)
|
||||
endif
|
||||
|
||||
ifeq ($(FOUNDATION_LIB), fd)
|
||||
|
||||
# Map OBJC_RUNTIME_LIB values to OBJC_RUNTIME values as used by
|
||||
# libFoundation. TODO/FIXME: Drop all this stuff and have
|
||||
# libFoundation use OBJC_RUNTIME_LIB directly.
|
||||
|
||||
# TODO: Remove all this cruft. Standardize.
|
||||
ifeq ($(OBJC_RUNTIME_LIB), nx)
|
||||
OBJC_RUNTIME = NeXT
|
||||
endif
|
||||
|
|
@ -327,9 +345,10 @@ endif
|
|||
#
|
||||
# Overridable compilation flags
|
||||
#
|
||||
# FIXME: We use -fno-strict-aliasing to prevent annoying gcc3.3 compiler warnings.
|
||||
# But we really need to investigate why the warning appear in the first place,
|
||||
# if they are serious or not, and what can be done about it.
|
||||
# FIXME: We use -fno-strict-aliasing to prevent annoying gcc3.3
|
||||
# compiler warnings. But we really need to investigate why the
|
||||
# warning appear in the first place, if they are serious or not, and
|
||||
# what can be done about it.
|
||||
OBJCFLAGS = $(OBJC_NO_IMPORT_FLAGS) -fno-strict-aliasing
|
||||
CFLAGS =
|
||||
OBJ_DIR_PREFIX =
|
||||
|
|
|
|||
|
|
@ -89,7 +89,11 @@ fi
|
|||
|
||||
# Change the include directory default
|
||||
if test "$includedir" = "\${prefix}/include" ; then
|
||||
if [ -z "$GNUSTEP_FLATTENED" ]; then
|
||||
includedir="\${prefix}/Headers/${LIBRARY_COMBO}"
|
||||
else
|
||||
includedir="\${prefix}/Headers"
|
||||
fi
|
||||
fi
|
||||
|
||||
# xxx What about oldincludedir?
|
||||
|
|
|
|||
10
configure
vendored
10
configure
vendored
|
|
@ -2972,7 +2972,6 @@ else
|
|||
fi
|
||||
|
||||
|
||||
|
||||
if test "$GNUSTEP_FLATTENED" = "yes"; then
|
||||
echo "$as_me:$LINENO: result: yes" >&5
|
||||
echo "${ECHO_T}yes" >&6;
|
||||
|
|
@ -3047,14 +3046,15 @@ fi
|
|||
CFLAGS=`echo $CFLAGS | sed -e 's/-g //'`
|
||||
|
||||
# Set location of GNUstep dirs for later use
|
||||
GNUSTEP_HDIR="$prefix/Library/Headers"
|
||||
if test "$GNUSTEP_FLATTENED" = yes; then
|
||||
GNUSTEP_LDIR="$prefix/Library/Libraries"
|
||||
GNUSTEP_HDIR="$prefix/Library/Headers"
|
||||
else
|
||||
clean_target_os=`$srcdir/clean_os.sh $target_os`
|
||||
clean_target_cpu=`$srcdir/clean_cpu.sh $target_cpu`
|
||||
obj_dir="$clean_target_cpu/$clean_target_os"
|
||||
GNUSTEP_LDIR="$prefix/Library/Libraries/$obj_dir"
|
||||
GNUSTEP_HDIR="$prefix/Library/Headers/${ac_cv_library_combo}"
|
||||
fi
|
||||
|
||||
# Check to see if the libobjc library is in our GNUSTEP_SYSTEM_ROOT.
|
||||
|
|
@ -3085,7 +3085,11 @@ echo "${ECHO_T}$gs_cv_objc_libdir" >&6
|
|||
|
||||
# The following are needed to compile the test programs
|
||||
if test "$gs_cv_objc_libdir" = "$GNUSTEP_LDIR"; then
|
||||
OBJC_CPPFLAGS="$INCLUDE_FLAGS -I$prefix/Library/Headers"
|
||||
if test "$GNUSTEP_FLATTENED" = yes; then
|
||||
OBJC_CPPFLAGS="$INCLUDE_FLAGS -I$prefix/Library/Headers"
|
||||
else
|
||||
OBJC_CPPFLAGS="$INCLUDE_FLAGS -I$prefix/Library/Headers/${ac_cv_library_combo}"
|
||||
fi
|
||||
OBJC_LDFLAGS="$LDFLAGS -L$gs_cv_objc_libdir"
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -314,14 +314,15 @@ AC_SUBST(BACKEND_BUNDLE)
|
|||
CFLAGS=`echo $CFLAGS | sed -e 's/-g //'`
|
||||
|
||||
# Set location of GNUstep dirs for later use
|
||||
GNUSTEP_HDIR="$prefix/Library/Headers"
|
||||
if test "$GNUSTEP_FLATTENED" = yes; then
|
||||
GNUSTEP_LDIR="$prefix/Library/Libraries"
|
||||
GNUSTEP_HDIR="$prefix/Library/Headers"
|
||||
else
|
||||
clean_target_os=`$srcdir/clean_os.sh $target_os`
|
||||
clean_target_cpu=`$srcdir/clean_cpu.sh $target_cpu`
|
||||
obj_dir="$clean_target_cpu/$clean_target_os"
|
||||
GNUSTEP_LDIR="$prefix/Library/Libraries/$obj_dir"
|
||||
GNUSTEP_HDIR="$prefix/Library/Headers/${ac_cv_library_combo}"
|
||||
fi
|
||||
|
||||
# Check to see if the libobjc library is in our GNUSTEP_SYSTEM_ROOT.
|
||||
|
|
@ -347,7 +348,11 @@ AC_MSG_RESULT($gs_cv_objc_libdir)
|
|||
|
||||
# The following are needed to compile the test programs
|
||||
if test "$gs_cv_objc_libdir" = "$GNUSTEP_LDIR"; then
|
||||
OBJC_CPPFLAGS="$INCLUDE_FLAGS -I$prefix/Library/Headers"
|
||||
if test "$GNUSTEP_FLATTENED" = yes; then
|
||||
OBJC_CPPFLAGS="$INCLUDE_FLAGS -I$prefix/Library/Headers"
|
||||
else
|
||||
OBJC_CPPFLAGS="$INCLUDE_FLAGS -I$prefix/Library/Headers/${ac_cv_library_combo}"
|
||||
fi
|
||||
OBJC_LDFLAGS="$LDFLAGS -L$gs_cv_objc_libdir"
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ ${mydir}/mkinstalldirs "$basepath" \
|
|||
"$basepath"/Library/Documentation/man \
|
||||
"$basepath"/Library/Fonts \
|
||||
"$basepath"/Library/Frameworks \
|
||||
"$basepath"/Library/Headers/${GNUSTEP_TARGET_DIR} \
|
||||
"$basepath"/Library/Headers/${MAYBE_LIBRARY_COMBO}/${GNUSTEP_TARGET_DIR} \
|
||||
"$basepath"/Library/Images \
|
||||
"$basepath"/Library/KeyBindings \
|
||||
"$basepath"/Library/Libraries/${GNUSTEP_TARGET_LDIR} \
|
||||
|
|
|
|||
Loading…
Reference in a new issue