Changed the script rule from "mkscript" to "./mkscript".

[binutils.git] / ld / Makefile.in

diff --git a/ld/Makefile.in b/ld/Makefile.in
index 54ed70a16e1c18c034bed93a93fab01fbf218bbc..755964ba9fdbd9fa1be1bb4d9296a1d9446caf79 100644 (file)
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -23,14 +23,19 @@ INCLUDE     = $(srcdir)/../include
 INCLUDES = -I. -I$(srcdir)  -I$(INCLUDE) 
 DEBUG  = -g
 
+BISON = bison
+BISONFLAGS = -v
+
 SCRIPTS = ldgld68k.script ldgld68kUr.script ldgld68kr.script \
        ldgld.script ldgldUr.script ldgldr.script ldlnk960.script \
        ldlnk960r.script ldgld960.script \
-       ldgldm88kbcs.script ldgldm88kbcsUr.script ldgldm88kbcsr.script
+       ldgldm88kbcs.script ldgldm88kbcsUr.script ldgldm88kbcsr.script \
+       ldglda29k.script ldglda29kUr.script ldglda29kr.script
 
 PROCESSED_SCRIPTS = ldgld68k.x ldgld68kUr.x ldgld68kr.x ldgld.x \
        ldgldUr.x ldgldr.x ldlnk960.x ldlnk960r.x ldgld960.x \
-       ldgldm88kbcs.x ldgldm88kbcsUr.x ldgldm88kbcsr.x
+       ldgldm88kbcs.x ldgldm88kbcsUr.x ldgldm88kbcsr.x \
+       ldglda29k.x ldglda29kUr.x ldglda29kr.x
 
 #### target and host dependent Makefile fragments come in here.
 ###
@@ -47,7 +52,7 @@ LINTFLAGS =  $(INCLUDES) $(EXTRA_DEF)
 LD_PROG        = ld.new
 
 .script.x:
-       mkscript < $< >$*.x
+       ./mkscript < $< >$*.x
 
 # for self hosting
 GNUTARGET=a.out-sunos-big
@@ -55,23 +60,23 @@ LDEMULATION=gld
 BFDLIB=$(srcdir)/../bfd$(subdir)/libbfd.a
 LIBIBERTY=$(srcdir)/../libiberty$(subdir)/libiberty.a
 
-OFILES= ldgram.o ldlex.o ldlang.o ldmain.o ldwrite.o ldexp.o ldlnk960.o ldgld68k.o \
-       ldgldm88kbcs.o \
+OFILES= ldgram.o ldlex.o ldlang.o ldmain.o ldwarn.o ldwrite.o ldexp.o ldlnk960.o ldgld68k.o ldindr.o \
+       ldgldm88kbcs.o ldglda29k.o \
        ldgld.o ldgld960.o ldemul.o ldver.o ldmisc.o ldsym.o ldvanilla.o ldfile.o
 
-HEADERS=config.h ldmain.h ldmain.h ldmisc.h ldsym.h ldlang.h ldexp.h \
+HEADERS=config.h ldmain.h ldmain.h ldwarn.h ldmisc.h ldindr.h ldsym.h ldlang.h ldexp.h \
        ldlex.h ldwrite.h ldver.h ldemul.h ldfile.h ldgram.h ld.h
 
 MANSOURCES=ld.tex
 
-LDCSOURCES=ldlang.c ldmain.c ldwrite.c ldlnk960.c ldgld.c ldgld68k.c \
-       ldgldm88kbcs.c \
+LDCSOURCES=ldlang.c ldindr.c ldmain.c ldwrite.c ldwarn.c ldlnk960.c ldgld.c ldgld68k.c \
+       ldgldm88kbcs.c ldgld29k.c \
        ldgld960.c ldemul.c ldver.c ldmisc.c ldexp.c ldsym.c ldfile.c ldvanilla.c
 
-GENERATED_SOURCES=ldgramtb.c ldlex.c ldgramtb.h 
-GENERATED_HEADERS=ldgramtb.h
+GENERATED_SOURCES=ldgram.c ldlex.c ldgram.h 
+GENERATED_HEADERS=ldgram.h
 
-LDSOURCES=$(LDCSOURCES) ldgram.y ldlex.l ldgramtb.h
+LDSOURCES=$(LDCSOURCES) ldgram.y ldlex.l ldgram.h
 
 BFDSOURCES=../../bfd/common/*.c
 
@@ -84,12 +89,12 @@ all: Makefile $(PROCESSED_SCRIPTS) $(LD_PROG)
 
 $(PROCESSED_SCRIPTS): mkscript $(SCRIPTS)
 
-ldgramtb.o ldgramtb.h:ldgram.y
-       $(YACC) $<
-       mv y.tab.c ldgramtb.c
-       mv y.tab.h ldgramtb.h
-       $(CC) -c $(CFLAGS) ldgramtb.c
-       mv ldgramtb.o ldgram.o
+ldgram.c:ldgram.y
+       $(BISON) $(BISONFLAGS) -d $(VPATH)/ldgram.y -o ldgram.c
+
+ldlex.c:ldlex.l
+       lex -t $(VPATH)/ldlex.l >ldlex.c
+
 
 
 #$(BFDLIB): $(BFDSOURCES)
@@ -118,11 +123,12 @@ ld.dvi:ld.tex
 
 mkscript: mkscript.c
 
-
 ldgld.o: $(PROCESSED_SCRIPTS) ldgld.c 
 
-ldlex.c: ldlex.l ldgramtb.h
-ldlex.o: ldlex.c ldgramtb.h
+ldlex.c: ldlex.l ldgram.h
+ldlex.o: ldlex.c ldgram.h
+ldgram.o: ldgram.c
+ldgram.c:ldgram.y
 
 ldgld68k.x :ldgld68k.script 
 ldgld68kUr.x :ldgld68kUr.script 
@@ -137,6 +143,9 @@ ldgldm88kbcs.x :ldgldm88kbcs.script
 ldgldm88kbcsUr.x :ldgldm88kbcsUr.script 
 ldgldm88kbcsr.x:ldgldm88kbcsr.script
 ldgld68k.x:ldgld68k.script
+ldglda29k.x :ldglda29k.script 
+ldglda29kr.x :ldglda29kr.script 
+ldglda29kUr.x :ldglda29kUr.script 
 
 stage1:        force
        - mkdir stage1
@@ -153,6 +162,11 @@ stage3:    force
        - mv -f $(STAGESTUFF) stage3
        - (cd stage3 ; ln -s $(LD_PROG) ld)
 
+against=stage2
+
+comparison: force
+       for i in $(STAGESTUFF) ; do cmp $$i $(against)/$$i ; done
+
 de-stage1: force
        - (cd stage1 ; mv -f * ..)
        - rm ld
@@ -255,7 +269,7 @@ Makefile: $(srcdir)/Makefile.in $(srcdir)/configure
        (cd $(srcdir) ; \
                ./configure +destdir=$(destdir) \
                +norecurse \
-               `if [ "$(srcdir)" != "." ] ; then echo +f; fi` \
+               `if [ "$(srcdir)" != "." ] ; then echo +subdirs; fi` \
                $(host) +target=$(target))
 
 ### Local Variables: ***