rework CFLAGS such that they can be passed on command line to make

2 files changed, 13 insertions, 18 deletions

diff --git a/ld/ChangeLog b/ld/ChangeLog
index c13046e..d1d09b3 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -3,6 +3,11 @@ Wed Apr 22 12:48:42 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
 	* ldlex.l: added CMDFILENAMECHAR state so that you can lex
 	different sorts of filenames on the command line than in a script.
 
+Mon Apr 20 22:37:04 1992  K. Richard Pixley  (rich@rtl.cygnus.com)
+
+	* Makefile.in: rework CFLAGS so that they can be passed on the
+	  make command line.  Remove MINUS_G.  Default CFLAGS to -g.
+
 Fri Apr 17 08:57:17 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
 
 	* relax.c: added handling for new "padding" seclet type, used to
diff --git a/ld/Makefile.in b/ld/Makefile.in
index 1a3317c..d320ec5 100644
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -53,10 +53,11 @@ INSTALL_DATA = $(INSTALL)
 
 AR = ar
 AR_FLAGS = qv
+CFLAGS = -g
 BISON = bison -y
 MAKEINFO = makeinfo
 RANLIB = ranlib
-LEX = `if [ -f ../flex/flex ] ; then echo ../flex/flex ; else echo flex ; fi`
+LEX = `if [ -f ../flex/flex ] ; then echo ../flex/flex -S$(srcdir)/../flex/flex.skel ; else echo flex ; fi`
 
 #version=/`./../gcc/gcc -dumpversion`
 version=
@@ -70,7 +71,6 @@ LIB_PATH =
 BASEDIR	= ../..
 INCLUDE	= $(srcdir)/../include
 INCLUDES = -I. -I$(srcdir)  -I$(INCLUDE) 
-MINUS_G	= -g
 
 # Where to find texinfo.tex to format docn with TeX
 TEXIDIR = $(srcdir)/../texinfo/fsf
@@ -88,11 +88,13 @@ ROFF = groff
 ### Host, target, and site specific Makefile fragments come in here.
 ###
 
-CFLAGS	= $(INCLUDES) $(MINUS_G) $(HDEFINES) $(TDEFINES) $(CDEFINES)
 LINTFLAGS =  $(INCLUDES) $(EXTRA_DEF) 
 
 .SUFFIXES: .y .x .xr .xu .xn .xbn .sc .scu .scr .scn $(SUFFIXES)
 
+.c.o:
+	$(CC) -c $(CFLAGS) $(INCLUDES) $(HDEFINES) $(TDEFINES) $(CDEFINES) $<
+
 # go directly to ld.new in case this ld isn't capable of
 # linking native object on this host.  It can be renamed on
 # install.
@@ -147,7 +149,7 @@ ldgram.h ldgram.c: ldgram.y
 	mv -f y.tab.h ldgram.h
 
 ldmain.o: ldmain.c
-	$(CC) $(CFLAGS) -DDEFAULT_EMULATION='"$(EMUL)"' -c $<
+	$(CC) $(CFLAGS) $(INCLUDES) $(HDEFINES) $(TDEFINES) $(CDEFINES) -DDEFAULT_EMULATION='"$(EMUL)"' -c $<
 
 ldemul-list.h:  Makefile
 	(echo "/* This file is automatically generated.  DO NOT EDIT! */";\
@@ -223,7 +225,7 @@ ld__gld960.c: $(srcdir)/gld960.sh \
 	${GENSCRIPTS} gld960.sh
 
 $(LD_PROG): $(OFILES) $(BFDLIB) $(LIBIBERTY)
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $(LD_PROG) $(OFILES) $(BFDLIB) $(LIBIBERTY) $(LOADLIBES)
+	$(CC) $(CFLAGS) $(INCLUDES) $(HDEFINES) $(TDEFINES) $(CDEFINES) $(LDFLAGS) -o $(LD_PROG) $(OFILES) $(BFDLIB) $(LIBIBERTY) $(LOADLIBES)
 
 # Rules for testing by relinking ld itself.
 
@@ -334,7 +336,7 @@ ld-index.me: ld.me
 ######################################################################
 
 ./mkscript: $(srcdir)/mkscript.c
-	$(CC) $(CFLAGS) $(LDFLAGS) -o mkscript $(srcdir)/mkscript.c $(LOADLIBES)
+	$(CC) $(CFLAGS) $(INCLUDES) $(HDEFINES) $(TDEFINES) $(CDEFINES) $(LDFLAGS) -o mkscript $(srcdir)/mkscript.c $(LOADLIBES)
 
 ldlex.c: ldlex.l ldgram.h
 ldlex.o: ldlex.c ldgram.h
@@ -421,18 +423,6 @@ install-info: info
 clean-info:
 	-rm -rf *.info*
 
-# Something like the following might make sense for install, but doesn't work
-# - it is too fragile, depending on a gcc binary int the right place.
-# Perhaps using gcc/version.c might work?
-#	# If $(gcclibdir) exists, install ld there, and put a link to it
-#	# from $(bindir);  otherwise put ld in $(bindir).
-#	if ([ -x ./../gcc/gcc -a -d $(gcclibdir) ]); then \
-#	    $(INSTALL_PROGRAM) ld.new $(gcclibdir)/ld; \
-#	    cd $(bindir); rm -f ld; ln -s $(gcclibdir)/ld ld; \
-#	else \
-#	    $(INSTALL_PROGRAM) ld.new $(bindir)/ld;  \
-#	fi
-
 #-----------------------------------------------------------------------------
 #		'STANDARD' GNU/960 TARGETS BELOW THIS POINT
 #