diff options
| -rw-r--r-- | gas/ChangeLog | 9 | ||||
| -rw-r--r-- | gas/Makefile.am | 6 | ||||
| -rw-r--r-- | gas/Makefile.in | 22 | ||||
| -rw-r--r-- | gas/aclocal.m4 | 4 | ||||
| -rw-r--r-- | gas/doc/Makefile.am | 1 | ||||
| -rw-r--r-- | gas/doc/Makefile.in | 13 |
6 files changed, 39 insertions, 16 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 26abf4c..2b52cde 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,12 @@ +2003-11-12 Daniel Jacobowitz <drow@mvista.com> + + * Makefile.am (install, install-info, RECURSIVE_TARGETS): Define. + * doc/Makefile.am (install-info): Define. + + * aclocal.m4: Regenerate. + * Makefile.in: Regenerate. + * doc/Makefile.in: Regenerate. + 2003-11-11 Dmitry Semyonov <Dmitry.Semyonov@oktet.ru> * configure.in: Add support for arm-wince-pe target. diff --git a/gas/Makefile.am b/gas/Makefile.am index 30b62c1..9f766d4 100644 --- a/gas/Makefile.am +++ b/gas/Makefile.am @@ -456,6 +456,12 @@ po/POTFILES.in: @MAINT@ Makefile for f in $(POTFILES); do echo $$f; done | LC_COLLATE= sort > tmp \ && mv tmp $(srcdir)/po/POTFILES.in +# We want install to imply install-info as per GNU standards, despite the +# cygnus option. +install: install-recursive install-info +install-info: install-info-recursive +RECURSIVE_TARGETS += install-info-recursive + # Note: GASP is now deprecated and has been removed. It is still # available in the CVS archive or older binutils releases if it is needed. noinst_PROGRAMS = as-new diff --git a/gas/Makefile.in b/gas/Makefile.in index 6cfc507..4f1acb9 100644 --- a/gas/Makefile.in +++ b/gas/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.7.6 from Makefile.am. +# Makefile.in generated by automake 1.7.8 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 @@ -628,6 +628,7 @@ POTFILES = $(MULTI_CFILES) $(TARGET_ENV_HFILES) $(OBJ_FORMAT_HFILES) \ $(OBJ_FORMAT_CFILES) $(TARGET_CPU_HFILES) $(TARGET_CPU_CFILES) \ $(HFILES) $(CFILES) $(GAS_CFILES) +RECURSIVE_TARGETS = install-info-recursive # Note: GASP is now deprecated and has been removed. It is still # available in the CVS archive or older binutils releases if it is needed. @@ -2557,9 +2558,9 @@ YLWRAP = $(top_srcdir)/../ylwrap DIST_SOURCES = $(as_new_SOURCES) $(EXTRA_as_new_SOURCES) \ $(itbl_test_SOURCES) -RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ - ps-recursive uninstall-info-recursive all-recursive \ - install-data-recursive install-exec-recursive \ +RECURSIVE_TARGETS = install-info-recursive info-recursive dvi-recursive \ + pdf-recursive ps-recursive uninstall-info-recursive \ + all-recursive install-data-recursive install-exec-recursive \ installdirs-recursive install-recursive uninstall-recursive \ check-recursive installcheck-recursive SOURCES = $(as_new_SOURCES) $(EXTRA_as_new_SOURCES) $(itbl_test_SOURCES) @@ -2809,8 +2810,6 @@ check: check-recursive all-am: Makefile $(PROGRAMS) $(SCRIPTS) config.h installdirs: installdirs-recursive installdirs-am: - -install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive uninstall: uninstall-recursive @@ -2831,7 +2830,7 @@ clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f $(CONFIG_CLEAN_FILES) -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @@ -2847,6 +2846,7 @@ clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \ distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -f Makefile distclean-am: clean-am distclean-DEJAGNU distclean-compile \ distclean-generic distclean-hdr distclean-libtool \ distclean-tags @@ -2871,7 +2871,8 @@ installcheck-am: maintainer-clean: maintainer-clean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) - -rm -rf autom4te.cache + -rm -rf $(top_srcdir)/autom4te.cache + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-recursive @@ -2913,6 +2914,11 @@ po/POTFILES.in: @MAINT@ Makefile for f in $(POTFILES); do echo $$f; done | LC_COLLATE= sort > tmp \ && mv tmp $(srcdir)/po/POTFILES.in +# We want install to imply install-info as per GNU standards, despite the +# cygnus option. +install: install-recursive install-info +install-info: install-info-recursive + $(srcdir)/make-gas.com: stamp-mk.com stamp-mk.com: vmsconf.sh Makefile sh $(srcdir)/vmsconf.sh $(GENERIC_OBJS) > new-make.com diff --git a/gas/aclocal.m4 b/gas/aclocal.m4 index 55270ae..a0aa578 100644 --- a/gas/aclocal.m4 +++ b/gas/aclocal.m4 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.7.6 -*- Autoconf -*- +# generated automatically by aclocal 1.7.8 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. @@ -263,7 +263,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"]) # Call AM_AUTOMAKE_VERSION so it can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.7.6])]) + [AM_AUTOMAKE_VERSION([1.7.8])]) # Helper functions for option handling. -*- Autoconf -*- diff --git a/gas/doc/Makefile.am b/gas/doc/Makefile.am index 1e8acbc..0fdd756 100644 --- a/gas/doc/Makefile.am +++ b/gas/doc/Makefile.am @@ -68,6 +68,7 @@ as.dvi: $(srcdir)/as.texinfo asconfig.texi gasver.texi $(CPU_DOCS) # We want install to imply install-info as per GNU standards, despite the # cygnus option. install: install-info +install-info: install-info-am # This one isn't ready for prime time yet. Not even a little bit. diff --git a/gas/doc/Makefile.in b/gas/doc/Makefile.in index 88d327a..b53c17a 100644 --- a/gas/doc/Makefile.in +++ b/gas/doc/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.7.6 from Makefile.am. +# Makefile.in generated by automake 1.7.8 from Makefile.am. # @configure_input@ # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 @@ -293,7 +293,7 @@ DVIPS = dvips uninstall-info-am: $(PRE_UNINSTALL) @if (install-info --version && \ - install-info --version | grep -i -v debian) >/dev/null 2>&1; then \ + install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \ list='$(INFO_DEPS)'; \ for file in $$list; do \ relfile=`echo "$$file" | sed 's|^.*/||'`; \ @@ -412,7 +412,7 @@ mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f $(CONFIG_CLEAN_FILES) -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @@ -424,7 +424,7 @@ clean: clean-am clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-am - + -rm -f Makefile distclean-am: clean-am distclean-generic distclean-libtool dvi: dvi-am @@ -459,7 +459,7 @@ install-info-am: $(INFO_DEPS) done @$(POST_INSTALL) @if (install-info --version && \ - install-info --version | grep -i -v debian) >/dev/null 2>&1; then \ + install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \ list='$(INFO_DEPS)'; \ for file in $$list; do \ relfile=`echo "$$file" | sed 's|^.*/||'`; \ @@ -472,7 +472,7 @@ install-man: install-man1 installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-aminfo \ maintainer-clean-generic @@ -522,6 +522,7 @@ as.dvi: $(srcdir)/as.texinfo asconfig.texi gasver.texi $(CPU_DOCS) # We want install to imply install-info as per GNU standards, despite the # cygnus option. install: install-info +install-info: install-info-am # Maintenance |