From 251617280e8ba6b6f6986446de977b27562e1020 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Fri, 13 Feb 1998 19:55:14 +0000 Subject: [PATCH] * Makefile.am (AUTOMAKE_OPTIONS): Define. * configure, Makefile.in, aclocal.m4: Rebuild with automake 1.2e. --- opcodes/ChangeLog | 5 +++ opcodes/Makefile.am | 2 + opcodes/Makefile.in | 103 +++++++++++++++++++++++++------------------- 3 files changed, 65 insertions(+), 45 deletions(-) diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index bdcc52fecbe..30d5fe25bbf 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,8 @@ +Fri Feb 13 14:53:02 1998 Ian Lance Taylor + + * Makefile.am (AUTOMAKE_OPTIONS): Define. + * configure, Makefile.in, aclocal.m4: Rebuild with automake 1.2e. + Fri Feb 13 10:21:09 1998 Mark Alexander * m10300-dis.c (print_insn_mn10300): Recognize break instruction. diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am index 569bf84ae3f..2bdc7160b2e 100644 --- a/opcodes/Makefile.am +++ b/opcodes/Makefile.am @@ -1,5 +1,7 @@ ## Process this file with automake to generate Makefile.in +AUTOMAKE_OPTIONS = cygnus + INCDIR = $(srcdir)/../include BFDDIR = $(srcdir)/../bfd DEP = mkdep diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in index b552ba620f8..3bb986a17ac 100644 --- a/opcodes/Makefile.in +++ b/opcodes/Makefile.in @@ -1,8 +1,14 @@ -# Makefile.in generated automatically by automake 1.2 from Makefile.am +# Makefile.in generated automatically by automake 1.2e from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. SHELL = @SHELL@ @@ -43,12 +49,12 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ -NORMAL_INSTALL = true -PRE_INSTALL = true -POST_INSTALL = true -NORMAL_UNINSTALL = true -PRE_UNINSTALL = true -POST_UNINSTALL = true +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : build_alias = @build_alias@ build_triplet = @build@ host_alias = @host_alias@ @@ -71,6 +77,8 @@ RANLIB = @RANLIB@ VERSION = @VERSION@ archdefs = @archdefs@ +AUTOMAKE_OPTIONS = cygnus + INCDIR = $(srcdir)/../include BFDDIR = $(srcdir)/../bfd DEP = mkdep @@ -276,7 +284,8 @@ config.status: $(srcdir)/configure $(srcdir)/configure: @MAINT@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) -config.h: stamp-h ; @: +config.h: stamp-h + @: stamp-h: $(srcdir)/config.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES= CONFIG_HEADERS=config.h:config.in \ @@ -292,42 +301,41 @@ mostlyclean-hdr: clean-hdr: distclean-hdr: - rm -f config.h + -rm -f config.h maintainer-clean-hdr: mostlyclean-noinstLIBRARIES: clean-noinstLIBRARIES: - test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) + -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) distclean-noinstLIBRARIES: maintainer-clean-noinstLIBRARIES: -.s.o: +.c.o: $(COMPILE) -c $< -.S.o: +.s.o: $(COMPILE) -c $< -.c.o: +.S.o: $(COMPILE) -c $< mostlyclean-compile: - rm -f *.o core + -rm -f *.o core *.core clean-compile: distclean-compile: - rm -f *.tab.c + -rm -f *.tab.c maintainer-clean-compile: .c.lo: $(LIBTOOL) --mode=compile $(COMPILE) -c $< -# These are just copies of the above rule. .s.lo: $(LIBTOOL) --mode=compile $(COMPILE) -c $< @@ -335,10 +343,10 @@ maintainer-clean-compile: $(LIBTOOL) --mode=compile $(COMPILE) -c $< mostlyclean-libtool: - rm -f *.lo + -rm -f *.lo clean-libtool: - rm -rf .libs + -rm -rf .libs _libs distclean-libtool: @@ -347,7 +355,7 @@ maintainer-clean-libtool: mostlyclean-libLTLIBRARIES: clean-libLTLIBRARIES: - test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) distclean-libLTLIBRARIES: @@ -358,8 +366,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) $(mkinstalldirs) $(libdir) @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ - echo "$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(libdir)/$$p"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(libdir)/$$p; \ + echo "$(LIBTOOL) --mode=install $(INSTALL_DATA) $$p $(libdir)/$$p"; \ + $(LIBTOOL) --mode=install $(INSTALL_DATA) $$p $(libdir)/$$p; \ else :; fi; \ done @@ -374,21 +382,26 @@ libopcodes.la: $(libopcodes_la_OBJECTS) $(libopcodes_la_DEPENDENCIES) tags: TAGS -ID: $(HEADERS) $(SOURCES) - here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS) +ID: $(HEADERS) $(SOURCES) $(LISP) + here=`pwd` && cd $(srcdir) \ + && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) -TAGS: $(HEADERS) $(SOURCES) config.in $(TAGS_DEPENDENCIES) +TAGS: $(HEADERS) $(SOURCES) config.in $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ - test -z "$(ETAGS_ARGS)config.in$(SOURCES)$(HEADERS)$$tags" \ - || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.in $(SOURCES) $(HEADERS) -o $$here/TAGS) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)config.in$$unique$(LISP)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.in $$unique $(LISP) -o $$here/TAGS) mostlyclean-tags: clean-tags: distclean-tags: - rm -f TAGS ID + -rm -f TAGS ID maintainer-clean-tags: @@ -399,7 +412,7 @@ top_distdir = $(distdir) # it guarantees that the distribution is self-contained by making another # tarfile. distcheck: dist - rm -rf $(distdir) + -rm -rf $(distdir) GZIP=$(GZIP) $(TAR) zxf $(distdir).tar.gz mkdir $(distdir)/=build mkdir $(distdir)/=inst @@ -412,20 +425,20 @@ distcheck: dist && $(MAKE) install \ && $(MAKE) installcheck \ && $(MAKE) dist - rm -rf $(distdir) + -rm -rf $(distdir) @echo "========================"; \ echo "$(distdir).tar.gz is ready for distribution"; \ echo "========================" dist: distdir -chmod -R a+r $(distdir) GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir) - rm -rf $(distdir) + -rm -rf $(distdir) dist-all: distdir -chmod -R a+r $(distdir) GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir) - rm -rf $(distdir) + -rm -rf $(distdir) distdir: $(DISTFILES) - rm -rf $(distdir) + -rm -rf $(distdir) mkdir $(distdir) -chmod 777 $(distdir) @for file in $(DISTFILES); do \ @@ -436,7 +449,7 @@ distdir: $(DISTFILES) done info: dvi: -check: all +check: $(MAKE) installcheck: install-info: @@ -460,19 +473,19 @@ installdirs: mostlyclean-generic: - test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) + -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: - test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - rm -f Makefile $(DISTCLEANFILES) - rm -f config.cache config.log stamp-h stamp-h[0-9]* - test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -rm -f Makefile $(DISTCLEANFILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) + -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean: mostlyclean-hdr mostlyclean-noinstLIBRARIES \ mostlyclean-compile mostlyclean-libtool \ mostlyclean-libLTLIBRARIES mostlyclean-tags \ @@ -485,8 +498,8 @@ clean: clean-hdr clean-noinstLIBRARIES clean-compile clean-libtool \ distclean: distclean-hdr distclean-noinstLIBRARIES distclean-compile \ distclean-libtool distclean-libLTLIBRARIES \ distclean-tags distclean-generic clean - rm -f config.status - rm -f libtool + -rm -f config.status + -rm -f libtool maintainer-clean: maintainer-clean-hdr maintainer-clean-noinstLIBRARIES \ maintainer-clean-compile maintainer-clean-libtool \ @@ -494,7 +507,7 @@ maintainer-clean: maintainer-clean-hdr maintainer-clean-noinstLIBRARIES \ maintainer-clean-generic distclean @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." - rm -f config.status + -rm -f config.status .PHONY: default mostlyclean-hdr distclean-hdr clean-hdr \ maintainer-clean-hdr mostlyclean-noinstLIBRARIES \ -- 2.30.2