aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPer Bothner <per@bothner.com>1992-05-22 22:36:35 +0000
committerPer Bothner <per@bothner.com>1992-05-22 22:36:35 +0000
commit5ff21fa5c000998c5a7c5094db1c739e1f4f1c1d (patch)
tree9e5aac0b2164784c587e64c7a7636d026cd014fb
parent91e25b4f8f14ebe408b603c829e2d0f8010ff13d (diff)
downloadgdb-5ff21fa5c000998c5a7c5094db1c739e1f4f1c1d.zip
gdb-5ff21fa5c000998c5a7c5094db1c739e1f4f1c1d.tar.gz
gdb-5ff21fa5c000998c5a7c5094db1c739e1f4f1c1d.tar.bz2
* Makefile.in: Use srcdir instead of VPATH in ldgram/ldlex
rules, since these are used when building a distribution. * Makefile.in (ldlex.c): Don't re-direct output, since that leaves a bogus output files if it fails.
-rw-r--r--ld/ChangeLog5
-rw-r--r--ld/Makefile.in13
2 files changed, 10 insertions, 8 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog
index c8c81cb..2b8bbfc 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,5 +1,10 @@
Fri May 22 13:47:19 1992 Per Bothner (bothner@cygnus.com)
+ * Makefile.in: Use srcdir instead of VPATH in ldgram/ldlex
+ rules, since these are used when building a distribution.
+ * Makefile.in (ldlex.c): Don't re-direct output, since that
+ leaves a bogus output files if it fails.
+
* config/sparc.mh: Fix HOSTING_LIBS so it has a chance of working.
* ldlex.c: Fix some unnecessary flex-specific-isms.
diff --git a/ld/Makefile.in b/ld/Makefile.in
index ec3b43c..ee7bcd0 100644
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -55,7 +55,7 @@ AR_FLAGS = qv
CFLAGS = -g
MAKEINFO = makeinfo
RANLIB = ranlib
-
+HOST_CC=$(CC)
BISON = `if [ -f ../bison/bison ] ; then echo ../bison/bison -y -L../bison/bison ; else echo bison -y ; fi`
LEX = `if [ -f ../flex/flex ] ; then echo ../flex/flex -S../flex/flex.skel ; else echo flex ; fi`
@@ -144,7 +144,7 @@ check: bootstrap
info: ld.info
ldgram.h ldgram.c: ldgram.y
- $(BISON) $(BISONFLAGS) -d $(VPATH)/ldgram.y
+ $(BISON) $(BISONFLAGS) -d $(srcdir)/ldgram.y
mv -f y.tab.c ldgram.c
mv -f y.tab.h ldgram.h
@@ -168,11 +168,8 @@ ldemul-list.h: Makefile
ldemul.o: ldemul-list.h
ldlex.c: ldlex.l
-# /lib/cpp -E -P $(INCLUDES) $(HDEFINES) $(TDEFINES) $(CDEFINES) $(VPATH)/ldlex.l >ldlex.p
-
- $(LEX) -I -Cem -t $(VPATH)/ldlex.l >ldlex.c
-# cp ldlex.q ldlex.c
-
+ $(LEX) -I -Cem $(srcdir)/ldlex.l
+ mv lex.yy.c ldlex.c
# These all start with ld__ so 'make clean' can find them.
@@ -340,7 +337,7 @@ ld-index.me: ld.me
######################################################################
./mkscript: $(srcdir)/mkscript.c
- $(CC) $(CFLAGS) $(INCLUDES) $(HDEFINES) $(TDEFINES) $(CDEFINES) $(LDFLAGS) -o mkscript $(srcdir)/mkscript.c $(LOADLIBES)
+ $(HOST_CC) -o mkscript $(srcdir)/mkscript.c
ldlex.c: ldlex.l ldgram.h
ldlex.o: ldlex.c ldgram.h