aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryce McKinlay <bryce@albatross.co.nz>2001-01-08 07:55:25 +0000
committerBryce McKinlay <bryce@gcc.gnu.org>2001-01-08 07:55:25 +0000
commit0a8f3dbb7a4b3ec0b00184cc0ecc50c7df188830 (patch)
treedc37763e9b0a87e68f20bae33ff00b332b52d1cb
parent4fd297757d05e95e21ab9b39ba99d8592454e2e6 (diff)
downloadgcc-0a8f3dbb7a4b3ec0b00184cc0ecc50c7df188830.zip
gcc-0a8f3dbb7a4b3ec0b00184cc0ecc50c7df188830.tar.gz
gcc-0a8f3dbb7a4b3ec0b00184cc0ecc50c7df188830.tar.bz2
Makefile.am: Use the new "-M -MF" option for generating dependencies from the c++ compiler.
* Makefile.am: Use the new "-M -MF" option for generating dependencies from the c++ compiler. * Makefile.in: Rebuilt. From-SVN: r38794
-rw-r--r--libjava/ChangeLog6
-rw-r--r--libjava/Makefile.am2
-rw-r--r--libjava/Makefile.in4
3 files changed, 9 insertions, 3 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index dbcccec..e4081ea 100644
--- 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 414ae2c..807594a 100644
--- 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 ac5e493..865ff9e 100644
--- 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 \