* Makefile.in: add TEXINPUTS variable and use it in ld.dvi target

2 files changed, 114 insertions, 35 deletions

diff --git a/ld/ChangeLog b/ld/ChangeLog
index cb02b84..d1ae120 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,7 @@
+Tue Sep  7 18:04:54 1993  Jeffrey Osier  (jeffrey@cygnus.com)
+
+	* Makefile.in:  add TEXINPUTS variable and use it in ld.dvi target
+
 Fri Sep  3 16:46:41 1993  Roland H. Pesch  (pesch@fowanton.cygnus.com)
 
 	* ld.texinfo: re-enable included config file; conditionalize doc
diff --git a/ld/Makefile.in b/ld/Makefile.in
index ebdc814..6230cb4 100644
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -77,9 +77,10 @@ version=
 # which may have the form: LIB_PATH=/lib:/usr/local/lib
 LIB_PATH =
 
-BASEDIR	= ../..
-INCLUDE	= $(srcdir)/../include
-INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../bfd -I../bfd -I$(INCLUDE) 
+BASEDIR = $(srcdir)/..
+BFDDIR = $(BASEDIR)/bfd
+INCDIR	= $(BASEDIR)/include
+INCLUDES = -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR)
 
 # What version of the manual to build
 DOCVER = gen
@@ -87,6 +88,9 @@ DOCVER = gen
 # Where to find texinfo.tex to format docn with TeX
 TEXIDIR = $(srcdir)/../texinfo/fsf
 
+# Where to find other docs needed to format with TeX
+TEXINPUTS = $(TEXIDIR):$(BFDDIR)/doc:$(srcdir)
+
 # Whether to get roff to put indexing entries on stderr
 TEXI2OPT =
 # You neeed this to generate ld-index.ms (or .mm or .me)
@@ -130,8 +134,8 @@ LINTFLAGS =  $(INCLUDES) $(EXTRA_DEF)
 LD_PROG	= ld.new
 
 # for self hosting
-BFDLIB=./../bfd/libbfd.a
-LIBIBERTY=./../libiberty/libiberty.a
+BFDLIB = ../bfd/libbfd.a
+LIBIBERTY = ../libiberty/libiberty.a
 
 ALL_EMULATIONS=em_lnk960.o em_sun3.o em_i386aout.o em_go32.o \
 	em_m88kbcs.o em_a29k.o em_news.o em_hp300bsd.o em_hp3hpux.o \
@@ -142,7 +146,8 @@ ALL_EMULATIONS=em_lnk960.o em_sun3.o em_i386aout.o em_go32.o \
 	em_hppaosf.o em_mipsidtl.o em_sh.o \
 	$(OTHER_EMULATIONS)
 
-EMULATION_OFILES=${ALL_EMULATIONS}
+# This is now set by configure.in.
+#EMULATION_OFILES=${ALL_EMULATIONS}
 
 OFILES= ldgram.o ldlex.o lexsup.o ldlang.o mri.o ldctor.o ldmain.o ldindr.o \
 	ldwarn.o ldwrite.o ldexp.o  ldemul.o ldver.o ldmisc.o ldsym.o \
@@ -169,7 +174,7 @@ BFDSOURCES=../../bfd/common/*.c
 SOURCES= $(LDSOURCES) $(BFDSOURCES)
 LINTSOURCES=   $(LDCSOURCES) $(BFDSOURCES) $(GENERATED_SOURCES)
 
-STAGESTUFF = ldscripts/* $(GENERATED_SOURCES) $(GENERATED_HEADERS) $(OFILES)
+STAGESTUFF = *.o ldscripts/* $(GENERATED_SOURCES) $(GENERATED_HEADERS)
 
 all: $(LD_PROG)
 
@@ -188,7 +193,13 @@ DEF_EMUL = ` if [ -z "$(EMUL)" ] ; then \
 	       echo -DDEFAULT_EMULATION='"$(EMUL)"' ; \
              fi`
 
-ldmain.o: ldmain.c
+ldmain.o: ldmain.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
+  $(INCDIR)/obstack.h ../bfd/sysdep.h $(BFDDIR)/hosts/std-host.h \
+  $(INCDIR)/fopen-same.h config.h ld.h \
+  ldmain.h ldmisc.h ldwrite.h ./ldgram.h \
+  ldsym.h ldlang.h ldemul.h ldlex.h \
+  ldfile.h ldindr.h ldwarn.h ldctor.h \
+  lderror.h 
 	$(CC) -c $(INCLUDES) $(HDEFINES) $(TDEFINES) $(CDEFINES) $(DEF_EMUL) -DSCRIPTDIR='"$(scriptdir)"' $(CFLAGS) $<
 
 ldemul-list.h: Makefile
@@ -205,8 +216,6 @@ ldemul-list.h: Makefile
 	done;\
 	echo "  0") >ldemul-list.h
 
-ldemul.o: ldemul-list.h
-
 ldlex.c: ldlex.l ldgram.h
 	$(LEX) -I -Cem $(srcdir)/ldlex.l
 	mv lex.yy.c ldlex.c
@@ -308,7 +317,90 @@ em_mipsidtl.c: $(srcdir)/emulparams/mipsidtl.sh \
 	${GENSCRIPTS} mipsidtl
 
 $(LD_PROG): $(OFILES) $(BFDLIB) $(LIBIBERTY)
-	$(CC) $(INCLUDES) $(HDEFINES) $(TDEFINES) $(CDEFINES) $(LDFLAGS) -o $(LD_PROG) $(OFILES) $(BFDLIB) $(LIBIBERTY) $(LOADLIBES) $(CFLAGS)
+	$(CC) $(INCLUDES) $(HDEFINES) $(TDEFINES) $(CDEFINES) $(LDFLAGS) -o $(LD_PROG) $(OFILES) $(BFDLIB) $(LIBIBERTY) $(LOADLIBES)
+
+# This list of dependencies was generated by doing a make with gcc -MM
+# saving the output in a file and removing the gcc commands
+# changing "../../devo/ld/../bfd" to "$(BFDDIR)"
+# removing "../../devo/ld/"
+# changing "../include" to "$(INCDIR)"
+
+ldgram.o: ldgram.c ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/obstack.h \
+  ../bfd/sysdep.h $(BFDDIR)/hosts/std-host.h $(INCDIR)/fopen-same.h \
+  ld.h ldexp.h ldver.h ldlang.h \
+  ldemul.h ldfile.h ldmisc.h mri.h 
+ldlex.o: ldlex.c ../bfd/bfd.h $(INCDIR)/obstack.h ./ldgram.h 
+lexsup.o: lexsup.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
+  $(INCDIR)/obstack.h ../bfd/sysdep.h $(BFDDIR)/hosts/std-host.h \
+  $(INCDIR)/fopen-same.h ldlex.h ld.h \
+  ldexp.h ./ldgram.h ldmisc.h 
+ldlang.o: ldlang.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
+  $(INCDIR)/obstack.h ../bfd/sysdep.h $(BFDDIR)/hosts/std-host.h \
+  $(INCDIR)/fopen-same.h ld.h ldmain.h \
+  ldsym.h ./ldgram.h ldwarn.h ldlang.h \
+  ldexp.h ldemul.h ldlex.h ldmisc.h \
+  ldindr.h ldctor.h 
+mri.o: mri.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
+  $(INCDIR)/obstack.h ../bfd/sysdep.h $(BFDDIR)/hosts/std-host.h \
+  $(INCDIR)/fopen-same.h ld.h ldlang.h \
+  mri.h ./ldgram.h ldexp.h 
+ldctor.o: ldctor.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
+  $(INCDIR)/obstack.h ../bfd/sysdep.h $(BFDDIR)/hosts/std-host.h \
+  $(INCDIR)/fopen-same.h ld.h ldlang.h \
+  ldsym.h ldmisc.h ldexp.h ./ldgram.h 
+ldmain.o: ldmain.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
+  $(INCDIR)/obstack.h ../bfd/sysdep.h $(BFDDIR)/hosts/std-host.h \
+  $(INCDIR)/fopen-same.h config.h ld.h \
+  ldmain.h ldmisc.h ldwrite.h ./ldgram.h \
+  ldsym.h ldlang.h ldemul.h ldlex.h \
+  ldfile.h ldindr.h ldwarn.h ldctor.h \
+  lderror.h 
+ldindr.o: ldindr.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
+  $(INCDIR)/obstack.h ../bfd/sysdep.h $(BFDDIR)/hosts/std-host.h \
+  $(INCDIR)/fopen-same.h ld.h ldsym.h \
+  ldmisc.h 
+ldwarn.o: ldwarn.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
+  $(INCDIR)/obstack.h ../bfd/sysdep.h $(BFDDIR)/hosts/std-host.h \
+  $(INCDIR)/fopen-same.h ldsym.h ldwarn.h \
+  ldmisc.h 
+ldwrite.o: ldwrite.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
+  $(INCDIR)/obstack.h ../bfd/sysdep.h $(BFDDIR)/hosts/std-host.h \
+  $(INCDIR)/fopen-same.h ldlang.h ld.h \
+  ldwrite.h ldmisc.h ldsym.h ./ldgram.h \
+  relax.h 
+ldexp.o: ldexp.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
+  $(INCDIR)/obstack.h ../bfd/sysdep.h $(BFDDIR)/hosts/std-host.h \
+  $(INCDIR)/fopen-same.h ld.h ldmain.h \
+  ldmisc.h ldexp.h ./ldgram.h ldsym.h \
+  ldlang.h 
+ldemul.o: ldemul.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
+  $(INCDIR)/obstack.h ../bfd/sysdep.h $(BFDDIR)/hosts/std-host.h \
+  $(INCDIR)/fopen-same.h config.h ld.h \
+  ldemul.h ldmisc.h ./ldemul-list.h 
+ldver.o: ldver.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
+  $(INCDIR)/obstack.h ../bfd/sysdep.h $(BFDDIR)/hosts/std-host.h \
+  $(INCDIR)/fopen-same.h ldver.h ldemul.h 
+ldmisc.o: ldmisc.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
+  $(INCDIR)/obstack.h ../bfd/sysdep.h $(BFDDIR)/hosts/std-host.h \
+  $(INCDIR)/fopen-same.h ld.h ldmisc.h \
+  ldlang.h ldlex.h 
+ldsym.o: ldsym.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
+  $(INCDIR)/obstack.h ../bfd/sysdep.h $(BFDDIR)/hosts/std-host.h \
+  $(INCDIR)/fopen-same.h ld.h ldsym.h \
+  ldmisc.h ldlang.h 
+ldfile.o: ldfile.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
+  $(INCDIR)/obstack.h ../bfd/sysdep.h $(BFDDIR)/hosts/std-host.h \
+  $(INCDIR)/fopen-same.h ldmisc.h ldlang.h \
+  ldfile.h 
+relax.o: relax.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
+  $(INCDIR)/obstack.h $(BFDDIR)/seclet.h $(INCDIR)/coff/internal.h \
+  ../bfd/sysdep.h $(BFDDIR)/hosts/std-host.h $(INCDIR)/fopen-same.h \
+  ldlang.h ld.h ldwrite.h ldmisc.h \
+  ldsym.h ./ldgram.h relax.h 
+lderror.o: lderror.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
+  $(INCDIR)/obstack.h ../bfd/sysdep.h $(BFDDIR)/hosts/std-host.h \
+  $(INCDIR)/fopen-same.h $(BFDDIR)/seclet.h ld.h \
+  ldmisc.h 
 
 # START OF CHECK TARGETS
 site.exp: ./config.status Makefile
@@ -334,6 +426,10 @@ site.exp: ./config.status Makefile
 	@echo "set objdir `pwd`" >> ./tmp0
 	@echo "set tool ld" >> ./tmp0
 	@echo "" >> ./tmp0	
+	@echo "# GCC DEPENDANCIES" >> ./tmp0	
+	@echo "set CC \"${CC}\"" >> ./tmp0
+	@echo "set CXX \"${C++}\"" >> ./tmp0
+	@echo "set CFLAGS \"${CFLAGS}\"" >> ./tmp0
 	@echo "# LD DEPENDANCIES" >> ./tmp0	
 	@echo "set OFILES \"${OFILES}\"" >> ./tmp0
 	@echo "set BFDLIB \"${BFDLIB}\"" >> ./tmp0
@@ -348,9 +444,7 @@ site.exp: ./config.status Makefile
 			-e '1,/^## Variables generated by.*##/ d' >> site.exp
 	-@rm -f ./tmp?
 
-check: bootstrap check-cdtest
-
-new-check: ld.new site.exp
+check: ld.new site.exp
 	$(RUNTEST) $(RUNTESTFLAGS)
 
 installcheck:
@@ -396,7 +490,7 @@ configdoc.texi:	${DOCVER}-doc.texi
 
 # TeX output
 dvi: ld.dvi
-ld.dvi: $(srcdir)/ld.texinfo
+ld.dvi: $(srcdir)/ld.texinfo $(srcdir)/configdoc.texi
 	$(TEXI2DVI) $(srcdir)/ld.texinfo
 
 ldint.dvi: $(srcdir)/ldint.texinfo
@@ -404,7 +498,7 @@ ldint.dvi: $(srcdir)/ldint.texinfo
 
 # info file for online browsing
 ld.info: $(srcdir)/ld.texinfo configdoc.texi
-	$(MAKEINFO) -I$(srcdir)/../bfd/doc -o ld.info $(srcdir)/ld.texinfo
+	$(MAKEINFO) -I$(BFDDIR)/doc -o ld.info $(srcdir)/ld.texinfo
 
 ldint.info: $(srcdir)/ldint.texinfo
 	$(MAKEINFO) -o ldint.info $(srcdir)/ldint.texinfo
@@ -483,23 +577,6 @@ ld-index.me: ld.me
 		sed -e '/: warning:/d' | \
 		texi2index >ld-index.me
 
-
-ldlex.o: ldlex.c ldgram.h
-ldgram.o: ldgram.c
-ldexp.o: ldexp.c ldgram.h
-ldctor.o: ldctor.c ldgram.h
-ldlang.o: ldlang.c ldgram.h
-ldmain.o: ldmain.c ldgram.h
-ldwrite.o: ldwrite.c ldgram.h
-lexsup.o: lexsup.c ldgram.h
-mri.o: mri.c ldgram.h
-relax.o: relax.c ldgram.h
-
-h8300.o:h8300.c
-h8300xray.o:h8300xray.c
-st2000.o:st2000.c
-z8ksim.o:z8ksim.c
-
 stage1:	force
 	-mkdir stage1
 	-mv -f $(STAGESTUFF) $(LD_PROG) stage1
@@ -565,8 +642,6 @@ tags TAGS:$(SOURCES) $(HEADERS)
 	etags -t $?
 
 
-objdump:objdump.c 
-
 .PHONY: install
 install: 
 	$(INSTALL_XFORM) ld.new $(bindir)/ld