From 75ff789515299b669a34897c227ba565d81e2440 Mon Sep 17 00:00:00 2001 From: "David D. Zuhn" Date: Wed, 16 Jun 1993 00:44:27 +0000 Subject: [PATCH] remove parentdir support --- bfd/ChangeLog | 4 ++++ bfd/Makefile.in | 24 ++++++++++++------------ bfd/doc/Makefile.in | 20 +++++++++++--------- 3 files changed, 27 insertions(+), 21 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index d9cf67c1d8..c56e48c955 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,7 @@ +Mon Jun 14 17:08:18 1993 david d `zoo' zuhn (zoo at rtl.cygnus.com) + + * Makefile.in (install): remove parentdir cruft + Mon Jun 14 19:04:09 1993 Stu Grossman (grossman@cygnus.com) * hppa.c (hppa_get_symbol_info): Remove redundant copy. diff --git a/bfd/Makefile.in b/bfd/Makefile.in index db3fe6a45a..28c9556968 100644 --- a/bfd/Makefile.in +++ b/bfd/Makefile.in @@ -80,6 +80,7 @@ BFD32_BACKENDS = aout32.o sunos.o newsos3.o mipsbsd.o aout-adobe.o \ coff-i960.o coff-a29k.o coff-m68k.o coff-i386.o coff-m88k.o \ coff-rs6000.o coff-h8300.o coff-h8500.o coff-z8k.o coff-we32k.o \ coff-mips.o coff-msym.o \ + elf.o \ elf32.o elf32-sparc.o elf32-i386.o elf32-i860.o elf32-m68k.o \ elf32-hppa.o \ bout.o \ @@ -272,17 +273,11 @@ roll: force: install: - -parent=`echo $(libdir)|sed -e 's@/[^/]*$$@@'`; \ - if [ -d $$parent ] ; then true ; else mkdir $$parent ; fi - -if [ -d $(libdir) ] ; then true ; else mkdir $(libdir) ; fi $(INSTALL_DATA) libbfd.a $(libdir)/libbfd.a $(RANLIB) $(libdir)/libbfd.a - -parent=`echo $(includedir)|sed -e 's@/[^/]*$$@@'`; \ - if [ -d $$parent ] ; then true ; else mkdir $$parent ; fi - -if [ -d $(includedir) ] ; then true ; else mkdir $(includedir) ; fi - # Install BFD include file, and others that it needs. Install them - # both in GCC's include directory, and in the system include dir - # if configured as $(oldincludedir) -- which it usually isnt. +# Install BFD include file, and others that it needs. Install them +# both in GCC's include directory, and in the system include dir +# if configured as $(oldincludedir) -- which it usually isnt. $(INSTALL_DATA) bfd.h $(includedir)/bfd.h $(INSTALL_DATA) $(INCDIR)/ansidecl.h $(includedir)/ansidecl.h $(INSTALL_DATA) $(INCDIR)/obstack.h $(includedir)/obstack.h @@ -314,12 +309,16 @@ gen-aout: $(srcdir)/gen-aout.c Makefile BFDIN_H= $(srcdir)/bfd-in2.h -bfd.h: $(BFDIN_H) Makefile - sed -e 's/@WORDSIZE@/$(WORDSIZE)/' < $(BFDIN_H) > bfd.h +bfd.h: stmp-bfd.h ; @true + +stmp-bfd.h : $(BFDIN_H) Makefile + sed -e 's/@WORDSIZE@/$(WORDSIZE)/' < $(BFDIN_H) > bfd.h2 + $(srcdir)/../move-if-change bfd.h2 bfd.h + touch stmp-bfd.h headers: (cd $(docdir); $(MAKE) protos $(FLAGS_TO_PASS)) - # Could really use a "copy-if-change"... +# Could really use a "copy-if-change"... cp $(docdir)/bfd.h bfd.h-new $(srcdir)/../move-if-change bfd.h-new $(BFDIN_H) cp $(docdir)/libbfd.h libbfd.h-new @@ -438,6 +437,7 @@ bout.o : bout.c bfd.h $(INCDIR)/obstack.h libbfd.h \ $(INCDIR)/bout.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def libaout.h mipsbsd.o : mipsbsd.c bfd.h $(INCDIR)/obstack.h \ libbfd.h libaout.h +elf.o : bfd.h $(INCDIR)/obstack.h elf32.o : elf32.c elfcode.h libelf.h libbfd.h bfd.h \ $(INCDIR)/obstack.h elf32-sparc.o : elf32-sparc.c libelf.h libbfd.h bfd.h \ diff --git a/bfd/doc/Makefile.in b/bfd/doc/Makefile.in index f489aee3c2..a2bc308939 100644 --- a/bfd/doc/Makefile.in +++ b/bfd/doc/Makefile.in @@ -55,6 +55,8 @@ TEXI2DVI = texi2dvi RANLIB = ranlib CFLAGS = -g +CC_FOR_BUILD = $(CC) + #### Host, target, and site specific Makefile fragments come in here. ### @@ -114,17 +116,17 @@ info: bfd.info dvi: bfd.dvi install-info: info - -parent=`echo $(infodir)|sed -e 's@/[^/]*$$@@'`; \ - if [ -d $$parent ] ; then true ; else mkdir $$parent ; fi - -if [ -d $(infodir) ] ; then true ; else mkdir $(infodir) ; fi for i in *.info* ; do \ $(INSTALL_DATA) $$i $(infodir)/$$i ; \ done docs: $(MKDOC) protos bfd.info bfd.dvi bfd.ps -$(MKDOC): chew.c - $(CC) $(CFLAGS) -o $(MKDOC) $(H_CFLAGS) -I.. -I$(srcdir)/.. -I$(srcdir)/../../include $(srcdir)/chew.c $(LOADLIBES) +$(MKDOC): chew.o + $(CC_FOR_BUILD) $(CFLAGS) -o $(MKDOC) $(H_CFLAGS) chew.o $(LOADLIBES) + +chew.o: chew.c + $(CC_FOR_BUILD) $(CFLAGS) -c $(H_CFLAGS) -I.. -I$(srcdir)/.. -I$(srcdir)/../../include $(srcdir)/chew.c protos: libbfd.h libcoff.h bfd.h @@ -187,7 +189,7 @@ libbfd.h: $(srcdir)/../libbfd-in.h \ $(srcdir)/../cpu-h8300.c \ $(srcdir)/../cpu-i960.c \ $(srcdir)/../archures.c \ - $(srcdir)/../elf32.c \ + $(srcdir)/../elfcode.h \ $(MKDOC) cat $(srcdir)/../libbfd-in.h >libbfd.h $(MKDOC) -i -f $(srcdir)/proto.str < $(srcdir)/../init.c >>libbfd.h @@ -199,7 +201,7 @@ libbfd.h: $(srcdir)/../libbfd-in.h \ $(MKDOC) -i -f $(srcdir)/proto.str < $(srcdir)/../cpu-h8300.c >>libbfd.h $(MKDOC) -i -f $(srcdir)/proto.str < $(srcdir)/../cpu-i960.c >>libbfd.h $(MKDOC) -i -f $(srcdir)/proto.str < $(srcdir)/../archures.c >>libbfd.h - $(MKDOC) -i -f $(srcdir)/proto.str < $(srcdir)/../elf32.c >>libbfd.h + $(MKDOC) -i -f $(srcdir)/proto.str < $(srcdir)/../elfcode.h >>libbfd.h libcoff.h: $(srcdir)/../libcoff-in.h \ $(srcdir)/../coffcode.h \ @@ -242,7 +244,7 @@ bfd.h: $(srcdir)/../bfd-in.h \ clean-info: clean mostlyclean: - rm -rf *.log *.ps *~* *.dvi *# $(MKDOC) + rm -rf *.log *.ps *~* *.dvi *# $(MKDOC) *.o clean: mostlyclean rm -rf $(STAGESTUFF) @@ -258,7 +260,7 @@ bfd.info: $(DOCFILES) bfd.texinfo $(MAKEINFO) -o bfd.info $(srcdir)/bfd.texinfo bfd.dvi: $(DOCFILES) bfd.texinfo - $(TEXI2DVI) $(srcdir)/bfd.texino + $(TEXI2DVI) $(srcdir)/bfd.texinfo bfd.ps: bfd.dvi dvips bfd -o