parent
e093c992b8
commit
3c809ba45b
|
@ -1,3 +1,10 @@
|
||||||
|
2000-09-02 Anthony Green <green@cygnus.com>
|
||||||
|
|
||||||
|
* Makefile.in (all-gcc): Depend on all-zlib.
|
||||||
|
(CLEAN_MODULES): Add clean-zlib.
|
||||||
|
(ALL_MODULES): Add all-zlib.
|
||||||
|
* configure.in (host_libs): Add zlib.
|
||||||
|
|
||||||
2000-09-02 Alexandre Oliva <aoliva@redhat.com>, DJ Delorie <dj@redhat.com>
|
2000-09-02 Alexandre Oliva <aoliva@redhat.com>, DJ Delorie <dj@redhat.com>
|
||||||
|
|
||||||
* configure.in (FLAGS_FOR_TARGET): Use -nostdinc even for Canadian
|
* configure.in (FLAGS_FOR_TARGET): Use -nostdinc even for Canadian
|
||||||
|
|
|
@ -527,6 +527,7 @@ ALL_MODULES = \
|
||||||
all-uudecode \
|
all-uudecode \
|
||||||
all-wdiff \
|
all-wdiff \
|
||||||
all-zip \
|
all-zip \
|
||||||
|
all-zlib \
|
||||||
$(EXTRA_TARGET_HOST_ALL_MODULES)
|
$(EXTRA_TARGET_HOST_ALL_MODULES)
|
||||||
|
|
||||||
# This is a list of the check targets for all of the modules which are
|
# This is a list of the check targets for all of the modules which are
|
||||||
|
@ -874,7 +875,8 @@ CLEAN_MODULES = \
|
||||||
clean-time \
|
clean-time \
|
||||||
clean-uudecode \
|
clean-uudecode \
|
||||||
clean-wdiff \
|
clean-wdiff \
|
||||||
clean-zip
|
clean-zip \
|
||||||
|
clean-zlib
|
||||||
|
|
||||||
# All of the target modules that can be cleaned
|
# All of the target modules that can be cleaned
|
||||||
CLEAN_TARGET_MODULES = \
|
CLEAN_TARGET_MODULES = \
|
||||||
|
@ -1563,7 +1565,7 @@ all-gas: all-libiberty all-opcodes all-bfd all-intl
|
||||||
all-gash: all-tcl
|
all-gash: all-tcl
|
||||||
all-gawk:
|
all-gawk:
|
||||||
ALL_GCC = all-gcc
|
ALL_GCC = all-gcc
|
||||||
all-gcc: all-bison all-byacc all-binutils all-gas all-ld
|
all-gcc: all-bison all-byacc all-binutils all-gas all-ld all-zlib
|
||||||
all-bootstrap: all-libiberty all-bison all-byacc all-binutils all-gas all-ld
|
all-bootstrap: all-libiberty all-bison all-byacc all-binutils all-gas all-ld
|
||||||
GDB_TK = all-tk all-tcl all-itcl all-tix all-libgui
|
GDB_TK = all-tk all-tcl all-itcl all-tix all-libgui
|
||||||
all-gdb: all-libiberty all-opcodes all-bfd all-mmalloc all-readline all-bison all-byacc all-sim $(gdbnlmrequirements) $(GDB_TK)
|
all-gdb: all-libiberty all-opcodes all-bfd all-mmalloc all-readline all-bison all-byacc all-sim $(gdbnlmrequirements) $(GDB_TK)
|
||||||
|
|
|
@ -41,7 +41,7 @@
|
||||||
|
|
||||||
# these libraries are used by various programs built for the host environment
|
# these libraries are used by various programs built for the host environment
|
||||||
#
|
#
|
||||||
host_libs="intl mmalloc libiberty opcodes bfd readline gash db tcl tk tcl8.1 tk8.1 tclX itcl tix libgui"
|
host_libs="intl mmalloc libiberty opcodes bfd readline gash db tcl tk tcl8.1 tk8.1 tclX itcl tix libgui zlib"
|
||||||
|
|
||||||
if [ "${enable_gdbgui}" = "yes" ] ; then
|
if [ "${enable_gdbgui}" = "yes" ] ; then
|
||||||
host_libs="${host_libs} libgui"
|
host_libs="${host_libs} libgui"
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -4785,6 +4785,17 @@ fi])
|
||||||
AC_SUBST(GGC)
|
AC_SUBST(GGC)
|
||||||
echo "Using $GGC for garbage collection."
|
echo "Using $GGC for garbage collection."
|
||||||
|
|
||||||
|
# Use the system's zlib library.
|
||||||
|
zlibdir=-L../../zlib
|
||||||
|
zlibinc="-I\$(srcdir)/../../zlib"
|
||||||
|
AC_ARG_WITH(system-zlib,
|
||||||
|
[ --with-system-zlib use installed libz],
|
||||||
|
zlibdir=
|
||||||
|
zlibinc=
|
||||||
|
)
|
||||||
|
AC_SUBST(zlibdir)
|
||||||
|
AC_SUBST(zlibinc)
|
||||||
|
|
||||||
# Build a new-abi (c++) system
|
# Build a new-abi (c++) system
|
||||||
AC_ARG_ENABLE(new-gxx-abi,
|
AC_ARG_ENABLE(new-gxx-abi,
|
||||||
[ --enable-new-gxx-abi
|
[ --enable-new-gxx-abi
|
||||||
|
|
|
@ -148,16 +148,20 @@ ALL_CPPFLAGS = $(CPPFLAGS) $(X_CPPFLAGS) $(T_CPPFLAGS)
|
||||||
# This is where we get libiberty.a from.
|
# This is where we get libiberty.a from.
|
||||||
LIBIBERTY = ../../libiberty/libiberty.a
|
LIBIBERTY = ../../libiberty/libiberty.a
|
||||||
|
|
||||||
|
# This is where we get zlib from. zlibdir is -L../../zlib by default,
|
||||||
|
# and is nothing when configured with --enable-system-zlib.
|
||||||
|
ZLIB = @zlibdir@ -lz
|
||||||
|
|
||||||
# How to link with both our special library facilities
|
# How to link with both our special library facilities
|
||||||
# and the system's installed libraries.
|
# and the system's installed libraries.
|
||||||
LIBS = $(INTLLIBS) $(LIBIBERTY) $(CLIB)
|
LIBS = $(ZLIB) $(INTLLIBS) $(LIBIBERTY) $(CLIB)
|
||||||
LIBDEPS = $(INTLLIBS) $(LIBIBERTY) ../errors.o
|
LIBDEPS = $(INTLLIBS) $(LIBIBERTY) ../errors.o
|
||||||
|
|
||||||
# Specify the directories to be searched for header files.
|
# Specify the directories to be searched for header files.
|
||||||
# Both . and srcdir are used, in that order,
|
# Both . and srcdir are used, in that order,
|
||||||
# so that tm.h and config.h will be found in the compilation
|
# so that tm.h and config.h will be found in the compilation
|
||||||
# subdirectory rather than in the source directory.
|
# subdirectory rather than in the source directory.
|
||||||
INCLUDES = -I. -I.. -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../config -I$(srcdir)/../../include
|
INCLUDES = -I. -I.. -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../config -I$(srcdir)/../../include @zlibinc@
|
||||||
|
|
||||||
# Always use -I$(srcdir)/config when compiling.
|
# Always use -I$(srcdir)/config when compiling.
|
||||||
.c.o:
|
.c.o:
|
||||||
|
|
Loading…
Reference in New Issue