From 9b8b2fcfda6acd6cba19691a3b1d966c8299efcc Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sat, 2 Feb 2002 21:14:29 +0000 Subject: [PATCH] * Makefile.in: Rebuilt. From-SVN: r49447 --- libjava/ChangeLog | 4 ++ libjava/Makefile.in | 89 ++++++++++++++++++++++++++++++++++++--------- 2 files changed, 76 insertions(+), 17 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 83917b075bc..7ac6c900492 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,7 @@ +2002-02-02 Tom Tromey + + * Makefile.in: Rebuilt. + 2002-02-02 Jason Merrill * Makefile.am (clean-nat): New target. diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 66494d9576e..a84676c1f9e 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -1726,8 +1726,9 @@ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DATA = $(data_DATA) $(toolexeclib_DATA) DIST_COMMON = README COPYING ChangeLog Makefile.am Makefile.in NEWS \ -THANKS acinclude.m4 aclocal.m4 configure configure.in \ -libgcj-test.spec.in libgcj.spec.in +THANKS acconfig.h acinclude.m4 aclocal.m4 configure configure.in \ +gcj/libgcj-config.h.in gcj/stamp-h2.in include/config.h.in \ +include/stamp-h1.in libgcj-test.spec.in libgcj.spec.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) @@ -2710,6 +2711,53 @@ config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck $(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) + +include/config.h: include/stamp-h1 + @if test ! -f $@; then \ + rm -f include/stamp-h1; \ + $(MAKE) include/stamp-h1; \ + else :; fi +include/stamp-h1: $(srcdir)/include/config.h.in $(top_builddir)/config.status + cd $(top_builddir) \ + && CONFIG_FILES= CONFIG_HEADERS=include/config.h \ + $(SHELL) ./config.status + @echo timestamp > include/stamp-h1 2> /dev/null +$(srcdir)/include/config.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/include/stamp-h1.in + @if test ! -f $@; then \ + rm -f $(srcdir)/include/stamp-h1.in; \ + $(MAKE) $(srcdir)/include/stamp-h1.in; \ + else :; fi +$(srcdir)/include/stamp-h1.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h + cd $(top_srcdir) && $(AUTOHEADER) + @echo timestamp > $(srcdir)/include/stamp-h1.in 2> /dev/null + +gcj/libgcj-config.h: gcj/stamp-h2 + @if test ! -f $@; then \ + rm -f gcj/stamp-h2; \ + $(MAKE) gcj/stamp-h2; \ + else :; fi +gcj/stamp-h2: $(srcdir)/gcj/libgcj-config.h.in $(top_builddir)/config.status + cd $(top_builddir) \ + && CONFIG_FILES= CONFIG_HEADERS=gcj/libgcj-config.h \ + $(SHELL) ./config.status + @echo timestamp > gcj/stamp-h2 2> /dev/null +$(srcdir)/gcj/libgcj-config.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/gcj/stamp-h2.in + @if test ! -f $@; then \ + rm -f $(srcdir)/gcj/stamp-h2.in; \ + $(MAKE) $(srcdir)/gcj/stamp-h2.in; \ + else :; fi +$(srcdir)/gcj/stamp-h2.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h + cd $(top_srcdir) && $(AUTOHEADER) + @echo timestamp > $(srcdir)/gcj/stamp-h2.in 2> /dev/null + +mostlyclean-hdr: + +clean-hdr: + +distclean-hdr: + -rm -f include/config.h gcj/libgcj-config.h + +maintainer-clean-hdr: libgcj.spec: $(top_builddir)/config.status libgcj.spec.in cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status libgcj-test.spec: $(top_builddir)/config.status libgcj-test.spec.in @@ -3144,29 +3192,32 @@ distclean-generic: -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: -mostlyclean-am: mostlyclean-toolexeclibLTLIBRARIES mostlyclean-compile \ - mostlyclean-libtool mostlyclean-binPROGRAMS \ - mostlyclean-noinstPROGRAMS mostlyclean-tags \ - mostlyclean-depend mostlyclean-generic +mostlyclean-am: mostlyclean-hdr mostlyclean-toolexeclibLTLIBRARIES \ + mostlyclean-compile mostlyclean-libtool \ + mostlyclean-binPROGRAMS mostlyclean-noinstPROGRAMS \ + mostlyclean-tags mostlyclean-depend mostlyclean-generic mostlyclean: mostlyclean-recursive -clean-am: clean-toolexeclibLTLIBRARIES clean-compile clean-libtool \ - clean-binPROGRAMS clean-noinstPROGRAMS clean-tags \ - clean-depend clean-generic mostlyclean-am clean-local +clean-am: clean-hdr clean-toolexeclibLTLIBRARIES clean-compile \ + clean-libtool clean-binPROGRAMS clean-noinstPROGRAMS \ + clean-tags clean-depend clean-generic mostlyclean-am \ + clean-local clean: clean-recursive -distclean-am: distclean-toolexeclibLTLIBRARIES distclean-compile \ - distclean-libtool distclean-binPROGRAMS \ - distclean-noinstPROGRAMS distclean-tags \ - distclean-depend distclean-generic clean-am +distclean-am: distclean-hdr distclean-toolexeclibLTLIBRARIES \ + distclean-compile distclean-libtool \ + distclean-binPROGRAMS distclean-noinstPROGRAMS \ + distclean-tags distclean-depend distclean-generic \ + clean-am -rm -f libtool distclean: distclean-recursive -rm -f config.status -maintainer-clean-am: maintainer-clean-toolexeclibLTLIBRARIES \ +maintainer-clean-am: maintainer-clean-hdr \ + maintainer-clean-toolexeclibLTLIBRARIES \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-binPROGRAMS \ maintainer-clean-noinstPROGRAMS maintainer-clean-tags \ @@ -3178,9 +3229,9 @@ maintainer-clean-am: maintainer-clean-toolexeclibLTLIBRARIES \ maintainer-clean: maintainer-clean-recursive -rm -f config.status -.PHONY: mostlyclean-toolexeclibLTLIBRARIES \ -distclean-toolexeclibLTLIBRARIES clean-toolexeclibLTLIBRARIES \ -maintainer-clean-toolexeclibLTLIBRARIES \ +.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \ +mostlyclean-toolexeclibLTLIBRARIES distclean-toolexeclibLTLIBRARIES \ +clean-toolexeclibLTLIBRARIES maintainer-clean-toolexeclibLTLIBRARIES \ uninstall-toolexeclibLTLIBRARIES install-toolexeclibLTLIBRARIES \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ @@ -3236,6 +3287,10 @@ libgcj.jar: $(built_java_source_files) $(java_source_files) $(x_java_source_file clean-local: find . -name '*.class' -print | xargs rm -f +# Just remove the objects from C++ sources, for testing the C++ compiler. +clean-nat: + rm -f $(nat_files) $(x_nat_files) + .class.lo: $(GCJCOMPILE) -o $@ $< -- 2.30.2