rework CFLAGS, etc.

1 files changed, 15 insertions, 48 deletions

diff --git a/bfd/Makefile.in b/bfd/Makefile.in
index 5c0d99a..ca5557a 100644
--- a/bfd/Makefile.in
+++ b/bfd/Makefile.in
@@ -52,6 +52,7 @@ INSTALL_DATA = $(INSTALL)
 
 AR = ar
 AR_FLAGS = qc
+CFLAGS = -g
 BISON = bison
 MAKEINFO = makeinfo
 RANLIB = ranlib
@@ -59,7 +60,6 @@ RANLIB = ranlib
 INCDIR = $(srcdir)/../include
 CSEARCH = -I. -I$(srcdir) -I$(INCDIR)
 DEP = mkdep
-MINUS_G=-g
 
 SUBDIRS = doc
 
@@ -69,7 +69,6 @@ SUBDIRS = doc
 MINIMIZE=0
 
 TARGETLIB = libbfd.a
-CFLAGS = $(MINUS_G) $(HDEFINES) $(TDEFINES) $(CSEARCH) $(CSWITCHES) # -DINTEL960VERSION
 
 
 BFD_LIBS = libbfd.o opncls.o bfd.o archive.o targets.o cache.o \
@@ -78,7 +77,7 @@ BFD_LIBS = libbfd.o opncls.o bfd.o archive.o targets.o cache.o \
 BFD_MACHINES = cpu-h8300.o cpu-i960.o cpu-sparc.o cpu-m68k.o cpu-m88k.o \
 	cpu-vax.o cpu-mips.o cpu-a29k.o cpu-i386.o cpu-rs6000.o
 
-BFD_BACKENDS = oasys.o ieee.o srec.o elf.o stab-syms.o\
+BFD_BACKENDS = oasys.o ieee.o srec.o tekhex.o elf.o stab-syms.o\
 	aout64.o aout32.o demo64.o sunos.o newsos3.o i386aout.o bout.o \
 	coff-i960.o coff-a29k.o coff-m68k.o coff-i386.o coff-m88k.o \
 	coff-mips.o coff-rs6000.o coff-h8300.o coff-msym.o 
@@ -88,11 +87,14 @@ OPTIONAL_BACKENDS = trad-core.o
 #### host and target dependent Makefile fragments come in here.
 ###
 
+.c.o:
+	$(CC) -c $(CFLAGS) $(HDEFINES) $(TDEFINES) $(CSEARCH) $(CSWITCHES) $< # -DINTEL960VERSION
+
 BFD_H=$(INCDIR)/bfd.h
 
 # C source files that correspond to .o's.
 CFILES = libbfd.c opncls.c bfd.c archive.c targets.c cache.c archures.c \
-	 coff-i386.c aout64.c aout32.c sunos.c demo64.c coff-i960.c srec.c \
+	 coff-i386.c aout64.c aout32.c sunos.c demo64.c coff-i960.c srec.c tekhex.c \
 	 oasys.c ieee.c coff-m68k.c coff-a29k.c coff-rs6000.c coff-msym.c \
 	 format.c section.c core.c syms.c stab-syms.c reloc.c init.c ctor.c seclet.c \
 	 coff-m88k.c coff-mips.c trad-core.c newsos3.c i386aout.c bout.c elf.c \
@@ -102,20 +104,20 @@ CFILES = libbfd.c opncls.c bfd.c archive.c targets.c cache.c archures.c \
 STAGESTUFF = $(TARGETLIB) $(OFILES)
 
 all: $(TARGETLIB) 
-	$(MAKE) subdir_do DO=all "DODIRS=$(SUBDIRS)"
+	@$(MAKE) subdir_do DO=all "DODIRS=$(SUBDIRS)"
 
 .NOEXPORT:
 
 check:
 
 info: force
-	$(MAKE) subdir_do DO=info "DODIRS=$(SUBDIRS)" "MAKEINFO=$(MAKEINFO)"
+	@$(MAKE) subdir_do DO=info "DODIRS=$(SUBDIRS)" "MAKEINFO=$(MAKEINFO)"
 
 clean-info:
-	$(MAKE) subdir_do DO=clean-info "DODIRS=$(SUBDIRS)"
+	@$(MAKE) subdir_do DO=clean-info "DODIRS=$(SUBDIRS)"
 	
 install-info: force
-	$(MAKE) subdir_do DO=install-info "DODIRS=$(SUBDIRS)"
+	@$(MAKE) subdir_do DO=install-info "DODIRS=$(SUBDIRS)"
 
 # HDEPFILES comes from the host config; TDEPFILES from the target config.
 OFILES = $(BFD_LIBS) $(BFD_BACKENDS) $(BFD_MACHINES) $(HDEPFILES) $(TDEPFILES)
@@ -127,10 +129,10 @@ $(TARGETLIB): $(OFILES)
 
 # When compiling targets.c, supply the default target info from configure.
 targets.o: targets.c
-	$(CC) $(CFLAGS) -c -DMINIMIZE=$(MINIMIZE) $(TDEFAULTS) $<
+	$(CC) $(CFLAGS) -c $(HDEFINES) $(TDEFINES) $(CSEARCH) $(CSWITCHES) -DMINIMIZE=$(MINIMIZE) $(TDEFAULTS) $<
 
 subdir_do: force
-	for i in $(DODIRS); do \
+	@for i in $(DODIRS); do \
 		if [ -d ./$$i ] ; then \
 			if (cd ./$$i; \
 				$(MAKE) \
@@ -138,7 +140,7 @@ subdir_do: force
 					"AR=$(AR)" \
 					"AR_FLAGS=$(AR_FLAGS)" \
 					"CC=$(CC)" \
-					"MINUS_G=$(MINUS_G)" \
+					"CFLAGS=$(CFLAGS)" \
 					"RANLIB=$(RANLIB)" \
 					"MAKEINFO=$(MAKEINFO)" \
 					"BISON=$(BISON)" $(DO)) ; then true ; \
@@ -146,42 +148,6 @@ subdir_do: force
 		else true ; fi ; \
 	done
 
-stage1: force
-	- mkdir stage1
-	- mv -f $(STAGESTUFF) stage1
-	$(MAKE) subdir_do DO=stage1 "DODIRS=$(SUBDIRS)"
-
-stage2: force
-	- mkdir stage2
-	- mv -f $(STAGESTUFF) stage2
-	$(MAKE) subdir_do DO=stage2 "DODIRS=$(SUBDIRS)"
-
-stage3: force
-	- mkdir stage3
-	- mv -f $(STAGESTUFF) stage3
-	$(MAKE) subdir_do DO=stage3 "DODIRS=$(SUBDIRS)"
-
-against=stage2
-
-comparison: force
-	for i in *.o ; do cmp $$i $(against)/$$i || exit 1 ; done
-	$(MAKE) subdir_do DO=comparison "DODIRS=$(SUBDIRS)"
-
-de-stage1: force
-	- (cd stage1 ; mv -f $(STAGESTUFF) ..)
-	- rmdir stage1
-	$(MAKE) subdir_do DO=de-stage1 "DODIRS=$(SUBDIRS)"
-
-de-stage2: force
-	- (cd stage2 ; mv -f $(STAGESTUFF) ..)
-	- rmdir stage2
-	$(MAKE) subdir_do DO=de-stage2 "DODIRS=$(SUBDIRS)"
-
-de-stage3: force
-	- (cd stage3 ; mv -f $(STAGESTUFF) ..)
-	- rmdir stage3
-	$(MAKE) subdir_do DO=de-stage3 "DODIRS=$(SUBDIRS)"
-
 tags etags: TAGS
 
 TAGS: force
@@ -258,7 +224,7 @@ install:
 	$(RANLIB) $(libdir)/libbfd.a
 	$(INSTALL_DATA) $(INCDIR)/bfd.h $(includedir)/bfd.h
 	[ -z "$(oldincludedir)" ] || $(INSTALL_DATA) $(INCDIR)/bfd.h $(oldincludedir)/bfd.h
-	$(MAKE) subdir_do DO=install "DODIRS=$(SUBDIRS)"
+	@$(MAKE) subdir_do DO=install "DODIRS=$(SUBDIRS)"
 
 # Target to uncomment host-specific lines in this makefile.  Such lines must
 # have the following string beginning in column 1: #__<hostname>__#
@@ -336,6 +302,7 @@ sunos.o : sunos.c aoutf1.h $(INCDIR)/bfd.h $(INCDIR)/obstack.h \
 demo64.o : demo64.c 
 
 srec.o : srec.c $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.h 
+tekhex.o : tekhex.c $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.h 
 oasys.o : oasys.c $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.h \
   $(INCDIR)/oasys.h liboasys.h 
 ieee.o : ieee.c $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.h \