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
This commit is contained in:
H.J. Lu 2002-06-05 22:15:05 +00:00 committed by H.J. Lu
parent 8008102813
commit 5d3dfc3ac1
3 changed files with 11 additions and 14 deletions

View File

@ -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) 2002-06-04 H.J. Lu (hjl@gnu.org)
* Makefile.am (libgcj_convenience.la): New target. * Makefile.am (libgcj_convenience.la): New target.

View File

@ -222,16 +222,10 @@ $(javao_files) $(x_javao_files): %.lo: %.java
$(GCJCOMPILE) -o $@ $< $(GCJCOMPILE) -o $@ $<
## Pass the list of object files to libtool in a temporary file to ## Pass the list of object files to libtool in a temporary file to
## avoid tripping platform command line length limits. We also use ## avoid tripping platform command line length limits.
## libgcj_convenience.la to avoid creating a long linker command line libgcj.la: $(libgcj_la_OBJECTS) $(libgcj_la_DEPENDENCIES)
## 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)
@: $(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)) @: $(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_LINK) -objectlist libgcj.objectlist \
libgcj.la: libgcj_convenience.la
$(libgcj_la_LINK) libgcj_convenience.la \
@GCLIBS@ @LIBFFI@ @ZLIBS@ \ @GCLIBS@ @LIBFFI@ @ZLIBS@ \
-rpath $(toolexeclibdir) $(libgcj_la_LDFLAGS) $(LIBS) -rpath $(toolexeclibdir) $(libgcj_la_LDFLAGS) $(LIBS)

View File

@ -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 $(javao_files) $(x_javao_files): %.lo: %.java
$(GCJCOMPILE) -o $@ $< $(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)) @: $(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_LINK) -objectlist libgcj.objectlist \
libgcj.la: libgcj_convenience.la
$(libgcj_la_LINK) libgcj_convenience.la \
@GCLIBS@ @LIBFFI@ @ZLIBS@ \ @GCLIBS@ @LIBFFI@ @ZLIBS@ \
-rpath $(toolexeclibdir) $(libgcj_la_LDFLAGS) $(LIBS) -rpath $(toolexeclibdir) $(libgcj_la_LDFLAGS) $(LIBS)