From 3f85e526001fd8080a74e81642e725ffefd38bd6 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Fri, 17 Sep 2004 17:04:34 +0000 Subject: bfd/ 2004-09-17 H.J. Lu * Makefile.am (AUTOMAKE_OPTIONS): Require 1.9. (CONFIG_STATUS_DEPENDENCIES): New. (Makefile): Removed. (config.status): Likewise. * Makefile.in: Regenerated. opcodes/ 2004-09-17 H.J. Lu * Makefile.am (AUTOMAKE_OPTIONS): Require 1.9. (CONFIG_STATUS_DEPENDENCIES): New. (Makefile): Removed. (config.status): Likewise. * Makefile.in: Regenerated. --- bfd/ChangeLog | 8 ++++++++ bfd/Makefile.am | 16 +++++++++------- bfd/Makefile.in | 26 +++++++++++++++++++------- opcodes/ChangeLog | 8 ++++++++ opcodes/Makefile.am | 13 +++++-------- opcodes/Makefile.in | 22 ++++++++++++++-------- 6 files changed, 63 insertions(+), 30 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 85eb10b..27813dc 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,11 @@ +2004-09-17 H.J. Lu + + * Makefile.am (AUTOMAKE_OPTIONS): Require 1.9. + (CONFIG_STATUS_DEPENDENCIES): New. + (Makefile): Removed. + (config.status): Likewise. + * Makefile.in: Regenerated. + 2004-09-17 Paul Brook * bfd-in.h (bfd_elf32_arm_set_target_relocs): Add prototype. diff --git a/bfd/Makefile.am b/bfd/Makefile.am index 6e666e4..a7eabfc 100644 --- a/bfd/Makefile.am +++ b/bfd/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to generate Makefile.in -AUTOMAKE_OPTIONS = cygnus +AUTOMAKE_OPTIONS = 1.9 cygnus # Uncomment the following line when doing a release. # RELEASE=y @@ -575,6 +575,14 @@ OPTIONAL_BACKENDS_CFILES = \ trad-core.c \ cisco-core.c +# We want to rerun configure if configure.in, config.bfd or +# configure.host change. configure.in is needed since the version +# number in Makefile comes from configure.in. +CONFIG_STATUS_DEPENDENCIES = \ + $(srcdir)/configure.in \ + $(srcdir)/config.bfd \ + $(srcdir)/configure.host + # These are defined by configure.in: WORDSIZE = @wordsize@ ALL_BACKENDS = @all_backends@ @@ -763,8 +771,6 @@ uninstall_libbfd: rm -f $(DESTDIR)$(bfdincludedir)/symcat.h rm -f $(DESTDIR)$(bfdincludedir)/bfdlink.h -Makefile: $(srcdir)/configure.in - # Have to get rid of DEP1 here so that "$?" later includes all of $(CFILES). DEP: dep.sed $(CFILES) $(HFILES) bfd.h rm -f DEP1 @@ -871,10 +877,6 @@ CLEANFILES = bfd.h dep.sed stmp-bfd-h DEP DEPA DEP1 DEP2 libbfd.a stamp-lib \ DISTCLEANFILES = $(BUILD_CFILES) $(BUILD_HFILES) -# We want to rerun configure if configure, config.bfd or configure.host change. -config.status: $(srcdir)/configure $(srcdir)/config.bfd $(srcdir)/configure.host - $(SHELL) ./config.status --recheck - bfdver.h: $(srcdir)/version.h $(srcdir)/Makefile.in @echo "creating $@" @bfd_version=`echo "$(VERSION)" | sed -e 's/\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\).*/\1.00\2.00\3.00\4.00\5/' -e 's/\([^\.]*\)\..*\(..\)\..*\(..\)\..*\(..\)\..*\(..\)$$/\1\2\3\4\5/'` ;\ diff --git a/bfd/Makefile.in b/bfd/Makefile.in index ede7be7..ac92e49 100644 --- a/bfd/Makefile.in +++ b/bfd/Makefile.in @@ -246,7 +246,7 @@ target_os = @target_os@ target_vendor = @target_vendor@ tdefaults = @tdefaults@ wordsize = @wordsize@ -AUTOMAKE_OPTIONS = cygnus +AUTOMAKE_OPTIONS = 1.9 cygnus # Uncomment the following line when doing a release. # RELEASE=y @@ -815,6 +815,15 @@ OPTIONAL_BACKENDS_CFILES = \ cisco-core.c +# We want to rerun configure if configure.in, config.bfd or +# configure.host change. configure.in is needed since the version +# number in Makefile comes from configure.in. +CONFIG_STATUS_DEPENDENCIES = \ + $(srcdir)/configure.in \ + $(srcdir)/config.bfd \ + $(srcdir)/configure.host + + # These are defined by configure.in: WORDSIZE = @wordsize@ ALL_BACKENDS = @all_backends@ @@ -908,6 +917,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi cd $(top_srcdir) && \ $(AUTOMAKE) --cygnus Makefile .PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + echo ' $(SHELL) ./config.status'; \ + $(SHELL) ./config.status;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ + esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck @@ -1323,8 +1341,6 @@ uninstall_libbfd: rm -f $(DESTDIR)$(bfdincludedir)/symcat.h rm -f $(DESTDIR)$(bfdincludedir)/bfdlink.h -Makefile: $(srcdir)/configure.in - # Have to get rid of DEP1 here so that "$?" later includes all of $(CFILES). DEP: dep.sed $(CFILES) $(HFILES) bfd.h rm -f DEP1 @@ -1416,10 +1432,6 @@ stmp-lcoff-h: $(LIBCOFF_H_FILES) $(SHELL) $(srcdir)/../move-if-change libcoff.h-new $(srcdir)/libcoff.h touch stmp-lcoff-h -# We want to rerun configure if configure, config.bfd or configure.host change. -config.status: $(srcdir)/configure $(srcdir)/config.bfd $(srcdir)/configure.host - $(SHELL) ./config.status --recheck - bfdver.h: $(srcdir)/version.h $(srcdir)/Makefile.in @echo "creating $@" @bfd_version=`echo "$(VERSION)" | sed -e 's/\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\).*/\1.00\2.00\3.00\4.00\5/' -e 's/\([^\.]*\)\..*\(..\)\..*\(..\)\..*\(..\)\..*\(..\)$$/\1\2\3\4\5/'` ;\ diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 802c78b..f4eebbb 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,11 @@ +2004-09-17 H.J. Lu + + * Makefile.am (AUTOMAKE_OPTIONS): Require 1.9. + (CONFIG_STATUS_DEPENDENCIES): New. + (Makefile): Removed. + (config.status): Likewise. + * Makefile.in: Regenerated. + 2004-09-17 Alan Modra * Makefile.am: Run "make dep-am". diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am index a68632d..596dee2 100644 --- a/opcodes/Makefile.am +++ b/opcodes/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to generate Makefile.in -AUTOMAKE_OPTIONS = cygnus +AUTOMAKE_OPTIONS = 1.9 cygnus SUBDIRS = po @@ -281,6 +281,10 @@ ALL_MACHINES = \ OFILES = @BFD_MACHINES@ +# We should reconfigure whenever bfd/configure.in changes, because +# that's where the version number in Makefile comes from. +CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/configure.in + INCLUDES = -D_GNU_SOURCE -I. -I$(srcdir) -I../bfd -I$(INCDIR) -I$(BFDDIR) @HDEFINES@ -I$(srcdir)/../intl -I../intl disassemble.lo: disassemble.c $(INCDIR)/dis-asm.h @@ -319,11 +323,6 @@ po/POTFILES.in: @MAINT@ Makefile for f in $(POTFILES); do echo $$f; done | LC_COLLATE= sort > tmp \ && mv tmp $(srcdir)/po/POTFILES.in -# We should reconfigure whenever bfd/configure.in changes, because -# that's where the version number comes from. -config.status: $(srcdir)/configure $(srcdir)/../bfd/configure.in - $(SHELL) ./config.status --recheck - install-bfdlibLTLIBRARIES: @INSTALL_LIBBFD_TRUE@install_libopcodes @$(NORMAL_INSTALL) @@ -465,8 +464,6 @@ s390-opc.tab: s390-mkopc s390-opc.txt sh-dis.lo: sh-dis.c $(LIBTOOL) --mode=compile $(COMPILE) -c @archdefs@ $< -Makefile: $(BFDDIR)/configure.in - # This dependency stuff is copied from BFD. DEP: dep.sed $(CFILES) $(HFILES) config.h diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in index f9fa0df..9bd778f 100644 --- a/opcodes/Makefile.in +++ b/opcodes/Makefile.in @@ -229,7 +229,7 @@ target_cpu = @target_cpu@ target_noncanonical = @target_noncanonical@ target_os = @target_os@ target_vendor = @target_vendor@ -AUTOMAKE_OPTIONS = cygnus +AUTOMAKE_OPTIONS = 1.9 cygnus SUBDIRS = po INCDIR = $(srcdir)/../include BFDDIR = $(srcdir)/../bfd @@ -502,6 +502,10 @@ ALL_MACHINES = \ z8k-dis.lo OFILES = @BFD_MACHINES@ + +# We should reconfigure whenever bfd/configure.in changes, because +# that's where the version number in Makefile comes from. +CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/configure.in INCLUDES = -D_GNU_SOURCE -I. -I$(srcdir) -I../bfd -I$(INCDIR) -I$(BFDDIR) @HDEFINES@ -I$(srcdir)/../intl -I../intl libopcodes_la_SOURCES = dis-buf.c disassemble.c dis-init.c # It's desirable to list ../bfd/libbfd.la in DEPENDENCIES and LIBADD. @@ -571,6 +575,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi cd $(top_srcdir) && \ $(AUTOMAKE) --cygnus Makefile .PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + echo ' $(SHELL) ./config.status'; \ + $(SHELL) ./config.status;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ + esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck @@ -878,11 +891,6 @@ po/POTFILES.in: @MAINT@ Makefile for f in $(POTFILES); do echo $$f; done | LC_COLLATE= sort > tmp \ && mv tmp $(srcdir)/po/POTFILES.in -# We should reconfigure whenever bfd/configure.in changes, because -# that's where the version number comes from. -config.status: $(srcdir)/configure $(srcdir)/../bfd/configure.in - $(SHELL) ./config.status --recheck - install-bfdlibLTLIBRARIES: @INSTALL_LIBBFD_TRUE@install_libopcodes @$(NORMAL_INSTALL) @@ -986,8 +994,6 @@ s390-opc.tab: s390-mkopc s390-opc.txt sh-dis.lo: sh-dis.c $(LIBTOOL) --mode=compile $(COMPILE) -c @archdefs@ $< -Makefile: $(BFDDIR)/configure.in - # This dependency stuff is copied from BFD. DEP: dep.sed $(CFILES) $(HFILES) config.h -- cgit v1.1