Makefile.am (libgcj_convenience.la): Revert the last change.

2002-06-05  H.J. Lu  (hjl@gnu.org)

	* Makefile.am (libgcj_convenience.la): Revert the last change.
	(libgcj.la): Likewise.
	* Makefile.in: Regenerated.

From-SVN: r54295

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 2c595c3a08444001c1537749fa9d578aaeec2338..3b58ee78c9678e0687e21b60789a0b3cb23ad427 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2002-06-05  H.J. Lu  (hjl@gnu.org)
+
+       * Makefile.am (libgcj_convenience.la): Revert the last change.
+       (libgcj.la): Likewise.
+       * Makefile.in: Regenerated.
+
 2002-06-04  H.J. Lu  (hjl@gnu.org)
 
        * Makefile.am (libgcj_convenience.la): New target.

diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index 2d713cabdfa99653da8d1ca6e376dd535f8ddd07..a959fdbba5e61ec0fe51ecaac6ee375dcfe9b042 100644 (file)
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -222,16 +222,10 @@ $(javao_files) $(x_javao_files): %.lo: %.java
        $(GCJCOMPILE) -o $@ $<
 
 ## Pass the list of object files to libtool in a temporary file to 
-## avoid tripping platform command line length limits. We also use
-## libgcj_convenience.la to avoid creating a long linker command line
-## which causes problems on some OSes and makes it almost impossible to
-## debug the linker under a debugger.
-libgcj_convenience.la: $(libgcj_la_OBJECTS) $(libgcj_la_DEPENDENCIES)
+## avoid tripping platform command line length limits.
+libgcj.la: $(libgcj_la_OBJECTS) $(libgcj_la_DEPENDENCIES)
        @: $(shell echo Creating list of files to link...) $(shell rm -f libgcj.objectlist || :) $(shell touch libgcj.objectlist) $(foreach object,$(libgcj_la_OBJECTS) $(libgcj_la_LIBADD),$(shell echo $(object) >> libgcj.objectlist))
-       $(libgcj_la_LINK) -objectlist libgcj.objectlist
-
-libgcj.la: libgcj_convenience.la
-       $(libgcj_la_LINK) libgcj_convenience.la \
+       $(libgcj_la_LINK) -objectlist libgcj.objectlist \
        @GCLIBS@ @LIBFFI@ @ZLIBS@ \
        -rpath $(toolexeclibdir) $(libgcj_la_LDFLAGS) $(LIBS)
 

diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 195208fe4a00b06add5bcf4e78803a6b6286fba4..6c4a9001a8476025e202ee1e2288703af3da0f6c 100644 (file)
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -3272,12 +3272,9 @@ $(c_files): java/lang/fdlibm.h java/lang/ieeefp.h java/lang/mprec.h
 $(javao_files) $(x_javao_files): %.lo: %.java
        $(GCJCOMPILE) -o $@ $<
 
-libgcj_convenience.la: $(libgcj_la_OBJECTS) $(libgcj_la_DEPENDENCIES)
+libgcj.la: $(libgcj_la_OBJECTS) $(libgcj_la_DEPENDENCIES)
        @: $(shell echo Creating list of files to link...) $(shell rm -f libgcj.objectlist || :) $(shell touch libgcj.objectlist) $(foreach object,$(libgcj_la_OBJECTS) $(libgcj_la_LIBADD),$(shell echo $(object) >> libgcj.objectlist))
-       $(libgcj_la_LINK) -objectlist libgcj.objectlist
-
-libgcj.la: libgcj_convenience.la
-       $(libgcj_la_LINK) libgcj_convenience.la \
+       $(libgcj_la_LINK) -objectlist libgcj.objectlist \
        @GCLIBS@ @LIBFFI@ @ZLIBS@ \
        -rpath $(toolexeclibdir) $(libgcj_la_LDFLAGS) $(LIBS)