mirror of
https://github.com/gnustep/tools-make.git
synced 2025-04-22 22:00:49 +00:00
Simplify CPPFLAGS
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@14283 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor
parent
dabfa9e4af
commit
cb98793417
8 changed files with 46 additions and 42 deletions
|
|
@ -1,3 +1,10 @@
|
|||
2002-08-15 Adam Fedor <fedor@gnu.org>
|
||||
|
||||
* configure.ac: Save user suplied CPPFLAGS, use INCLUDE_FLAGS
|
||||
instead (goes into CONFIG_SYSTEM_INCL).
|
||||
* config.make.in (CPPFLAGS): Subst with CPPFLAGS
|
||||
(CONFIG_SYSTEM_INCL): Subst with INCLUDE_FLAGS.
|
||||
|
||||
Fri Aug 9 11:15:26 2002 Nicola Pero <n.pero@mi.flashnet.it>
|
||||
|
||||
Patch from Peter Cooper <comrade@obverse.com.au> with minor
|
||||
|
|
|
|||
|
|
@ -263,6 +263,12 @@ This should automatically run the configure script for you, build the
|
|||
base library and some tools, and install the whole lot (along with some
|
||||
system resources).
|
||||
|
||||
If you are using gcc 3.x, you should remove the line
|
||||
|
||||
__objc_class_name_NXConstantString
|
||||
|
||||
from Source/libgnustep-base.def before doing a make.
|
||||
|
||||
|
||||
|
||||
Building and installing GNUstep-gui
|
||||
|
|
|
|||
|
|
@ -457,17 +457,5 @@ cvs -z3 update -Pd
|
|||
|
||||
You don't have to re-checkout after you have the source, just update!
|
||||
|
||||
@chapter Acknowledgements
|
||||
|
||||
@format
|
||||
Authors: Adam Fedor <fedor@@gnu.org>,
|
||||
Pascal Forget <pascal@@wsc.com>,
|
||||
Ovidiu Predescu <ovidiu@@net-community.com>,
|
||||
Camille Troillard <tuscland@@wanadoo.fr>
|
||||
Richard Frith-MacDonald <richard@@brainstorm.co.uk>
|
||||
|
||||
This file is part of GNUstep.
|
||||
@end format
|
||||
|
||||
@bye
|
||||
\bye
|
||||
|
|
|
|||
|
|
@ -120,10 +120,10 @@ to use libgthread as your threading library. Note that the Objective-C
|
|||
runtime (libobjc) must have a compatible threading backend in order to
|
||||
use this threading library and you must set the appropriate threading backend
|
||||
by hand in the GNUmakefile if you are using gnustep-objc. If you also need
|
||||
to set compiler flags, use the CFLAGS variable when calling configure:
|
||||
to set compiler flags, use the CPPFLAGS variable when calling configure:
|
||||
|
||||
@example
|
||||
CFLAGS="-I/usr/local/include" ./configure --with-thread-lib="-L/usr/local/lib -lgthread -lglib"
|
||||
CPPFLAGS="-I/usr/local/include" ./configure --with-thread-lib="-L/usr/local/lib -lgthread -lglib"
|
||||
@end example
|
||||
|
||||
@node Warnings for deprecated #import, Cross-Compiling, Alternate Thread Library, Configuration
|
||||
|
|
|
|||
|
|
@ -141,9 +141,10 @@ support tools and service providing daemons, plus various GUI
|
|||
development tools, a GUI desktop/workspace application, etc.
|
||||
|
||||
At no stage will you ever 'run' GNUstep - you will run applications
|
||||
and tools and will make use of it's services (though at some point
|
||||
and tools and will make use of it's services. At some point
|
||||
you may well find packages distributed as 'GNUstep' systems in the
|
||||
way that you get 'GNU/Linux' systems packaged today).
|
||||
way that you get 'GNU/Linux' systems packaged today. Look at
|
||||
Simply GNUstep @url{http://simplygnustep.sourceforge.net/} for instance.
|
||||
|
||||
If you want to see a sample GUI application running you need to build
|
||||
GNUstep and look at the example applications in the gnustep-examples
|
||||
|
|
@ -161,7 +162,7 @@ See @url{http://www.gnustep.org/}.
|
|||
@node When is GNUstep intended to be available?, What is usable?, Is there a web site?, GNUstep General Information
|
||||
@subsection When is GNUstep intended to be available?
|
||||
|
||||
It's usable now. Releases are made about every six months. However, if
|
||||
It's usable now. Major releases are made about every six months. However, if
|
||||
you are a serious developer, it's probably best to use the latest
|
||||
snapshots.
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ GNUSTEP_MAKE_VERSION=@GNUSTEP_MAKE_VERSION@
|
|||
#
|
||||
CC = @CC@
|
||||
OPTFLAG = @CFLAGS@
|
||||
CPPFLAGS = @FORCE_CPPFLAGS@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
OBJC_NO_IMPORT_FLAGS = @OBJC_NO_IMPORT_FLAGS@
|
||||
|
||||
EXEEXT = @EXEEXT@
|
||||
|
|
@ -105,7 +105,7 @@ ifndef objc_threaded
|
|||
endif
|
||||
|
||||
# Any user specified libs, like thread libraries
|
||||
CONFIG_SYSTEM_INCL = @CPPFLAGS@
|
||||
CONFIG_SYSTEM_INCL = @INCLUDE_FLAGS@
|
||||
CONFIG_SYSTEM_LIBS = @LIBS@
|
||||
CONFIG_SYSTEM_DEFS =
|
||||
|
||||
|
|
|
|||
25
configure
vendored
25
configure
vendored
|
|
@ -2316,12 +2316,18 @@ OBJC_RUNTIME_LIB=`echo $ac_cv_library_combo | awk -F- '{print $1}'`
|
|||
#--------------------------------------------------------------------
|
||||
# specific target_os options
|
||||
#--------------------------------------------------------------------
|
||||
INCLUDE_FLAGS=
|
||||
case "$target_os" in
|
||||
freebsd*) CPPFLAGS="$CPPFLAGS -I/usr/local/include"
|
||||
freebsd*) INCLUDE_FLAGS="$INCLUDE_FLAGS -I/usr/local/include"
|
||||
LIBS="$LIBS -L/usr/local/lib";;
|
||||
netbsd*) CPPFLAGS="$CPPFLAGS -I/usr/pkg/include"
|
||||
netbsd*) INCLUDE_FLAGS="$INCLUDE_FLAGS -I/usr/pkg/include"
|
||||
LIBS="$LIBS -L/usr/pkg/lib";;
|
||||
esac
|
||||
# Save the user supplied CPPFLAGS so we can restore them later.
|
||||
user_CPPFLAGS="$CPPFLAGS"
|
||||
# This is just for configuring. Later, in config.make, INCLUDE_FLAGS
|
||||
# goes in CONFIG_SYSTEM_INCL and the original CPPFLAGS goes in unaltered.
|
||||
$CPPFLAGS="$CPPFLAGS $INCLUDE_FLAGS"
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Determine the host, build, and target systems
|
||||
|
|
@ -2971,14 +2977,6 @@ fi
|
|||
# Strip '-g' off of CFLAGS, since debug=yes adds that anyway
|
||||
CFLAGS=`echo $CFLAGS | sed -e 's/-g //'`
|
||||
|
||||
# CPPFLAGS are used throughout for additional includes, which eventually
|
||||
# goes in the SYSTEM_CONFIG_INCL variable. If someone really wants to
|
||||
# set CPPFLAGS, set FORCE_CPPFLAGS instead (see config.make.in)
|
||||
if test "$FORCE_CPPFLAGS" = ""; then
|
||||
FORCE_CPPFLAGS=
|
||||
fi
|
||||
|
||||
|
||||
# Set location of GNUstep dirs for later use
|
||||
GNUSTEP_HDIR="$prefix/Headers"
|
||||
if test "$GNUSTEP_FLATTENED" = yes; then
|
||||
|
|
@ -3018,7 +3016,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 -I$prefix/Headers"
|
||||
OBJC_CPPFLAGS="$INCLUDE_FLAGS -I$prefix/Headers"
|
||||
OBJC_LDFLAGS="$LDFLAGS -L$gs_cv_objc_libdir"
|
||||
fi
|
||||
|
||||
|
|
@ -4050,6 +4048,9 @@ if test "$ac_cv_import" = "yes"; then
|
|||
fi
|
||||
|
||||
|
||||
CPPFLAGS="$user_CPPFLAGS"
|
||||
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Record the version
|
||||
#--------------------------------------------------------------------
|
||||
|
|
@ -4686,11 +4687,11 @@ s,@GNUSTEP_LOCAL_ROOT@,$GNUSTEP_LOCAL_ROOT,;t t
|
|||
s,@GNUSTEP_NETWORK_ROOT@,$GNUSTEP_NETWORK_ROOT,;t t
|
||||
s,@GNUSTEP_FLATTENED@,$GNUSTEP_FLATTENED,;t t
|
||||
s,@BACKEND_BUNDLE@,$BACKEND_BUNDLE,;t t
|
||||
s,@FORCE_CPPFLAGS@,$FORCE_CPPFLAGS,;t t
|
||||
s,@objc_threaded@,$objc_threaded,;t t
|
||||
s,@ac_cv_objc_threaded@,$ac_cv_objc_threaded,;t t
|
||||
s,@AUTO_DEPENDENCIES@,$AUTO_DEPENDENCIES,;t t
|
||||
s,@OBJC_NO_IMPORT_FLAGS@,$OBJC_NO_IMPORT_FLAGS,;t t
|
||||
s,@INCLUDE_FLAGS@,$INCLUDE_FLAGS,;t t
|
||||
s,@GNUSTEP_MAKE_VERSION@,$GNUSTEP_MAKE_VERSION,;t t
|
||||
s,@GNUSTEP_MAKE_MAJOR_VERSION@,$GNUSTEP_MAKE_MAJOR_VERSION,;t t
|
||||
s,@GNUSTEP_MAKE_MINOR_VERSION@,$GNUSTEP_MAKE_MINOR_VERSION,;t t
|
||||
|
|
|
|||
23
configure.ac
23
configure.ac
|
|
@ -51,12 +51,18 @@ OBJC_RUNTIME_LIB=`echo $ac_cv_library_combo | awk -F- '{print $1}'`
|
|||
#--------------------------------------------------------------------
|
||||
# specific target_os options
|
||||
#--------------------------------------------------------------------
|
||||
INCLUDE_FLAGS=
|
||||
case "$target_os" in
|
||||
freebsd*) CPPFLAGS="$CPPFLAGS -I/usr/local/include"
|
||||
freebsd*) INCLUDE_FLAGS="$INCLUDE_FLAGS -I/usr/local/include"
|
||||
LIBS="$LIBS -L/usr/local/lib";;
|
||||
netbsd*) CPPFLAGS="$CPPFLAGS -I/usr/pkg/include"
|
||||
netbsd*) INCLUDE_FLAGS="$INCLUDE_FLAGS -I/usr/pkg/include"
|
||||
LIBS="$LIBS -L/usr/pkg/lib";;
|
||||
esac
|
||||
# Save the user supplied CPPFLAGS so we can restore them later.
|
||||
user_CPPFLAGS="$CPPFLAGS"
|
||||
# This is just for configuring. Later, in config.make, INCLUDE_FLAGS
|
||||
# goes in CONFIG_SYSTEM_INCL and the original CPPFLAGS goes in unaltered
|
||||
$CPPFLAGS="$CPPFLAGS $INCLUDE_FLAGS"
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Determine the host, build, and target systems
|
||||
|
|
@ -249,14 +255,6 @@ AC_SUBST(BACKEND_BUNDLE)
|
|||
# Strip '-g' off of CFLAGS, since debug=yes adds that anyway
|
||||
CFLAGS=`echo $CFLAGS | sed -e 's/-g //'`
|
||||
|
||||
# CPPFLAGS are used throughout for additional includes, which eventually
|
||||
# goes in the SYSTEM_CONFIG_INCL variable. If someone really wants to
|
||||
# set CPPFLAGS, set FORCE_CPPFLAGS instead (see config.make.in)
|
||||
if test "$FORCE_CPPFLAGS" = ""; then
|
||||
FORCE_CPPFLAGS=
|
||||
fi
|
||||
AC_SUBST(FORCE_CPPFLAGS)
|
||||
|
||||
# Set location of GNUstep dirs for later use
|
||||
GNUSTEP_HDIR="$prefix/Headers"
|
||||
if test "$GNUSTEP_FLATTENED" = yes; then
|
||||
|
|
@ -291,7 +289,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 -I$prefix/Headers"
|
||||
OBJC_CPPFLAGS="$INCLUDE_FLAGS -I$prefix/Headers"
|
||||
OBJC_LDFLAGS="$LDFLAGS -L$gs_cv_objc_libdir"
|
||||
fi
|
||||
|
||||
|
|
@ -435,6 +433,9 @@ if test "$ac_cv_import" = "yes"; then
|
|||
fi
|
||||
AC_SUBST(OBJC_NO_IMPORT_FLAGS)
|
||||
|
||||
CPPFLAGS="$user_CPPFLAGS"
|
||||
AC_SUBST(INCLUDE_FLAGS)
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# Record the version
|
||||
#--------------------------------------------------------------------
|
||||
|
|
|
|||
Loading…
Reference in a new issue