From 6cabab7823c99010a720eb8e0fd9f09bfba3a052 Mon Sep 17 00:00:00 2001
From: "David D. Zuhn" <zoo@cygnus>
Date: Tue, 10 Nov 1992 22:07:02 +0000
Subject: [PATCH] make cc command lines more consistent

---
 bfd/ChangeLog   |  4 ++++
 bfd/Makefile.in | 39 +++++++++++++++------------------------
 2 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index ef85620bdd6..714517c43a5 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,7 @@
+Tue Nov 10 14:04:38 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
+
+	* Makefile.in: minor tweaks to make $(CC) command lines more consistent
+
 Mon Nov  9 23:58:17 1992  John Gilmore  (gnu@cygnus.com)
 
 	* opncls.c (bfd_fdopenr, bfd_close):  Add doc about cacheing
diff --git a/bfd/Makefile.in b/bfd/Makefile.in
index d24d055a8fb..6114ddbf4d7 100644
--- a/bfd/Makefile.in
+++ b/bfd/Makefile.in
@@ -148,10 +148,10 @@ $(TARGETLIB): $(OFILES)
 
 
 targets.o: targets.c
-	$(CC) $(CFLAGS) -c $(HDEFINES) $(TDEFINES) $(CSEARCH) $(CSWITCHES) -DMINIMIZE=$(MINIMIZE) $(TDEFAULTS) $<
+	$(CC) -c $(CFLAGS) $(HDEFINES) $(TDEFINES) $(CSEARCH) $(CSWITCHES) -DMINIMIZE=$(MINIMIZE) $(TDEFAULTS) $<
 
 archures.o: archures.c
-	$(CC) $(CFLAGS) -c $(HDEFINES) $(TDEFINES) $(CSEARCH) $(CSWITCHES) -DMINIMIZE=$(MINIMIZE) $(TDEFAULTS) $<
+	$(CC) -c $(CFLAGS) $(HDEFINES) $(TDEFINES) $(CSEARCH) $(CSWITCHES) -DMINIMIZE=$(MINIMIZE) $(TDEFAULTS) $<
 
 subdir_do: force
 	@for i in $(DODIRS); do \
@@ -255,31 +255,22 @@ install:
 	-parent=`echo $(includedir)|sed -e 's@/[^/]*$$@@'`; \
 	if [ -d $$parent ] ; then true ; else mkdir $$parent ; fi
 	-if [ -d $(includedir) ] ; then true ; else mkdir $(includedir) ; fi
+	# Install BFD include file, and others that it needs.  Install them
+	# both in GCC's include directory, and in the system include dir
+	# if configured as $(oldincludedir) -- which it usually isnt.
 	$(INSTALL_DATA) $(INCDIR)/bfd.h $(includedir)/bfd.h
-	-if [ -z "$(oldincludedir)" ] ; then true ; else if [ -d $(oldincludedir) ] ; then true ; else mkdir $(oldincludedir) ; fi ; $(INSTALL_DATA) $(INCDIR)/bfd.h $(oldincludedir)/bfd.h ; fi
+	$(INSTALL_DATA) $(INCDIR)/ansidecl.h $(includedir)/ansidecl.h
+	$(INSTALL_DATA) $(INCDIR)/obstack.h $(includedir)/obstack.h
+	-if [ -z "$(oldincludedir)" ] ; then true ; \
+	 else if [ -d $(oldincludedir) ] ; then true ; \
+              else mkdir $(oldincludedir) ; \
+	      fi ; \
+	      $(INSTALL_DATA) $(INCDIR)/bfd.h      $(oldincludedir)/bfd.h;\
+	      $(INSTALL_DATA) $(INCDIR)/ansidecl.h $(oldincludedir)/ansidecl.h;\
+	      $(INSTALL_DATA) $(INCDIR)/obstack.h  $(oldincludedir)/obstack.h;\
+	 fi
 	@$(MAKE) subdir_do DO=install "DODIRS=$(SUBDIRS)" $(FLAGS_TO_PASS)
 
-# Target to uncomment host-specific lines in this makefile.  Such lines must
-# have the following string beginning in column 1: #__<hostname>__#
-# Original Makefile is backed up as 'Makefile.old'.
-#
-# Invoke with:  make make HOST=xxx
-#
-make:
-	-@if test $(HOST)x = x ; then \
-		echo 'Specify "make make HOST=???"'; \
-		exit 1; \
-	fi ; \
-	grep -s "^#The next line was generated by 'make make'" Makefile; \
-	if test $$? = 0 ; then	\
-		echo "Makefile has already been processed with 'make make'";\
-		exit 1; \
-	fi ; \
-	mv -f Makefile Makefile.old; \
-	echo "#The next line was generated by 'make make'"	 >Makefile ; \
-	echo "HOST=$(HOST)"					>>Makefile ; \
-	echo							>>Makefile ; \
-	sed "s/^#__$(HOST)__#//" < Makefile.old			>>Makefile
 
 Makefile: $(srcdir)/Makefile.in $(host_makefile_frag) $(target_makefile_frag)
 	$(SHELL) ./config.status
-- 
2.30.2