summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4>2001-01-08 07:55:25 +0000
committerbryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4>2001-01-08 07:55:25 +0000
commitbdcdbc4e145827b21a96c3fe5637ed745dc2ee81 (patch)
treedc37763e9b0a87e68f20bae33ff00b332b52d1cb
parent751cb6fa8413854d208ba3f67d49d73edeb4c7a1 (diff)
downloadgcc-bdcdbc4e145827b21a96c3fe5637ed745dc2ee81.tar.gz
* 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
-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 dbcccecafff..e4081eae45f 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 414ae2caade..807594a49f2 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 ac5e4934446..865ff9edf3d 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 \