From 136b48998f4a5db717e16200fcdf4bb907703646 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Sun, 28 Aug 2011 22:38:50 +0200 Subject: [PATCH] automake: cleanups after de-ansification support removal (2) * automake.in ($get_object_extension_was_run): Remove, it's not really needed anymore. (&get_object_extension): Remove, it's a no-op now. All callers adjusted. --- ChangeLog | 8 ++++++++ Makefile.in | 35 ++++++++++++++++++++++------------- automake.in | 25 +++---------------------- doc/Makefile.in | 29 +++++++++++++++++++---------- lib/Automake/Makefile.in | 33 +++++++++++++++++++++------------ lib/Automake/tests/Makefile.in | 30 +++++++++++++++++++----------- lib/Makefile.in | 37 +++++++++++++++++++++++-------------- lib/am/Makefile.in | 30 +++++++++++++++++++----------- m4/Makefile.in | 31 +++++++++++++++++++------------ tests/Makefile.in | 30 +++++++++++++++++++----------- 10 files changed, 172 insertions(+), 116 deletions(-) diff --git a/ChangeLog b/ChangeLog index 59a6470..da81461 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2011-08-28 Stefano Lattarini + automake: cleanups after de-ansification support removal (2) + * automake.in ($get_object_extension_was_run): Remove, it's not + really needed anymore. + (&get_object_extension): Remove, it's a no-op now. + All callers adjusted. + +2011-08-28 Stefano Lattarini + automake: cleanups after de-ansification support removal (1) * automake.in (lang_c_rewrite, handle_single_transform): Rename variable `$nonansi_obj' to `$obj'. diff --git a/Makefile.in b/Makefile.in index 530f8cc..25c7110 100644 --- a/Makefile.in +++ b/Makefile.in @@ -93,6 +93,7 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(bindir)" SCRIPTS = $(bin_SCRIPTS) +DEFAULT_INCLUDES = -I.@am__isrc@ AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; @@ -469,6 +470,12 @@ uninstall-binSCRIPTS: echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, @@ -867,7 +874,8 @@ clean-am: clean-generic clean-local mostlyclean-am distclean: distclean-recursive -rm -f $(am__CONFIG_DISTCLEAN_FILES) -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-tags +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags dvi: dvi-recursive @@ -918,7 +926,7 @@ maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-recursive -mostlyclean-am: mostlyclean-generic +mostlyclean-am: mostlyclean-compile mostlyclean-generic pdf: pdf-recursive @@ -941,17 +949,18 @@ uninstall-am: uninstall-binSCRIPTS cscopelist-recursive ctags ctags-recursive dist dist-all \ dist-bzip2 dist-gzip dist-hook dist-lzip dist-lzma dist-shar \ dist-tarZ dist-xz dist-zip distcheck distclean \ - distclean-generic distclean-tags distcleancheck distdir \ - distuninstallcheck dvi dvi-am html html-am info info-am \ - install install-am install-binSCRIPTS install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-exec-hook install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-binSCRIPTS uninstall-hook + distclean-compile distclean-generic distclean-tags \ + distcleancheck distdir distuninstallcheck dvi dvi-am html \ + html-am info info-am install install-am install-binSCRIPTS \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-exec-hook install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ + ps ps-am tags tags-recursive uninstall uninstall-am \ + uninstall-binSCRIPTS uninstall-hook install-exec-hook: diff --git a/automake.in b/automake.in index 932a66a..ee459f0 100644 --- a/automake.in +++ b/automake.in @@ -590,10 +590,6 @@ my %linkers_used; # True if we need `LINK' defined. This is a hack. my $need_link; -# Was get_object_extension run? -# FIXME: This is a hack; a better switch should be found. -my $get_object_extension_was_run; - # Record each file processed by make_paragraphs. my %transformed_files; @@ -702,8 +698,6 @@ sub initialize_per_input () $need_link = 0; - $get_object_extension_was_run = 0; - %transformed_files = (); } @@ -1267,16 +1261,6 @@ sub shadow_unconditionally ($$) return "\$($varname)" } -# get_object_extension ($EXTENSION) -# --------------------------------- -# FIXME: this is only used so that `$get_object_extension_was_run' gets -# properly defined. We should refactor to get rid of such an hack. -sub get_object_extension ($) -{ - $get_object_extension_was_run = 1; - return $_[0]; -} - # check_user_variables (@LIST) # ---------------------------- # Make sure each variable VAR in @LIST does not exist, suggest using AM_VAR @@ -2397,9 +2381,6 @@ sub check_canonical_spelling # Set up the compile suite. sub handle_compile () { - return - unless $get_object_extension_was_run; - # Boilerplate. my $default_includes = ''; if (! option 'nostdinc') @@ -2496,7 +2477,7 @@ sub handle_programs my ($where, $one_file) = @$pair; my $seen_libobjs = 0; - my $obj = get_object_extension '.$(OBJEXT)'; + my $obj = '.$(OBJEXT)'; $known_programs{$one_file} = $where; @@ -2613,7 +2594,7 @@ sub handle_libraries $where->push_context ("while processing library `$onelib'"); $where->set (INTERNAL->get); - my $obj = get_object_extension '.$(OBJEXT)'; + my $obj = '.$(OBJEXT)'; # Canonicalize names and check for misspellings. my $xlib = &check_canonical_spelling ($onelib, '_LIBADD', '_SOURCES', @@ -2778,7 +2759,7 @@ sub handle_ltlibraries my ($where, $onelib) = @$pair; my $seen_libobjs = 0; - my $obj = get_object_extension '.lo'; + my $obj = '.lo'; # Canonicalize names and check for misspellings. my $xlib = &check_canonical_spelling ($onelib, '_LIBADD', '_LDFLAGS', diff --git a/doc/Makefile.in b/doc/Makefile.in index ff01625..79fad94 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -67,6 +67,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +DEFAULT_INCLUDES = -I.@am__isrc@ AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; @@ -308,6 +309,12 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + .texi.info: $(AM_V_MAKEINFO)restore=: && backupdir="$(am__leading_dot)am$$$$" && \ am__cwd=`pwd` && $(am__cd) $(srcdir) && \ @@ -686,7 +693,8 @@ clean-am: clean-aminfo clean-generic mostlyclean-am distclean: distclean-am -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-tags +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags dvi: dvi-am @@ -811,7 +819,8 @@ maintainer-clean-am: distclean-am maintainer-clean-aminfo \ mostlyclean: mostlyclean-am -mostlyclean-am: mostlyclean-aminfo mostlyclean-generic mostlyclean-vti +mostlyclean-am: mostlyclean-aminfo mostlyclean-compile \ + mostlyclean-generic mostlyclean-vti pdf: pdf-am @@ -831,20 +840,20 @@ uninstall-man: uninstall-man1 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-aminfo \ clean-generic cscopelist ctags dist-info distclean \ - distclean-generic distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dist_docDATA install-dvi \ + distclean-compile distclean-generic distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dist_docDATA install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-man1 install-pdf install-pdf-am install-ps \ install-ps-am install-strip installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-aminfo \ maintainer-clean-generic maintainer-clean-vti mostlyclean \ - mostlyclean-aminfo mostlyclean-generic mostlyclean-vti pdf \ - pdf-am ps ps-am tags uninstall uninstall-am \ - uninstall-dist_docDATA uninstall-dvi-am uninstall-html-am \ - uninstall-info-am uninstall-man uninstall-man1 \ - uninstall-pdf-am uninstall-ps-am + mostlyclean-aminfo mostlyclean-compile mostlyclean-generic \ + mostlyclean-vti pdf pdf-am ps ps-am tags uninstall \ + uninstall-am uninstall-dist_docDATA uninstall-dvi-am \ + uninstall-html-am uninstall-info-am uninstall-man \ + uninstall-man1 uninstall-pdf-am uninstall-ps-am $(dist_man1_MANS): $(top_srcdir)/configure.ac $(srcdir)/aclocal.1 $(srcdir)/automake.1: diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in index 8719084..c461141 100644 --- a/lib/Automake/Makefile.in +++ b/lib/Automake/Makefile.in @@ -66,6 +66,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +DEFAULT_INCLUDES = -I.@am__isrc@ AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; @@ -306,6 +307,12 @@ $(top_srcdir)/configure: $(am__configure_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c install-dist_perllibDATA: $(dist_perllib_DATA) @$(NORMAL_INSTALL) test -z "$(perllibdir)" || $(MKDIR_P) "$(DESTDIR)$(perllibdir)" @@ -603,7 +610,8 @@ clean-am: clean-generic mostlyclean-am distclean: distclean-recursive -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-tags +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags dvi: dvi-recursive @@ -651,7 +659,7 @@ maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-recursive -mostlyclean-am: mostlyclean-generic +mostlyclean-am: mostlyclean-compile mostlyclean-generic pdf: pdf-recursive @@ -670,16 +678,17 @@ uninstall-am: uninstall-dist_perllibDATA uninstall-nodist_perllibDATA .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am check check-am clean clean-generic cscopelist \ cscopelist-recursive ctags ctags-recursive distclean \ - distclean-generic distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dist_perllibDATA install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-nodist_perllibDATA install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ + distclean-compile distclean-generic distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dist_perllibDATA \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-nodist_perllibDATA install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am \ uninstall-dist_perllibDATA uninstall-nodist_perllibDATA diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in index 967a952..d6b9d41 100644 --- a/lib/Automake/tests/Makefile.in +++ b/lib/Automake/tests/Makefile.in @@ -63,6 +63,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +DEFAULT_INCLUDES = -I.@am__isrc@ AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; @@ -346,6 +347,12 @@ $(top_srcdir)/configure: $(am__configure_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c tags: TAGS TAGS: @@ -556,7 +563,7 @@ clean-am: clean-generic mostlyclean-am distclean: distclean-am -rm -f Makefile -distclean-am: clean-am distclean-generic +distclean-am: clean-am distclean-compile distclean-generic dvi: dvi-am @@ -604,7 +611,7 @@ maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am -mostlyclean-am: mostlyclean-generic +mostlyclean-am: mostlyclean-compile mostlyclean-generic pdf: pdf-am @@ -620,15 +627,16 @@ uninstall-am: recheck-html .PHONY: all all-am check check-TESTS check-am check-html clean \ - clean-generic distclean distclean-generic distdir dvi dvi-am \ - html html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am recheck recheck-html uninstall uninstall-am + clean-generic distclean distclean-compile distclean-generic \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ + recheck recheck-html uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/lib/Makefile.in b/lib/Makefile.in index 54de126..c526a83 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -69,6 +69,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +DEFAULT_INCLUDES = -I.@am__isrc@ AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; @@ -276,6 +277,12 @@ $(top_srcdir)/configure: $(am__configure_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c install-dist_pkgvdataDATA: $(dist_pkgvdata_DATA) @$(NORMAL_INSTALL) test -z "$(pkgvdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgvdatadir)" @@ -572,7 +579,8 @@ clean-am: clean-generic mostlyclean-am distclean: distclean-recursive -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-tags +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags dvi: dvi-recursive @@ -621,7 +629,7 @@ maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-recursive -mostlyclean-am: mostlyclean-generic +mostlyclean-am: mostlyclean-compile mostlyclean-generic pdf: pdf-recursive @@ -640,18 +648,19 @@ uninstall-am: uninstall-dist_pkgvdataDATA uninstall-dist_scriptDATA .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am check check-am clean clean-generic cscopelist \ cscopelist-recursive ctags ctags-recursive distclean \ - distclean-generic distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-data-hook install-dist_pkgvdataDATA \ - install-dist_scriptDATA install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installcheck-local installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \ - tags-recursive uninstall uninstall-am \ - uninstall-dist_pkgvdataDATA uninstall-dist_scriptDATA + distclean-compile distclean-generic distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-data-hook \ + install-dist_pkgvdataDATA install-dist_scriptDATA install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installcheck-local \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am uninstall-dist_pkgvdataDATA \ + uninstall-dist_scriptDATA install-data-hook: diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in index f31c27f..e8e3b3b 100644 --- a/lib/am/Makefile.in +++ b/lib/am/Makefile.in @@ -66,6 +66,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +DEFAULT_INCLUDES = -I.@am__isrc@ AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; @@ -268,6 +269,12 @@ $(top_srcdir)/configure: $(am__configure_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c install-dist_amDATA: $(dist_am_DATA) @$(NORMAL_INSTALL) test -z "$(amdir)" || $(MKDIR_P) "$(DESTDIR)$(amdir)" @@ -370,7 +377,7 @@ clean-am: clean-generic mostlyclean-am distclean: distclean-am -rm -f Makefile -distclean-am: clean-am distclean-generic +distclean-am: clean-am distclean-compile distclean-generic dvi: dvi-am @@ -418,7 +425,7 @@ maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am -mostlyclean-am: mostlyclean-generic +mostlyclean-am: mostlyclean-compile mostlyclean-generic pdf: pdf-am @@ -433,15 +440,16 @@ uninstall-am: uninstall-dist_amDATA .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am \ - install-dist_amDATA install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am uninstall-dist_amDATA + distclean-compile distclean-generic distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dist_amDATA install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-dist_amDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/m4/Makefile.in b/m4/Makefile.in index 679930b..11d6bea 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -66,6 +66,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +DEFAULT_INCLUDES = -I.@am__isrc@ AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; @@ -266,6 +267,12 @@ $(top_srcdir)/configure: $(am__configure_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c install-dist_m4dataDATA: $(dist_m4data_DATA) @$(NORMAL_INSTALL) test -z "$(m4datadir)" || $(MKDIR_P) "$(DESTDIR)$(m4datadir)" @@ -368,7 +375,7 @@ clean-am: clean-generic mostlyclean-am distclean: distclean-am -rm -f Makefile -distclean-am: clean-am distclean-generic +distclean-am: clean-am distclean-compile distclean-generic dvi: dvi-am @@ -416,7 +423,7 @@ maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am -mostlyclean-am: mostlyclean-generic +mostlyclean-am: mostlyclean-compile mostlyclean-generic pdf: pdf-am @@ -431,16 +438,16 @@ uninstall-am: uninstall-dist_m4dataDATA .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am \ - install-dist_m4dataDATA install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am \ - uninstall-dist_m4dataDATA + distclean-compile distclean-generic distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dist_m4dataDATA install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ + uninstall uninstall-am uninstall-dist_m4dataDATA # We build amversion.m4 here, instead of from config.status, diff --git a/tests/Makefile.in b/tests/Makefile.in index bfe8db4..d01cd5a 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -68,6 +68,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs CONFIG_CLEAN_FILES = defs-static aclocal-${APIVERSION} \ automake-${APIVERSION} CONFIG_CLEAN_VPATH_FILES = defs +DEFAULT_INCLUDES = -I.@am__isrc@ AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; @@ -1377,6 +1378,12 @@ aclocal-${APIVERSION}: $(top_builddir)/config.status $(srcdir)/aclocal.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ automake-${APIVERSION}: $(top_builddir)/config.status $(srcdir)/automake.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c tags: TAGS TAGS: @@ -1588,7 +1595,7 @@ clean-am: clean-generic clean-local mostlyclean-am distclean: distclean-am -rm -f Makefile -distclean-am: clean-am distclean-generic +distclean-am: clean-am distclean-compile distclean-generic dvi: dvi-am @@ -1636,7 +1643,7 @@ maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am -mostlyclean-am: mostlyclean-generic +mostlyclean-am: mostlyclean-compile mostlyclean-generic pdf: pdf-am @@ -1652,15 +1659,16 @@ uninstall-am: recheck-html .PHONY: all all-am check check-TESTS check-am check-html clean \ - clean-generic clean-local distclean distclean-generic distdir \ - dvi dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am recheck recheck-html uninstall uninstall-am + clean-generic clean-local distclean distclean-compile \ + distclean-generic distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ + recheck recheck-html uninstall uninstall-am backcompat5-p.log: backcompat5.test check-concurrency-bug9245-p.log: check-concurrency-bug9245.test -- 2.7.4