diff options
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/Makefile.am | 2 | ||||
| -rw-r--r-- | libjava/Makefile.in | 4 |
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 \ |