projects / deliverable / binutils-gdb.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: eb04345)
bfd/
authorH.J. Lu <hjl.tools@gmail.com>
Fri, 17 Sep 2004 17:04:34 +0000 (17:04 +0000)
committerH.J. Lu <hjl.tools@gmail.com>
Fri, 17 Sep 2004 17:04:34 +0000 (17:04 +0000)
2004-09-17  H.J. Lu  <hongjiu.lu@intel.com>

* 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  <hongjiu.lu@intel.com>

* Makefile.am (AUTOMAKE_OPTIONS): Require 1.9.
(CONFIG_STATUS_DEPENDENCIES): New.
(Makefile): Removed.
(config.status): Likewise.
* Makefile.in: Regenerated.

bfd/ChangeLog patch | blob | blame | history
bfd/Makefile.am patch | blob | blame | history
bfd/Makefile.in patch | blob | blame | history
opcodes/ChangeLog patch | blob | blame | history
opcodes/Makefile.am patch | blob | blame | history
opcodes/Makefile.in patch | blob | blame | history

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 85eb10b4288c27bba51c0ef31d7f39c150c94ea0..27813dcff5f8d5fb9ce126c09a1551b8fcfe6fd1 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,11 @@
+2004-09-17  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * Makefile.am (AUTOMAKE_OPTIONS): Require 1.9.
+       (CONFIG_STATUS_DEPENDENCIES): New.
+       (Makefile): Removed.
+       (config.status): Likewise.
+       * Makefile.in: Regenerated.
+
 2004-09-17  Paul Brook  <paul@codesourcery.com>
 
        * bfd-in.h (bfd_elf32_arm_set_target_relocs): Add prototype.
diff --git a/bfd/Makefile.am b/bfd/Makefile.am
index 6e666e49f6580021051676d5784d24420a52261a..a7eabfc26bb503f3d2257f8803fbf6ed76988acd 100644 (file)
--- 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 ede7be746bd749d9482c5d3bfa05c207bb276973..ac92e492535433646f066fcc06253d5db57c576c 100644 (file)
--- 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 802c78b67688c9b0473a98e8d2ca6f2d8753e2f0..f4eebbbe19cedfae1e12f9d83067669da7c5b2b5 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,11 @@
+2004-09-17  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * Makefile.am (AUTOMAKE_OPTIONS): Require 1.9.
+       (CONFIG_STATUS_DEPENDENCIES): New.
+       (Makefile): Removed.
+       (config.status): Likewise.
+       * Makefile.in: Regenerated.
+
 2004-09-17  Alan Modra  <amodra@bigpond.net.au>
 
        * Makefile.am: Run "make dep-am".
diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am
index a68632d3429b5d2555f60736c72e3338bc35f2c7..596dee24d45a416276ea9694731d18c07d116db9 100644 (file)
--- 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 f9fa0df9559df61b005f37cc95a64e968a750bd7..9bd778fb76c1a32fb8f487e468067ab9c4c11907 100644 (file)
--- 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
GDB Binutils - Deliverables
This page took 0.033927 seconds and 4 git commands to generate.