mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-23 22:33:28 +00:00
Do not store the library-combo implicitly in the config file as part of the GNUSTEP_xxx_HEADERS variable
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@24583 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero
parent
ee642277e4
commit
f60e16b1f2
4 changed files with 34 additions and 47 deletions
11
ChangeLog
11
ChangeLog
|
|
@ -1,3 +1,14 @@
|
|||
2007-02-15 Nicola Pero <nicola.pero@meta-innovation.com>
|
||||
|
||||
* configure.ac (GNUSTEP_SYSTEM_HEADERS, GNUSTEP_NETWORK_HEADERS,
|
||||
GNUSTEP_LOCAL_HEADERS, GNUSTEP_USER_HEADERS): Changed not to
|
||||
contain LIBRARY_COMBO for the non-flattened case. This will allow
|
||||
you to use the same configuration file across multiple
|
||||
library-combos. Updates to rest of the code for this change.
|
||||
* common.make (GNUSTEP_HEADERS): Updated to add LIBRARY_COMBO
|
||||
at this stage (if needed).
|
||||
* configure: Regenerated.
|
||||
|
||||
2007-02-15 Nicola Pero <nicola.pero@meta-innovation.com>
|
||||
|
||||
* executable.template.in (full_appname): Fixed typo.
|
||||
|
|
|
|||
|
|
@ -227,7 +227,11 @@ else
|
|||
GNUSTEP_TOOLS = $(MAYBE_DESTDIR)$(GNUSTEP_$(GNUSTEP_INSTALLATION_DOMAIN)_TOOLS)
|
||||
GNUSTEP_LIBRARY = $(MAYBE_DESTDIR)$(GNUSTEP_$(GNUSTEP_INSTALLATION_DOMAIN)_LIBRARY)
|
||||
GNUSTEP_SERVICES = $(MAYBE_DESTDIR)$(GNUSTEP_$(GNUSTEP_INSTALLATION_DOMAIN)_SERVICES)
|
||||
GNUSTEP_HEADERS = $(MAYBE_DESTDIR)$(GNUSTEP_$(GNUSTEP_INSTALLATION_DOMAIN)_HEADERS)
|
||||
ifeq ($(GNUSTEP_IS_FLATTENED),yes)
|
||||
GNUSTEP_HEADERS = $(MAYBE_DESTDIR)$(GNUSTEP_$(GNUSTEP_INSTALLATION_DOMAIN)_HEADERS)
|
||||
else
|
||||
GNUSTEP_HEADERS = $(MAYBE_DESTDIR)$(GNUSTEP_$(GNUSTEP_INSTALLATION_DOMAIN)_HEADERS)/$(LIBRARY_COMBO)
|
||||
endif
|
||||
GNUSTEP_APPLICATION_SUPPORT = $(MAYBE_DESTDIR)$(GNUSTEP_$(GNUSTEP_INSTALLATION_DOMAIN)_APPLICATION_SUPPORT)
|
||||
GNUSTEP_BUNDLES = $(MAYBE_DESTDIR)$(GNUSTEP_$(GNUSTEP_INSTALLATION_DOMAIN)_BUNDLES)
|
||||
GNUSTEP_FRAMEWORKS = $(MAYBE_DESTDIR)$(GNUSTEP_$(GNUSTEP_INSTALLATION_DOMAIN)_FRAMEWORKS)
|
||||
|
|
|
|||
32
configure
vendored
32
configure
vendored
|
|
@ -3704,11 +3704,7 @@ if test x"$GNUSTEP_SYSTEM_LIBRARY" = x""; then
|
|||
GNUSTEP_SYSTEM_LIBRARY="$GNUSTEP_SYSTEM_ROOT/Library"
|
||||
fi
|
||||
if test x"$GNUSTEP_SYSTEM_HEADERS" = x""; then
|
||||
if test "$GNUSTEP_IS_FLATTENED" = "yes"; then
|
||||
GNUSTEP_SYSTEM_HEADERS="$GNUSTEP_SYSTEM_ROOT/Library/Headers"
|
||||
else
|
||||
GNUSTEP_SYSTEM_HEADERS="$GNUSTEP_SYSTEM_ROOT/Library/Headers/$LIBRARY_COMBO"
|
||||
fi
|
||||
GNUSTEP_SYSTEM_HEADERS="$GNUSTEP_SYSTEM_ROOT/Library/Headers"
|
||||
fi
|
||||
if test x"$GNUSTEP_SYSTEM_LIBRARIES" = x""; then
|
||||
GNUSTEP_SYSTEM_LIBRARIES="$GNUSTEP_SYSTEM_LIBRARY/Libraries/"
|
||||
|
|
@ -3742,11 +3738,7 @@ if test x"$GNUSTEP_LOCAL_LIBRARY" = x""; then
|
|||
GNUSTEP_LOCAL_LIBRARY="$GNUSTEP_LOCAL_ROOT/Library"
|
||||
fi
|
||||
if test x"$GNUSTEP_LOCAL_HEADERS" = x""; then
|
||||
if test "$GNUSTEP_IS_FLATTENED" = "yes"; then
|
||||
GNUSTEP_LOCAL_HEADERS="$GNUSTEP_LOCAL_ROOT/Library/Headers"
|
||||
else
|
||||
GNUSTEP_LOCAL_HEADERS="$GNUSTEP_LOCAL_ROOT/Library/Headers/$LIBRARY_COMBO"
|
||||
fi
|
||||
GNUSTEP_LOCAL_HEADERS="$GNUSTEP_LOCAL_ROOT/Library/Headers"
|
||||
fi
|
||||
if test x"$GNUSTEP_LOCAL_LIBRARIES" = x""; then
|
||||
GNUSTEP_LOCAL_LIBRARIES="$GNUSTEP_LOCAL_LIBRARY/Libraries/"
|
||||
|
|
@ -3780,11 +3772,7 @@ if test x"$GNUSTEP_NETWORK_LIBRARY" = x""; then
|
|||
GNUSTEP_NETWORK_LIBRARY="$GNUSTEP_NETWORK_ROOT/Library"
|
||||
fi
|
||||
if test x"$GNUSTEP_NETWORK_HEADERS" = x""; then
|
||||
if test "$GNUSTEP_IS_FLATTENED" = "yes"; then
|
||||
GNUSTEP_NETWORK_HEADERS="$GNUSTEP_NETWORK_ROOT/Library/Headers"
|
||||
else
|
||||
GNUSTEP_NETWORK_HEADERS="$GNUSTEP_NETWORK_ROOT/Library/Headers/$LIBRARY_COMBO"
|
||||
fi
|
||||
GNUSTEP_NETWORK_HEADERS="$GNUSTEP_NETWORK_ROOT/Library/Headers"
|
||||
fi
|
||||
if test x"$GNUSTEP_NETWORK_LIBRARIES" = x""; then
|
||||
GNUSTEP_NETWORK_LIBRARIES="$GNUSTEP_NETWORK_LIBRARY/Libraries/"
|
||||
|
|
@ -3818,11 +3806,7 @@ if test x"$GNUSTEP_USER_DIR_LIBRARY" = x""; then
|
|||
GNUSTEP_USER_DIR_LIBRARY="$GNUSTEP_USER_DIR/Library"
|
||||
fi
|
||||
if test x"$GNUSTEP_USER_DIR_HEADERS" = x""; then
|
||||
if test "$GNUSTEP_IS_FLATTENED" = "yes"; then
|
||||
GNUSTEP_USER_DIR_HEADERS="$GNUSTEP_USER_DIR/Library/Headers"
|
||||
else
|
||||
GNUSTEP_USER_DIR_HEADERS="$GNUSTEP_USER_DIR/Library/Headers/$LIBRARY_COMBO"
|
||||
fi
|
||||
GNUSTEP_USER_DIR_HEADERS="$GNUSTEP_USER_DIR/Library/Headers"
|
||||
fi
|
||||
if test x"$GNUSTEP_USER_DIR_LIBRARIES" = x""; then
|
||||
GNUSTEP_USER_DIR_LIBRARIES="$GNUSTEP_USER_DIR_LIBRARY/Libraries/"
|
||||
|
|
@ -3909,18 +3893,20 @@ fi
|
|||
#--------------------------------------------------------------------
|
||||
|
||||
# Set location of System GNUstep dirs for later use
|
||||
GNUSTEP_HDIR="$GNUSTEP_SYSTEM_HEADERS"
|
||||
|
||||
|
||||
if test "$GNUSTEP_FLATTENED" = yes; then
|
||||
GNUSTEP_LDIR="$GNUSTEP_SYSTEM_LIBRARIES"
|
||||
GNUSTEP_HDIR="$GNUSTEP_SYSTEM_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="$GNUSTEP_SYSTEM_LIBRARIES/$obj_dir"
|
||||
GNUSTEP_HDIR="$GNUSTEP_SYSTEM_HEADERS/$LIBRARY_COMBO"
|
||||
fi
|
||||
|
||||
# Check to see if the libobjc library is in our GNUSTEP_SYSTEM_ROOT.
|
||||
# Check to see if the libobjc library is in our GNUSTEP_SYSTEM_LIBRARIES.
|
||||
# If so, there are probably other libraries that we want there also, so
|
||||
# leave the proper includes in CPPFLAGS and LDFLAGS
|
||||
echo "$as_me:$LINENO: checking for custom shared objc library" >&5
|
||||
|
|
@ -3948,7 +3934,7 @@ 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="$CPPFLAGS $INCLUDES -I$GNUSTEP_SYSTEM_HEADERS"
|
||||
OBJC_CPPFLAGS="$CPPFLAGS $INCLUDES -I$GNUSTEP_HDIR"
|
||||
OBJC_LDFLAGS="$LDFLAGS $LIB_DIR -L$gs_cv_objc_libdir"
|
||||
fi
|
||||
|
||||
|
|
|
|||
32
configure.ac
32
configure.ac
|
|
@ -627,11 +627,7 @@ if test x"$GNUSTEP_SYSTEM_LIBRARY" = x""; then
|
|||
GNUSTEP_SYSTEM_LIBRARY="$GNUSTEP_SYSTEM_ROOT/Library"
|
||||
fi
|
||||
if test x"$GNUSTEP_SYSTEM_HEADERS" = x""; then
|
||||
if test "$GNUSTEP_IS_FLATTENED" = "yes"; then
|
||||
GNUSTEP_SYSTEM_HEADERS="$GNUSTEP_SYSTEM_ROOT/Library/Headers"
|
||||
else
|
||||
GNUSTEP_SYSTEM_HEADERS="$GNUSTEP_SYSTEM_ROOT/Library/Headers/$LIBRARY_COMBO"
|
||||
fi
|
||||
GNUSTEP_SYSTEM_HEADERS="$GNUSTEP_SYSTEM_ROOT/Library/Headers"
|
||||
fi
|
||||
if test x"$GNUSTEP_SYSTEM_LIBRARIES" = x""; then
|
||||
GNUSTEP_SYSTEM_LIBRARIES="$GNUSTEP_SYSTEM_LIBRARY/Libraries/"
|
||||
|
|
@ -665,11 +661,7 @@ if test x"$GNUSTEP_LOCAL_LIBRARY" = x""; then
|
|||
GNUSTEP_LOCAL_LIBRARY="$GNUSTEP_LOCAL_ROOT/Library"
|
||||
fi
|
||||
if test x"$GNUSTEP_LOCAL_HEADERS" = x""; then
|
||||
if test "$GNUSTEP_IS_FLATTENED" = "yes"; then
|
||||
GNUSTEP_LOCAL_HEADERS="$GNUSTEP_LOCAL_ROOT/Library/Headers"
|
||||
else
|
||||
GNUSTEP_LOCAL_HEADERS="$GNUSTEP_LOCAL_ROOT/Library/Headers/$LIBRARY_COMBO"
|
||||
fi
|
||||
GNUSTEP_LOCAL_HEADERS="$GNUSTEP_LOCAL_ROOT/Library/Headers"
|
||||
fi
|
||||
if test x"$GNUSTEP_LOCAL_LIBRARIES" = x""; then
|
||||
GNUSTEP_LOCAL_LIBRARIES="$GNUSTEP_LOCAL_LIBRARY/Libraries/"
|
||||
|
|
@ -703,11 +695,7 @@ if test x"$GNUSTEP_NETWORK_LIBRARY" = x""; then
|
|||
GNUSTEP_NETWORK_LIBRARY="$GNUSTEP_NETWORK_ROOT/Library"
|
||||
fi
|
||||
if test x"$GNUSTEP_NETWORK_HEADERS" = x""; then
|
||||
if test "$GNUSTEP_IS_FLATTENED" = "yes"; then
|
||||
GNUSTEP_NETWORK_HEADERS="$GNUSTEP_NETWORK_ROOT/Library/Headers"
|
||||
else
|
||||
GNUSTEP_NETWORK_HEADERS="$GNUSTEP_NETWORK_ROOT/Library/Headers/$LIBRARY_COMBO"
|
||||
fi
|
||||
GNUSTEP_NETWORK_HEADERS="$GNUSTEP_NETWORK_ROOT/Library/Headers"
|
||||
fi
|
||||
if test x"$GNUSTEP_NETWORK_LIBRARIES" = x""; then
|
||||
GNUSTEP_NETWORK_LIBRARIES="$GNUSTEP_NETWORK_LIBRARY/Libraries/"
|
||||
|
|
@ -741,11 +729,7 @@ if test x"$GNUSTEP_USER_DIR_LIBRARY" = x""; then
|
|||
GNUSTEP_USER_DIR_LIBRARY="$GNUSTEP_USER_DIR/Library"
|
||||
fi
|
||||
if test x"$GNUSTEP_USER_DIR_HEADERS" = x""; then
|
||||
if test "$GNUSTEP_IS_FLATTENED" = "yes"; then
|
||||
GNUSTEP_USER_DIR_HEADERS="$GNUSTEP_USER_DIR/Library/Headers"
|
||||
else
|
||||
GNUSTEP_USER_DIR_HEADERS="$GNUSTEP_USER_DIR/Library/Headers/$LIBRARY_COMBO"
|
||||
fi
|
||||
GNUSTEP_USER_DIR_HEADERS="$GNUSTEP_USER_DIR/Library/Headers"
|
||||
fi
|
||||
if test x"$GNUSTEP_USER_DIR_LIBRARIES" = x""; then
|
||||
GNUSTEP_USER_DIR_LIBRARIES="$GNUSTEP_USER_DIR_LIBRARY/Libraries/"
|
||||
|
|
@ -837,18 +821,20 @@ AC_SUBST(BACKEND_BUNDLE)
|
|||
#--------------------------------------------------------------------
|
||||
|
||||
# Set location of System GNUstep dirs for later use
|
||||
GNUSTEP_HDIR="$GNUSTEP_SYSTEM_HEADERS"
|
||||
|
||||
|
||||
if test "$GNUSTEP_FLATTENED" = yes; then
|
||||
GNUSTEP_LDIR="$GNUSTEP_SYSTEM_LIBRARIES"
|
||||
GNUSTEP_HDIR="$GNUSTEP_SYSTEM_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="$GNUSTEP_SYSTEM_LIBRARIES/$obj_dir"
|
||||
GNUSTEP_HDIR="$GNUSTEP_SYSTEM_HEADERS/$LIBRARY_COMBO"
|
||||
fi
|
||||
|
||||
# Check to see if the libobjc library is in our GNUSTEP_SYSTEM_ROOT.
|
||||
# Check to see if the libobjc library is in our GNUSTEP_SYSTEM_LIBRARIES.
|
||||
# If so, there are probably other libraries that we want there also, so
|
||||
# leave the proper includes in CPPFLAGS and LDFLAGS
|
||||
AC_MSG_CHECKING(for custom shared objc library)
|
||||
|
|
@ -871,7 +857,7 @@ 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="$CPPFLAGS $INCLUDES -I$GNUSTEP_SYSTEM_HEADERS"
|
||||
OBJC_CPPFLAGS="$CPPFLAGS $INCLUDES -I$GNUSTEP_HDIR"
|
||||
OBJC_LDFLAGS="$LDFLAGS $LIB_DIR -L$gs_cv_objc_libdir"
|
||||
fi
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue