From: Bryce McKinlay <bryce@waitaki.otago.ac.nz>
Date: Sun, 2 Dec 2001 04:29:16 +0000 (+0000)
Subject: Makefile.am (nat_files, [...]): Make sure the dependencies don't get deleted if compi... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c4d7a90e8a993fc58998b794df0d806781ddf133;p=gcc.git

Makefile.am (nat_files, [...]): Make sure the dependencies don't get deleted if compilation fails.

	* Makefile.am (nat_files, x_nat_files): Make sure the dependencies
	don't get deleted if compilation fails.
	* Makefile.in: Rebuilt.

From-SVN: r47520
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index e75edf2dabe..0efcdc807bb 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2001-12-02  Bryce McKinlay  <bryce@waitaki.otago.ac.nz>
+
+	* Makefile.am (nat_files, x_nat_files): Make sure the dependencies
+	don't get deleted if compilation fails.
+	* Makefile.in: Rebuilt.
+
 2001-11-30  Bryce McKinlay  <bryce@waitaki.otago.ac.nz>
 
 	* Makefile.am (nat_headers, x_nat_headers): Depend on .class files, not
diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index 7291ee7885c..88648570ca8 100644
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -216,8 +216,9 @@ SUFFIXES = .class .java .h
 ## is a bug in automake), and it also won't put the .o files into
 ## subdirs.  FIXME.
 $(nat_files) $(x_nat_files): %.lo: %.cc
-	@echo '$(LTCXXCOMPILE) -c -o $@ $<'; \
-	$(LTCXXCOMPILE) -MD -MT $@ -MF $*.d -c -o $@ $<
+	@echo '$(LTCXXCOMPILE) -MD -MT $@ -MF $(@:.lo=.pp) -c -o $@ $<'; \
+	$(LTCXXCOMPILE) -MD -MT $@ -MF $(@:.lo=.pp) -c -o $@ $<
+	@-mv $(@:.lo=.pp) $(@:.lo=.d)
 
 ## FIXME: GNU make.
 $(c_files): %.lo: %.c
diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 3dde235c0ef..f0e5d03cfaf 100644
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -1762,8 +1762,9 @@ clean-local:
 	$(GCJCOMPILE) -o $@ $<
 
 $(nat_files) $(x_nat_files): %.lo: %.cc
-	@echo '$(LTCXXCOMPILE) -c -o $@ $<'; \
-	$(LTCXXCOMPILE) -MD -MT $@ -MF $*.d -c -o $@ $<
+	@echo '$(LTCXXCOMPILE) -MD -MT $@ -MF $(@:.lo=.pp) -c -o $@ $<'; \
+	$(LTCXXCOMPILE) -MD -MT $@ -MF $(@:.lo=.pp) -c -o $@ $<
+	@-mv $(@:.lo=.pp) $(@:.lo=.d)
 
 $(c_files): %.lo: %.c
 	$(LTCOMPILE) -c -o $@ $<