From: Craig Burley <burley@gnu.org>
Date: Sat, 5 Sep 1998 10:26:44 +0000 (-0400)
Subject: Makefile.in (fini.o): Don't define USE_HCONFIG here.
X-Git-Tag: prereleases/libgcj-0.1~3200
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9041884c34936f938939b45fa11090d698e98ae5;p=thirdparty%2Fgcc.git

Makefile.in (fini.o): Don't define USE_HCONFIG here.

Fri Sep  4 18:35:52 1998  Craig Burley  <burley@gnu.org>
	* Makefile.in (fini.o): Don't define USE_HCONFIG here.
	* fini.c: Define USE_HCONFIG here instead, so deps-kinda
	picks up correct dependency.
	* Makefile.in (proj-h.o): Fix dependencies list.

From-SVN: r22246
---

diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog
index 3b9b7aa542fa..c2da7a02c65a 100644
--- a/gcc/f/ChangeLog
+++ b/gcc/f/ChangeLog
@@ -3,6 +3,14 @@
 	* Makefile.in (LDFLAGS): Set from BOOT_LDFLAGS.
 	(F771_LDFLAGS): Variable dispensed with.
 
+Fri Sep  4 18:35:52 1998  Craig Burley  <burley@gnu.org>
+
+	* Makefile.in (fini.o): Don't define USE_HCONFIG here.
+	* fini.c: Define USE_HCONFIG here instead, so deps-kinda
+	picks up correct dependency.
+
+	* Makefile.in (proj-h.o): Fix dependencies list.
+
 Wed Sep 02 09:25:29 1998  Nick Clifton  <nickc@cygnus.com>
 
 	* lex.c (ffe_lex_hash):  Change how HANDLE_PRAGMA and
diff --git a/gcc/f/Makefile.in b/gcc/f/Makefile.in
index f81c355c206b..639d633b5e56 100644
--- a/gcc/f/Makefile.in
+++ b/gcc/f/Makefile.in
@@ -459,10 +459,11 @@ fini: fini.o proj-h.o
 	$(HOST_CC) $(HOST_CFLAGS) $(HOST_LDFLAGS) -o fini fini.o proj-h.o
 
 fini.o:
-	$(HOST_CC) -c -DUSE_HCONFIG $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) \
+	$(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) \
 	      `echo $(srcdir)/fini.c | sed 's,^\./,,'` -o $@
 
-proj-h.o: proj.o
+# Like proj.o, but depends on hconfig.h instead of config.h.
+proj-h.o: proj.c proj.h $(HCONFIG_H) $(SYSTEM_H) $(ASSERT_H) $(GLIMITS_H)
 	$(HOST_CC) -c -DUSE_HCONFIG $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) \
 	      `echo $(srcdir)/proj.c | sed 's,^\./,,'` -o $@
 
diff --git a/gcc/f/fini.c b/gcc/f/fini.c
index 439eccad90b8..3b98949524b8 100644
--- a/gcc/f/fini.c
+++ b/gcc/f/fini.c
@@ -19,6 +19,8 @@ along with GNU Fortran; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.  */
 
+#define USE_HCONFIG
+
 #include "proj.h"
 #include "malloc.h"