* Makefile.am: Use the new "-M -MF" option for generating dependencies

	from the c++ compiler.
	* Makefile.in: Rebuilt.

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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index dbcccecafff6b7bf7c40401886c33f8caebb4031..e4081eae45f516beb52741cd552c7e5955e96a93 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2001-01-08  Bryce McKinlay  <bryce@albatross.co.nz>
+
+       * Makefile.am: Use the new "-M -MF" option for generating dependencies
+       from the c++ compiler.
+       * Makefile.in: Rebuilt.
+
 2001-01-07  Anthony Green  <green@redhat.com>
 
        * Makefile.am (texinfo): Add texinfo target for generating texinfo

diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index 414ae2caade383aeb724ae387a3b6e29c7a3c24c..807594a49f21186aa12a40b4c72082f9afd576ca 100644 (file)
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -238,7 +238,7 @@ SUFFIXES = .class .java .h
 ## subdirs.  FIXME.
 $(nat_files) $(x_nat_files): %.lo: %.cc
        @echo '$(LTCXXCOMPILE) -c -o $@ $<'; \
-       $(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c -o $@ $<
+       $(LTCXXCOMPILE) -M -MF .deps/$(*F).pp -c -o $@ $<
        @-sed -e 's/^\([^:]*\)\.o[      ]*:/\1.lo \1.o :/' \
          < .deps/$(*F).pp > .deps/$(*F).P; \
        tr ' ' '\012' < .deps/$(*F).pp \

diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index ac5e493444689a7f4cdfdbab4ba0318817992654..865ff9edf3ddd07c2e6332d03ff3bc6b585893dc 100644 (file)
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -1198,7 +1198,7 @@ libgcj-test.spec.in libgcj.spec.in
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = gtar
+TAR = tar
 GZIP_ENV = --best
 DIST_SUBDIRS =  @DIRLTDL@ testsuite gcj include @DIRLTDL@ gcj include
 DEP_FILES =  .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
@@ -2335,7 +2335,7 @@ clean-local:
 
 $(nat_files) $(x_nat_files): %.lo: %.cc
        @echo '$(LTCXXCOMPILE) -c -o $@ $<'; \
-       $(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c -o $@ $<
+       $(LTCXXCOMPILE) -M -MF .deps/$(*F).pp -c -o $@ $<
        @-sed -e 's/^\([^:]*\)\.o[      ]*:/\1.lo \1.o :/' \
          < .deps/$(*F).pp > .deps/$(*F).P; \
        tr ' ' '\012' < .deps/$(*F).pp \