From a26878d1fa4278e70b4639a2efd3e98d4a29fb6b Mon Sep 17 00:00:00 2001 From: "K. Richard Pixley" Date: Tue, 1 Oct 1991 03:46:00 +0000 Subject: [PATCH] Exploit the new executable config.status --- Makefile.in | 14 +++--- bfd/Makefile.in | 105 +++++++++++++++++++++---------------------- binutils/Makefile.in | 17 +++---- gas/Makefile.in | 22 ++++----- ld/Makefile.in | 8 +--- 5 files changed, 76 insertions(+), 90 deletions(-) diff --git a/Makefile.in b/Makefile.in index 5901c4d624e..6d0b4186349 100644 --- a/Makefile.in +++ b/Makefile.in @@ -16,7 +16,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ # -# Last Mod Tue Sep 24 21:25:57 PDT 1991, by rich@cygnus.com +# Last Mod Mon Sep 30 20:40:01 PDT 1991, by rich@cygnus.com # # $Id$ @@ -191,11 +191,8 @@ force: # with the gnu make, this is done automatically. -Makefile: $(srcdir)/Makefile.in $(srcdir)/configure - (cd $(srcdir) ; \ - ./configure +destdir=$(destdir) +norecurse \ - `if [ "$(srcdir)" != "." ] ; then echo +subdirs; fi` \ - $(host) +target=$(target)) +Makefile: $(srcdir)/Makefile.in $(srcdir)/configure $(host_makefile_frag) $(target_makefile_frag) + $(SHELL) ./config.status # # Build GDB distributions that contain BFD, Include, Libiberty, Readline, etc @@ -241,7 +238,10 @@ force_update: # # $Log$ -# Revision 1.35 1991/09/25 04:34:40 rich +# Revision 1.36 1991/10/01 03:45:39 rich +# Exploit the new executable config.status +# +# Revision 1.35 1991/09/25 04:34:40 rich # Pass command names with absolute paths. Easier than keeping relative # paths right when dealing with sub/sub/directories. # diff --git a/bfd/Makefile.in b/bfd/Makefile.in index 859db344610..136de67e571 100644 --- a/bfd/Makefile.in +++ b/bfd/Makefile.in @@ -1,5 +1,5 @@ # Makefile template for Configure for the BFD library. -# Copyright (C) 1990-1991 Free Software Foundation, Inc. +# Copyright (C) 1990, 1991 Free Software Foundation, Inc. # Written by Cygnus Support. # # This file is part of BFD, the Binary File Descriptor library. @@ -185,12 +185,8 @@ make: echo >>Makefile ; \ sed "s/^#__$(HOST)__#//" < Makefile.old >>Makefile -Makefile: $(srcdir)/Makefile.in $(srcdir)/configure - (cd $(srcdir) ; \ - ./configure +norecurse \ - +destdir=$(destdir) \ - `if [ "$(srcdir)" != "." ] ; then echo +subdirs; fi` \ - $(host) +target=$(target);) +Makefile: $(srcdir)/Makefile.in $(srcdir)/configure $(host_makefile_frag) $(target_makefile_frag) + $(SHELL) ./config.status dep: $(CFILES) mkdep $(CFLAGS) $? @@ -221,56 +217,57 @@ bfd.ps: # DO NOT DELETE THIS LINE -- mkdep uses it. # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. -libbfd.o : libbfd.c ../include/bfd.h ../include/obstack.h libbfd.h -opncls.o : opncls.c ../include/bfd.h ../include/obstack.h libbfd.h -bfd.o : bfd.c ../include/bfd.h ../include/obstack.h libbfd.h -archive.o : archive.c ../include/bfd.h ../include/obstack.h libbfd.h \ - ../include/ar.h ../include/ranlib.h -targets.o : targets.c ../include/bfd.h ../include/obstack.h libbfd.h -cache.o : cache.c ../include/bfd.h ../include/obstack.h libbfd.h -archures.o : archures.c ../include/bfd.h ../include/obstack.h -i386coff.o : i386coff.c ../include/bfd.h ../include/obstack.h libbfd.h \ - ../include/i386coff.h ../include/internalcoff.h libcoff.h coffcode.h +libbfd.o : libbfd.c $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.h +opncls.o : opncls.c $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.h +bfd.o : bfd.c $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.h +archive.o : archive.c $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.h \ + $(INCDIR)/ar.h $(INCDIR)/ranlib.h +targets.o : targets.c $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.h +cache.o : cache.c $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.h +archures.o : archures.c $(INCDIR)/bfd.h $(INCDIR)/obstack.h +i386coff.o : i386coff.c $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.h \ + $(INCDIR)/i386coff.h $(INCDIR)/internalcoff.h libcoff.h coffcode.h aout64.o : aout64.c -aout32.o : aout32.c aoutx.h ../include/bfd.h ../include/ansidecl.h \ - ../include/obstack.h libaout.h libbfd.h ../include/aout64.h \ - ../include/stab.gnu.h ../include/stab.def ../include/ar.h -sunos.o : sunos.c aoutf1.h ../include/bfd.h ../include/obstack.h \ - libaout.h libbfd.h ../include/aout64.h ../include/stab.gnu.h \ - ../include/stab.def ../include/ar.h +aout32.o : aout32.c aoutx.h $(INCDIR)/bfd.h $(INCDIR)/ansidecl.h \ + $(INCDIR)/obstack.h libaout.h libbfd.h $(INCDIR)/aout64.h \ + $(INCDIR)/stab.gnu.h $(INCDIR)/stab.def $(INCDIR)/ar.h +sunos.o : sunos.c aoutf1.h $(INCDIR)/bfd.h $(INCDIR)/obstack.h \ + libaout.h libbfd.h $(INCDIR)/aout64.h $(INCDIR)/stab.gnu.h \ + $(INCDIR)/stab.def $(INCDIR)/ar.h demo64.o : demo64.c -icoff.o : icoff.c ../include/bfd.h ../include/obstack.h libbfd.h \ - ../include/intel-coff.h ../include/internalcoff.h libcoff.h coffcode.h -srec.o : srec.c ../include/bfd.h ../include/obstack.h libbfd.h -oasys.o : oasys.c ../include/bfd.h ../include/obstack.h libbfd.h \ - ../include/oasys.h liboasys.h -ieee.o : ieee.c ../include/bfd.h ../include/obstack.h libbfd.h \ - ../include/ieee.h libieee.h -m68kcoff.o : m68kcoff.c ../include/bfd.h ../include/obstack.h libbfd.h \ - ../include/m68kcoff.h ../include/internalcoff.h libcoff.h coffcode.h -amdcoff.o : amdcoff.c ../include/bfd.h ../include/obstack.h libbfd.h \ - ../include/amdcoff.h ../include/internalcoff.h libcoff.h coffcode.h -format.o : format.c ../include/sysdep.h ../include/bfd.h \ - ../include/obstack.h libbfd.h -section.o : section.c ../include/sysdep.h ../include/bfd.h \ - ../include/obstack.h libbfd.h -core.o : core.c ../include/sysdep.h ../include/bfd.h \ - ../include/obstack.h libbfd.h -syms.o : syms.c ../include/sysdep.h ../include/bfd.h \ - ../include/obstack.h libbfd.h -reloc.o : reloc.c ../include/sysdep.h ../include/bfd.h \ - ../include/obstack.h libbfd.h -m88k-bcs.o : m88k-bcs.c ../include/bfd.h ../include/obstack.h libbfd.h \ - ../include/m88k-bcs.h ../include/internalcoff.h libcoff.h coffcode.h -ecoff.o : ecoff.c ../include/bfd.h ../include/obstack.h libbfd.h \ - ../include/ecoff.h ../include/internalcoff.h libcoff.h trad-core.h \ +icoff.o : icoff.c $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.h \ + $(INCDIR)/intel-coff.h $(INCDIR)/internalcoff.h libcoff.h coffcode.h +srec.o : srec.c $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.h +oasys.o : oasys.c $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.h \ + $(INCDIR)/oasys.h liboasys.h +ieee.o : ieee.c $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.h \ + $(INCDIR)/ieee.h libieee.h +m68kcoff.o : m68kcoff.c $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.h \ + $(INCDIR)/m68kcoff.h $(INCDIR)/internalcoff.h libcoff.h coffcode.h +amdcoff.o : amdcoff.c $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.h \ + $(INCDIR)/amdcoff.h $(INCDIR)/internalcoff.h libcoff.h coffcode.h +format.o : format.c $(INCDIR)/sysdep.h $(INCDIR)/bfd.h \ + $(INCDIR)/obstack.h libbfd.h +section.o : section.c $(INCDIR)/sysdep.h $(INCDIR)/bfd.h \ + $(INCDIR)/obstack.h libbfd.h +core.o : core.c $(INCDIR)/sysdep.h $(INCDIR)/bfd.h \ + $(INCDIR)/obstack.h libbfd.h +syms.o : syms.c $(INCDIR)/sysdep.h $(INCDIR)/bfd.h \ + $(INCDIR)/obstack.h libbfd.h +reloc.o : reloc.c $(INCDIR)/sysdep.h $(INCDIR)/bfd.h \ + $(INCDIR)/obstack.h libbfd.h +m88k-bcs.o : m88k-bcs.c $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.h \ + $(INCDIR)/m88k-bcs.h $(INCDIR)/internalcoff.h libcoff.h coffcode.h +ecoff.o : ecoff.c $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.h \ + $(INCDIR)/ecoff.h $(INCDIR)/internalcoff.h libcoff.h trad-core.h \ coffcode.h -trad-core.o : trad-core.c ../include/bfd.h ../include/obstack.h \ +trad-core.o : trad-core.c $(INCDIR)/bfd.h $(INCDIR)/obstack.h \ libbfd.h libaout.h -newsos3.o : newsos3.c ../include/bfd.h ../include/obstack.h libbfd.h \ - ../include/aout64.h ../include/stab.gnu.h ../include/stab.def \ - ../include/ar.h libaout.h -bout.o : bout.c ../include/bfd.h ../include/obstack.h libbfd.h \ - ../include/bout.h ../include/stab.gnu.h ../include/stab.def libaout.h +newsos3.o : newsos3.c $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.h \ + $(INCDIR)/aout64.h $(INCDIR)/stab.gnu.h $(INCDIR)/stab.def \ + $(INCDIR)/ar.h libaout.h +bout.o : bout.c $(INCDIR)/bfd.h $(INCDIR)/obstack.h libbfd.h \ + $(INCDIR)/bout.h $(INCDIR)/stab.gnu.h $(INCDIR)/stab.def libaout.h # IF YOU PUT ANYTHING HERE IT WILL GO AWAY + diff --git a/binutils/Makefile.in b/binutils/Makefile.in index 9555c865817..eb7e9b22dc1 100644 --- a/binutils/Makefile.in +++ b/binutils/Makefile.in @@ -45,7 +45,9 @@ INCDIR = $(BASEDIR)/include CFLAGS = -g -I$(srcdir)/../include -I$(INCDIR) $(HDEFINES) $(TDEFINES) -DISASMS = m68k-pinsn.o i960-pinsn.o sparc-pinsn.o +# When adding .o files, to make VPATH work in Sun Make, you have to +# also add a foo.o: foo.c line at the bottom of the file. +DISASMS = m68k-pinsn.o i960-pinsn.o sparc-pinsn.o am29k-pinsn.o # ## Random definitions @@ -145,7 +147,7 @@ realclean: clean install: $(PROGS) for i in $(PROGS) ; do \ - $(INSTALL_PROGRAM) $$i $(destdir)/bin/$$i ; \ + $(INSTALL_PROGRAM) $$i $(bindir)/$$i ; \ done bucomm.o: bucomm.c @@ -156,6 +158,7 @@ objdump.o: objdump.c m68k-pinsn.o: m68k-pinsn.c i960-pinsn.o: i960-pinsn.c sparc-pinsn.o: sparc-pinsn.c +am29k-pinsn.o: am29k-pinsn.c nm.o: nm.c ar.o: ar.c getopt.o:getopt.c @@ -198,14 +201,8 @@ make: echo >>Makefile ; \ sed "s/^#__$(HOST)__#//" < Makefile.old >>Makefile -# - -Makefile: $(srcdir)/Makefile.in $(srcdir)/configure - (cd $(srcdir) ; \ - ./configure +norecurse \ - +destdir=$(destdir) \ - `if [ "$(srcdir)" != "." ] ; then echo +f; fi` \ - $(host) +target=$(target)) +Makefile: $(srcdir)/Makefile.in $(srcdir)/configure $(host_makefile_frag) $(target_makefile_frag) + $(SHELL) ./config.status ### Local Variables: *** ### mode:fundamental *** diff --git a/gas/Makefile.in b/gas/Makefile.in index 6269b5db610..738724b5f15 100644 --- a/gas/Makefile.in +++ b/gas/Makefile.in @@ -445,8 +445,8 @@ realclean: cleanconfig # Entry points `install', `includes' and `uninstall'. # Copy the files into directories where they will be run. -install: as - $(INSTALL_PROGRAM) as $(libsubdir)/as +install: $(ALL) + $(INSTALL_PROGRAM) $(ALL) $(libsubdir)/as # Create the installation directory. install-dir: @@ -486,19 +486,19 @@ tags TAGS: force bootstrap: $(ALL) force $(MAKE) stage1 - $(MAKE) CC="$(CC)" CFLAGS="-O -Bstage1/ $(CFLAGS)" libdir=$(libdir) ALLOCA= as + $(MAKE) CC="$(CC)" CFLAGS="-O -Bstage1/ $(CFLAGS)" libdir=$(libdir) ALLOCA= $(ALL) $(MAKE) stage2 - $(MAKE) CC="$(CC)" CFLAGS="-O -Bstage2/ $(CFLAGS)" libdir=$(libdir) ALLOCA= as + $(MAKE) CC="$(CC)" CFLAGS="-O -Bstage2/ $(CFLAGS)" libdir=$(libdir) ALLOCA= $(ALL) $(MAKE) comparison against=stage2 bootstrap2: force - $(MAKE) CC="$(CC)" CFLAGS="-O -Bstage1/ $(CFLAGS)" libdir=$(libdir) ALLOCA= as + $(MAKE) CC="$(CC)" CFLAGS="-O -Bstage1/ $(CFLAGS)" libdir=$(libdir) ALLOCA= $(ALL) $(MAKE) stage2 - $(MAKE) CC="$(CC)" CFLAGS="-O -Bstage2/ $(CFLAGS)" libdir=$(libdir) ALLOCA= as + $(MAKE) CC="$(CC)" CFLAGS="-O -Bstage2/ $(CFLAGS)" libdir=$(libdir) ALLOCA= $(ALL) $(MAKE) comparison against=stage2 bootstrap3: force - $(MAKE) CC="$(CC)" CFLAGS="-O -Bstage2/ $(CFLAGS)" libdir=$(libdir) ALLOCA= as + $(MAKE) CC="$(CC)" CFLAGS="-O -Bstage2/ $(CFLAGS)" libdir=$(libdir) ALLOCA= $(ALL) $(MAKE) comparison against=stage2 # Copy the object files from a particular stage into a subdirectory. @@ -571,10 +571,6 @@ risky-stage4: force force: -Makefile: $(srcdir)/Makefile.in $(srcdir)/configure - (cd $(srcdir) ; \ - ./configure +destdir=$(destdir) \ - +norecurse \ - `if [ "$(srcdir)" != "." ] ; then echo +subdirs; fi` \ - $(host) +target=$(target)) +Makefile: $(srcdir)/Makefile.in $(srcdir)/configure $(host_makefile_frag) $(target_makefile_frag) + $(SHELL) ./config.status diff --git a/ld/Makefile.in b/ld/Makefile.in index ee96a54addb..79223f17e55 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -312,12 +312,8 @@ make: # -Makefile: $(srcdir)/Makefile.in $(srcdir)/configure - (cd $(srcdir) ; \ - ./configure +destdir=$(destdir) \ - +norecurse \ - `if [ "$(srcdir)" != "." ] ; then echo +subdirs; fi` \ - $(host) +target=$(target)) +Makefile: $(srcdir)/Makefile.in $(srcdir)/configure $(host_makefile_frag) $(target_makefile_frag) + $(SHELL) ./config.status ### Local Variables: *** ### mode:fundamental *** -- 2.30.2