From 5db1f7edca103836920ba673f01759963d261324 Mon Sep 17 00:00:00 2001 From: Alexandre Petit-Bianco Date: Sat, 9 Dec 2000 01:39:21 +0000 Subject: [PATCH] Makefile.in (TARGET_CONFIGDIRS): Added note about libjava. 2000-12-08 Alexandre Petit-Bianco * Makefile.in (TARGET_CONFIGDIRS): Added note about libjava. (ALL_MODULES): Added fastjar. (NATIVE_CHECK_MODULES, INSTALL_MODULES, CLEAN_MODULES): Likewise. (all-target-libjava): all-fastjar replaces all-zip. (all-fastjar): Added. (configure-target-fastjar, all-target-fastjar): Likewise. * configure.in (host_tools): Added fastjar. (http://gcc.gnu.org/ml/gcc-patches/2000-12/msg00479.html) From-SVN: r38143 --- ChangeLog | 10 ++++++++++ Makefile.in | 13 ++++++++++++- configure.in | 2 +- 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8f5227a2ee0..7c0efe865bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2000-12-08 Alexandre Petit-Bianco + + * Makefile.in (TARGET_CONFIGDIRS): Added note about libjava. + (ALL_MODULES): Added fastjar. + (NATIVE_CHECK_MODULES, INSTALL_MODULES, CLEAN_MODULES): Likewise. + (all-target-libjava): all-fastjar replaces all-zip. + (all-fastjar): Added. + (configure-target-fastjar, all-target-fastjar): Likewise. + * configure.in (host_tools): Added fastjar. + 2000-12-07 Mike Stump * Makefile.in (local-distclean): Remove leftover built files. diff --git a/Makefile.in b/Makefile.in index 93cf3f96197..4f770fb3934 100644 --- a/Makefile.in +++ b/Makefile.in @@ -169,6 +169,10 @@ OTHERS = # This is set by the configure script to the list of directories which # should be built using the target tools. +# Temporary note: Java hackers: add `libjava' at the end of this list +# for a merged tree build. This limitation and this comment will go +# away when libjava will safely build without `--disable-new-gxx-abi' +# (Soon.) TARGET_CONFIGDIRS = libiberty libgloss $(SPECIAL_LIBS) newlib libio librx libstdc++ libg++ winsup opcodes bsp libstub cygmon libf2c libchill libobjc # Target libraries are put under this directory: @@ -485,6 +489,7 @@ ALL_MODULES = \ all-diff \ all-dosutils \ all-etc \ + all-fastjar \ all-fileutils \ all-findutils \ all-find \ @@ -545,6 +550,7 @@ ALL_MODULES = \ NATIVE_CHECK_MODULES = \ check-bison \ check-byacc \ + check-fastjar \ check-flex \ check-zip @@ -636,6 +642,7 @@ INSTALL_MODULES = \ install-diff \ install-dosutils \ install-etc \ + install-fastjar \ install-fileutils \ install-findutils \ install-find \ @@ -838,6 +845,7 @@ CLEAN_MODULES = \ clean-diff \ clean-dosutils \ clean-etc \ + clean-fastjar \ clean-fileutils \ clean-findutils \ clean-find \ @@ -1615,7 +1623,7 @@ all-libiberty: configure-target-libffi: $(ALL_GCC_C) all-target-libffi: configure-target-libffi configure-target-libjava: $(ALL_GCC_CXX) configure-target-zlib configure-target-boehm-gc configure-target-qthreads configure-target-libffi -all-target-libjava: configure-target-libjava all-zip all-target-zlib all-target-boehm-gc all-target-qthreads all-target-libffi +all-target-libjava: configure-target-libjava all-fastjar all-target-zlib all-target-boehm-gc all-target-qthreads all-target-libffi configure-target-librx: $(ALL_GCC_C) all-target-librx: configure-target-librx configure-target-libstdc++: $(ALL_GCC_C) @@ -1671,6 +1679,9 @@ all-zip: all-zlib: configure-target-zlib: $(ALL_GCC_C) all-target-zlib: configure-target-zlib +all-fastjar: all-zlib +configure-target-fastjar: configure-target-zlib +all-target-fastjar: configure-target-fastjar all-target-zlib configure-target-libiberty: $(ALL_GCC_C) all-target-libiberty: configure-target-libiberty all-target: $(ALL_TARGET_MODULES) diff --git a/configure.in b/configure.in index 21c15ad86cd..4236fe075a4 100644 --- a/configure.in +++ b/configure.in @@ -61,7 +61,7 @@ fi # these tools are built for the host environment # Note, the powerpc-eabi build depends on sim occurring before gdb in order to # know that we are building the simulator. -host_tools="texinfo byacc flex bison binutils ld gas gcc sim gdb make patch prms send-pr gprof gdbtest tgas etc expect dejagnu ash bash bzip2 m4 autoconf automake libtool ispell grep diff rcs cvssrc fileutils shellutils time textutils wdiff find emacs emacs19 uudecode hello tar gzip indent recode release sed utils guile perl apache inet gawk findutils snavigator libtool gettext zip" +host_tools="texinfo byacc flex bison binutils ld gas gcc sim gdb make patch prms send-pr gprof gdbtest tgas etc expect dejagnu ash bash bzip2 m4 autoconf automake libtool ispell grep diff rcs cvssrc fileutils shellutils time textutils wdiff find emacs emacs19 uudecode hello tar gzip indent recode release sed utils guile perl apache inet gawk findutils snavigator libtool gettext zip fastjar" # these libraries are built for the target environment, and are built after # the host libraries and the host tools (which may be a cross compiler)