2000-12-08 Alexandre Petit-Bianco <apbianco@cygnus.com>

        * 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)

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@38143 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/ChangeLog b/ChangeLog
index 8f5227a..7c0efe8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2000-12-08  Alexandre Petit-Bianco  <apbianco@cygnus.com>
+
+       * 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  <mrs@wrs.com>
 
        * Makefile.in (local-distclean): Remove leftover built files.

diff --git a/Makefile.in b/Makefile.in
index 93cf3f9..4f770fb 100644 (file)
--- 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 21c15ad..4236fe0 100644 (file)
--- 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)