diff options
| author | Ian Lance Taylor <ian@airs.com> | 1995-09-04 21:14:33 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@airs.com> | 1995-09-04 21:14:33 +0000 |
| commit | 109eb06cce362f040b062107897826fc1b01431e (patch) | |
| tree | c21a264542fbf94717a76ccf557cac4c6ec29116 /binutils | |
| parent | f515fb2f93d81fb401d86f9db2bf3c96cd659737 (diff) | |
| download | gdb-109eb06cce362f040b062107897826fc1b01431e.zip gdb-109eb06cce362f040b062107897826fc1b01431e.tar.gz gdb-109eb06cce362f040b062107897826fc1b01431e.tar.bz2 | |
* configure.in (host_makefile_frag): Don't set. Substitute for
@CC@, @CFLAGS@, @HDEFINES@ and @LDFLAGS@ in Makefile.
* Makefile.in (AR_FLAGS): Set to rc rather than qv.
(CC): Define as @CC@.
(CFLAGS): Set to @CFLAGS@.
(LDFLAGS): Define as @LDFLAGS@.
(ALL_CFLAGS): Use @HDEFINES@ rather than $(HDEFINES).
Diffstat (limited to 'binutils')
| -rw-r--r-- | binutils/ChangeLog | 8 | ||||
| -rw-r--r-- | binutils/Makefile.in | 8 | ||||
| -rw-r--r-- | binutils/configure.in | 14 |
3 files changed, 21 insertions, 9 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 0f8695d..ebb9ff6 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,5 +1,13 @@ Mon Sep 4 14:30:00 1995 Ian Lance Taylor <ian@cygnus.com> + * configure.in (host_makefile_frag): Don't set. Substitute for + @CC@, @CFLAGS@, @HDEFINES@ and @LDFLAGS@ in Makefile. + * Makefile.in (AR_FLAGS): Set to rc rather than qv. + (CC): Define as @CC@. + (CFLAGS): Set to @CFLAGS@. + (LDFLAGS): Define as @LDFLAGS@. + (ALL_CFLAGS): Use @HDEFINES@ rather than $(HDEFINES). + * configure.in: Don't bother to call config.bfd for each target. Just call it for the default target, and use the shell variable to decide whether underscores are used. diff --git a/binutils/Makefile.in b/binutils/Makefile.in index 0588671..961d783 100644 --- a/binutils/Makefile.in +++ b/binutils/Makefile.in @@ -51,8 +51,10 @@ INSTALL_XFORM = $(INSTALL) -t='$(program_transform_name)' INSTALL_XFORM1 = $(INSTALL_XFORM) -b=.1 AR = ar -AR_FLAGS = qv -CFLAGS = -g +AR_FLAGS = rc +CC = @CC@ +CFLAGS = @CFLAGS@ +LDFLAGS = @LDFLAGS@ MAKEINFO = makeinfo TEXI2DVI = texi2dvi RANLIB = ranlib @@ -127,7 +129,7 @@ INCLUDES = -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) #### host and target dependant Makefile fragments come in here. ### -ALL_CFLAGS = $(INCLUDES) $(HDEFINES) $(TDEFINES) $(CFLAGS) +ALL_CFLAGS = $(INCLUDES) @HDEFINES@ $(TDEFINES) $(CFLAGS) .c.o: $(CC) -c $(ALL_CFLAGS) $< diff --git a/binutils/configure.in b/binutils/configure.in index 9177beb..878aa28 100644 --- a/binutils/configure.in +++ b/binutils/configure.in @@ -10,11 +10,6 @@ srcname="Binutils" . ${srcdir}/../bfd/configure.host -host_makefile_frag= -if [ -f ${srcdir}/../bfd/config/${my_host}.mh ] ; then - host_makefile_frag=../bfd/config/${my_host}.mh -fi - # per-target: # Canonicalize the secondary target names. @@ -115,6 +110,13 @@ else fi echo "UNDERSCORE = ${underscore}" >> Makefile.2 -cat Makefile.tmp >> Makefile.2 +test -z "$CC" && CC=`egrep '^CC *=' ../Makefile | tail -1 | sed 's/^CC *= *//'` +test -z "$CC" && CC=cc +test -z "$CFLAGS" && CFLAGS=-g +sed -e "s%@CC@%${CC}%" \ + -e "s%@CFLAGS@%${CFLAGS}%" \ + -e "s%@HDEFINES@%${HDEFINES}%" \ + -e "s%@LDFLAGS@%${LDFLAGS}%" < Makefile.tmp >> Makefile.2 + rm -f Makefile.tmp mv Makefile.2 Makefile |