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

	* 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 e75edf2dabe6dead528a26b9b73267661cd2751a..0efcdc807bbdf4b64d3be4d4a2aa8b39bca25689 100644 (file)
--- 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 7291ee7885c780b84fa96ef793f1716570db9e6e..88648570ca801380e33cdeea9f9ce9f97f356c3c 100644 (file)
--- 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 3dde235c0ef632fb6f19a13e644a287355ae3cbb..f0e5d03cfaf54304bac561f949ad73b450beb3d6 100644 (file)
--- 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 $@ $<