summaryrefslogtreecommitdiff
path: root/m4/Makefile.in
Commit message (Collapse)AuthorAgeFilesLines
* uninstall: "make uninstall" before "make install" worksStefano Lattarini2011-09-261-6/+8
| | | | | | | | | | | | | | | | | | | | | This change fixes automake bug#9578. * lib/am/inst-vars.am (am__uninstall_files_from_dir): New internal macro, that defines a shell code fragment to uninstall files from a given directory. * lib/am/data.am (uninstall-%DIR%%PRIMARY%): Use it, to reduce code duplication and improve consistency and correctness. * lib/am/libs.am (uninstall-%DIR%LIBRARIES): Likewise. * lib/am/lisp.am (uninstall-%DIR%LISP): Likewise. * lib/am/mans.am (uninstall-man%SECTION%): Likewise. * lib/am/python.am (uninstall-%DIR%LIBRARIES): Likewise. * lib/am/scripts.am (uninstall-%DIR%SCRIPTS): Likewise. * tests/uninstall-pr9578.test: New test. * tests/uninstall-fail.test: New test. * tests/Makefile.am (TESTS): Add them. * NEWS, THANKS: Update. Report by Nick Bowler.
* aclocal: more granularity in acdir overridingStefano Lattarini2011-09-081-28/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this change, using the `--acdir' option caused aclocal to redefine both the directory of automake-provided m4 macros and the directory of third-party system-wide m4 macros. With this change, we deprecate the `--acdir' aclocal option, and introduce two new options `--automake-acdir' and `--system-acdir', to allow for more granularity. * aclocal.in (@automake_includes, @system_includes, @user_includes): Fix and extend comments. (usage): Update. (handle_acdir_option): New function. (parse_arguments): Recognize new options `--system-acdir' and `automake-acdir', and handle `--acdir' using the new function above. Simplify logic by assuming that the directory of third-party system-wide m4 files always exists. * tests/aclocal.in: Update to use the new options, instead of the deprecated. `--acdir'. * m4/dirlist: Move ... * m4/acdir/dirlist: ... here. * m4/Makefile.am (EXTRA_DIST): Update. (m4datadir): Rename ... (automake_acdir): ... to this. Accordingly, ... (dist_m4data_DATA): ... rename this ... (dist_automake_ac_DATA): ... to this. (system_acdir): New, directory. (dist_system_ac_DATA): New, defined to an empty value; this will ensure that the $(system_acdir) directory will be created by "make install". * tests/aclocal.test: Remove check about the `--print-ac-dir' option of aclocal, it has been moved into ... * tests/aclocal-print-acdir.test: ... this new test, and quite extended. * tests/aclocal-acdir.test: New test. * tests/Makefile.am (TESTS): Add the new tests. * NEWS, bootstrap: Update. * doc/automake.texi (aclocal Options, Macro Search Path): Update.
* build: the user can override AUTOM4TE, AUTORECONF and AUTOUPDATE tooStefano Lattarini2011-05-301-0/+3
| | | | | | | | | | | | | | Our build system allows the user to override AUTOCONF and AUTOHEADER at configure time, and honours these overrides in our testsuite. But it didn't do the same with AUTOM4TE, AUTORECONF and AUTOUPDATE. This change fixes that inconsistency. * configure.ac (am_AUTOM4TE, am_AUTOUPDATE, am_AUTORECONF): New AC_SUBSTitutions. Update comments. * tests/defs.in ($AUTOUPDATE): Default to `@am_AUTOUPDATE@' now. ($AUTOM4TE): New variable, defaulting to `@am_AUTOM4TE@'. ($AUTORECONF): New variable, defaulting to `@am_AUTORECONF@'. * doc/Makefile.am ($(srcdir)/amhello-1.0.tar.gz): Update.
* Bump copyright years.Ralf Wildenhues2011-01-021-1/+1
| | | | | | | | * aclocal.in (write_aclocal, version): Bump copyright years. * automake.in (gen_copyright, version): Likewise. * doc/automake.texi: Likewise. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* Fix install-strip when $(STRIP) contains several words.Ralf Wildenhues2010-11-141-4/+9
| | | | | | | | | | * lib/am/install.am (install-strip): Update comment. Use separate sub-make invocations for empty and nonempty $(STRIP), to fix quoting issues. * tests/strip2.test, tests/strip3.test: New tests. * tests/Makefile.am (TESTS): Adjust. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* Bump copyright years.Ralf Wildenhues2010-01-171-2/+2
| | | | | | | | * aclocal.in (write_aclocal, version): Bump copyright years. * automake.in (gen_copyright, version): Likewise. * doc/automake.texi: Likewise. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* Fix and complete copyright notices in Makefile.am files.Ralf Wildenhues2009-12-291-0/+16
| | | | | | | | | | | | | | | | | * Makefile.am: Use single-`#' comment for copyright notice, so that it also appears in the generated Makefile.in file. * doc/Makefile.am: Likewise. * doc/amhello/Makefile.am: Likewise. * doc/amhello/src/Makefile.am: Likewise. * lib/Automake/Makefile.am: Likewise. * lib/Automake/tests/Makefile.am: Likewise. * lib/Makefile.am: Likewise. * lib/am/Makefile.am: Likewise. * m4/Makefile.am: Likewise. * tests/Makefile.am: Add copyright notice. Report of missing copyright notice by Stefano Lattarini. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* Avoid sleeping for one second most of the time in sanity check.Ralf Wildenhues2009-09-061-0/+1
| | | | | | | | | | | * m4/sanity.m4 (AM_SANITY_CHECK): Try sanity check first without sleeping for a second, and only if that failed, sleep and try again, to avoid the delay in the common case of a configure script that is older than a second, or a system with sub-second time stamp granularity. Report and different patch by Jim Meyering. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* Version 1.11.v1.11Ralf Wildenhues2009-05-171-1/+1
| | | | | | | | * configure.ac: Bump version to 1.11. * doc/automake.texi (Releases): Add line for 1.11. Remove line for 1.10b. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* Disable test cleanup trap with OSF1/Tru64 sh.Ralf Wildenhues2009-05-031-0/+1
| | | | | | | | | | * configure.ac: Test whether /bin/sh has working 'set -e' in conjunction with an exit trap. Set $am_cv_sh_errexit_works accordingly, substitute sh_errexit_works, and warn about leftover test directories with broken shells like Tru64 /bin/sh. * tests/defs.in: Do not install any traps with broken shells. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* Merge branch 'mh-vala-support' into nextRalf Wildenhues2009-04-191-1/+2
|\ | | | | | | | | | | | | | | | | * mh-vala-support: More minor fixups to vala support. Improve Vala support. Minor fixups for Vala support. Support Vala in non-recursive builds; more tests and fixes. Initial support for the vala programming language.
| * Merge branch 'next' (early part) into mh-vala-supportRalf Wildenhues2009-04-191-8/+28
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'next' (early part): (135 commits) parallel-tests: LOG_COMPILER for tests without known extension. More node renaming in the manual. Fix instdir-java.test failure. Fix testsuite failures due to nonexistent `dirlist' entries. Fix typo in manual. Avoid test failure due to paranoid TAR_OPTIONS envvar setting. Use more common spelling in diagnostic: s/canonic/canonical/. Post-release version bump. Version 1.10b. Minor NEWS update. Reorganize nodes in the manual. Update AM_RECURSIVE_TARGETS for parallel-tests. parallel-tests: New target recheck-html. Rewrite maintainer-check in separate tests, parallelizable. Fix maintainer-check failure. Fix latex warning in manual. Sync auxiliary files from upstream. parallel-tests: redo lazy checking: recheck and RECHECK_LOGS. parallel-tests: do not mark check-TESTS as `.MAKE'. parallel-tests: warn about $(srcdir), $(top_srcdir) in TESTS. ...
| * | Initial support for the vala programming language.Mathias Hasselmann2008-10-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * automake.in: Add %known_libraries, lang_vala_rewrite, lang_vala_finish and lang_vala_target_hook to support the Vala programming language. Register Vala language hooks. * lib/am/vala.am: Empty rules file to prevent creation of depend2 based rules for Vala code. * lib/am/Makefile.am (dist_am_DATA): Add vala.am. * m4/vala.m4: Provide AC_PROG_VALAC for detecting the Vala compiler. * m4/Makefile.am (dist_m4data_DATA): Add vala.m4. * tests/vala.test: Test Vala support. * tests/Makefile.am: Update. Signed-off-by: Mathias Hasselmann <mathias.hasselmann@gmx.de> Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* | | silent-rules reorganization, --enable-silent-rules switch.Ralf Wildenhues2009-04-131-0/+1
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch introduces a configure-time option to set the default verbosity. Since configure now needs to know whether the `silent-rules' automake option was set, the latter can only be set within AM_INIT_AUTOMAKE, or with a new AM_SILENT_RULES macro but not any more through AUTOMAKE_OPTIONS or the automake command line option `--silent-rules'. * automake.in (define_verbose_var): Define the default verbose variable in terms of `$(AM_DEFAULT_VERBOSITY)'. (handle_configure): Do not pass `--silent-rules' to automake. (scan_autoconf_traces): Trace `AM_SILENT_RULES'. If seen, enable global `silent-rules' option. (usage): Do not document `--silent-rules'. (parse_arguments): Do not accept `--silent-rules'. * doc/automake.texi (Options): Overhaul. Document AM_SILENT_RULES, --enable-silent-rules, --disable-silent-rules, AM_DEFAULT_VERBOSITY. Show an example for user-added variables for less verbose output. (Invoking Automake): Remove documentation for `--silent-rules'. (Public Macros): Document `AM_SILENT_RULES'. * NEWS: Update. * lib/Automake/Options.pm (_process_option_list): Accept `silent-rules' only as option in configure.ac. * m4/init.m4 (AM_INIT_AUTOMAKE): If the `silent-rules' option was enabled, require `AM_SILENT_RULES'; move AM_BACKSLASH initialization to ... * m4/silent.m4 (AM_SILENT_RULES): ... this new file, new macro. Deal with `--enable-silent-rules' switch; define AM_DEFAULT_VERBOSITY. * m4/Makefile.am (dist_m4data_DATA): Add silent.m4. * tests/dollarvar.test: Remove tests for `--silent-rules', use `AM_SILENT_RULES'. * tests/flavor.test: Remove test for `--silent-rules'. * tests/silent.test: Use `AM_SILENT_RULES' instead of `AUTOMAKE_OPTIONS = silent-rules'; use `--enable-silent-rules'. * tests/silent2.test: Likewise. * tests/silent3.test: Likewise. * tests/silent4.test: Likewise. * tests/silent5.test: Likewise. * tests/silent6.test: Likewise. Test `AM_SILENT_RULES' as well as `AM_INIT_AUTOMAKE([silent-rules])' instead of `--silent-rules'. * tests/silent7.test: Use `AM_SILENT_RULES' instead of `AUTOMAKE_OPTIONS = silent-rules'; ensure the latter is rejected. Test combinations of --enable-silent-rules and --disable-silent-rules with `make V=0' and `make V=1'. Suggestion for configure-time switch by Bob Friesenhahn. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* | Post-release version bump.Ralf Wildenhues2009-03-311-1/+1
| | | | | | | | | | | | * configure.ac, NEWS: Bump version to 1.10c. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* | Version 1.10b.v1.10bRalf Wildenhues2009-03-291-1/+1
| | | | | | | | | | | | | | * configure.ac, NEWS: Bump version to 1.10b. * doc/automake.texi (Releases): Add statistics for 1.10b. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* | Merge branch 'master' into nextRalf Wildenhues2009-03-291-4/+9
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Rewrite maintainer-check in separate tests, parallelizable. Fix maintainer-check failure. Fix latex warning in manual. Sync auxiliary files from upstream. manual: minor cleanups. Sane (un)install for empty directory variables. Ensure that empty directory variables work with empty content variables. Use --tag=FC with libtool also for .f90 files. DISTFILES containing a directory and files in that directory. Fix a documentation typo. Define AM_RECURSIVE_TARGETS, for gnulib's GNUmakefile. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
| * | Sane (un)install for empty directory variables.Ralf Wildenhues2009-03-281-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes all install and uninstall rules to behave sanely when $(wheredir) is the empty string, but $(where_HOW) is nonempty, for all kinds of values of `where' and `HOW'. * lib/am/data.am (install-%DIR%%PRIMARY%, uninstall-%DIR%%PRIMARY%): Do not touch the install tree if the corresponding directory variable $(%NDIR%dir) is empty. * lib/am/java.am (install-%DIR%JAVA, uninstall-%DIR%JAVA): Likewise. * lib/am/libs.am (install-%DIR%LIBRARIES, uninstall-%DIR%LIBRARIES): Likewise. * lib/am/lisp.am (install-%DIR%LISP, uninstall-%DIR%LISP): Likewise. * lib/am/ltlib.am (install-%DIR%LTLIBRARIES, uninstall-%DIR%LTLIBRARIES): Likewise. * lib/am/mans.am (install-man%SECTION%, uninstall-man%SECTION%): Likewise. * lib/am/progs.am (install-%DIR%PROGRAMS, uninstall-%DIR%PROGRAMS): Likewise. * lib/am/python.am (install-%DIR%PYTHON, uninstall-%DIR%PYTHON): Likewise. * lib/am/scripts.am (install-%DIR%SCRIPTS, uninstall-%DIR%SCRIPTS): Likewise. * lib/am/texinfos.am (install-dvi-am, install-html-am, install-pdf-am) (install-ps-am, uninstall-dvi-am, uninstall-html-am, uninstall-pdf-am) (uninstall-ps-am): Likewise. * tests/instdir2.test, tests/instdir-java.test, tests/instdir-lisp.test, tests/instdir-ltlib.test, tests/instdir-prog.test, tests/instdir-python.test, tests/instdir-texi.test: New tests. * tests/Makefile.am: Update. * NEWS: Update. Suggestion by Akim Demaille. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
| * | DISTFILES containing a directory and files in that directory.Peter Breitenlohner2009-03-221-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For PR automake/533: When the source tree contains non-writable files or directories (as happens during distcheck), and directories or entries thereof are listed multiple times in variables to be distributed, then the corresponding directories below $(distdir) need to be made writable recursively. Since file modes should not change, they need to be copied recursively using `cp -f'. * lib/am/distdir.am: Handle this situation. * tests/distdir.test: Extend test to those cases. * NEWS: Update. Report by Peter Breitenlohner. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* | | Keep `--silent-rules' across triggered automake reruns.Ralf Wildenhues2009-03-101-2/+2
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | * automake.in (usage): Reformat to be a bit clearer. (handle_configure): Remove substitutions %STRICTNESS% and %USE-DEPS% in favor of a new substitution %AUTOMAKE-OPTIONS% that carries over all needed flags. * lib/am/configure.am (%MAKEFILE-IN%): Adjust rule. * tests/flavor.test: New test, to ensure --$flavor (gnu, gnits, foreign, cygnus), --ignore-deps, and --silent-rules are preserved across automake reruns. * tests/Makefile.am: Update. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* | Fix recursive html and install-* doc rules for BSD make.Ralf Wildenhues2009-03-011-0/+12
| | | | | | | | | | | | | | | | | | | | * automake.in (%required_targets): Add html-am, install-html-am, install-dvi-am, install-pdf-am, install-ps-am, install-info-am. * tests/txinfo32.test: New test. * tests/Makefile.am: Update. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* | Bump copyright years.Ralf Wildenhues2009-01-201-1/+2
| | | | | | | | | | | | | | | | * aclocal.in (write_aclocal, version): Bump copyright years. * automake.in (gen_copyright, version): Likewise. * doc/automake.texi: Likewise. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* | Cope with whitespace in $MISSING and $install_sh.Ralf Wildenhues2008-11-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * configure.ac (am_AUTOHEADER): New substitution, save the value of $AUTOHEADER before AM_INIT_AUTOMAKE may add $MISSING. * tests/defs.in: Use am_AUTOHEADER. * lib/am/install.am: Fix typo. * m4/install-sh.m4 (AM_PROG_INSTALL_SH): Add suitable single-quote quoting to install_sh, but only if needed. * m4/missing.m4 (AM_MISSING_HAS_RUN): Add suitable double-quote quoting to MISSING, but only if needed. * m4/sanity.m4 (AM_SANITY_CHECK): Abort configure if `pwd` or $srcdir contain shell meta-characters that cannot be handled; space and tab are allowed in the former only. * tests/sanity.test: New test. * tests/Makefile.am: Adjust. * NEWS: Update. Reports by Jim Meyering and others. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* | Parallel automake execution: AUTOMAKE_JOBS.Ralf Wildenhues2008-10-261-0/+1
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lib/Automake/Config.in (perl_threads): New global. * automake.in: Use it. If the perl supports interpreter-based threading, then use `threads' and `Thread::Queue'. (handle_makefile, handle_makefiles_serial): New functions, factored out from main. (get_number_of_threads): New function, compute number of threads to use, based on environment variable `AUTOMAKE_JOBS' and number of independent makefiles. (handle_makefiles_threaded): New function. Spawn threads, use thread queue to distribute handling the different makefiles. Collect $exit_code values from threads. (main): Use new functions. * aclocal.in: No threads here. * configure.ac: Substitute PERL_THREADS; enabled with perl >= 5.7.2 and when ithreads are available. * bootstrap (dosubst): Likewise. * Makefile.am (do_subst): Likewise. * lib/Automake/Makefile.am (do_subst): Likewise. * lib/Automake/ChannelDefs.pm: Use `Automake::Config' and `threads'. (verb): Prepend thread ID (tid) to verbose messages. * lib/Automake/Channels.pm (msg): Before exiting, flush stderr, needed for worker threads. * lib/Automake/tests/Makefile.am (TESTS_ENVIRONMENT): Also include the build tree path, so Config.pm is found. * tests/parallel-am.test: New test. * tests/Makefile.am: Update. * doc/automake.texi (Invoking Automake): Document AUTOMAKE_JOBS. * NEWS, THANKS: Update. Report about long execution times by Joakim Tjernlund and others. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* Remove unneeded per-rule *INSTALL variables.Ralf Wildenhues2008-09-201-3/+2
| | | | | | | | | | | | | | | | | | * NEWS: Update. * lib/am/data.am (%DIR%%PRIMARY%_INSTALL): Remove. (install-%DIR%%PRIMARY%): Adjust. * lib/am/libs.am (%DIR%LIBRARIES_INSTALL): Remove. (install-%DIR%LIBRARIES): Adjust. * lib/am/ltlibs.am (%DIR%LTLIBRARIES_INSTALL): Remove. (install-%DIR%LTLIBRARIES): Adjust. * lib/am/progs.am (%DIR%PROGRAMS_INSTALL): Remove. (install-%DIR%PROGRAMS): Adjust. * lib/am/python.am (%DIR%PYTHON_INSTALL): Remove. (install-%DIR%PYTHON): Adjust. * lib/am/scripts.am (%DIR%SCRIPT_INSTALL): Remove. (install-%DIR%SCRIPTS): Adjust. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* Man pages for automake and aclocal.Ralf Wildenhues2008-09-201-0/+1
| | | | | | | | | | | | | | * configure.ac (HELP2MAN): New substitution. * doc/Makefile.am (dist_man1_MANS, MAINTAINERCLEANFILES) (update_mans): New macros. ($(srcdir)/aclocal-$(APIVERSION).1) ($(srcdir)/automake-$(APIVERSION).1): New rules, generate man pages from the command line help with help2man. ($(srcdir)/aclocal.1, $(srcdir)/automake.1): New rules, for `.so' man page links to the versioned pages. * NEWS: Update. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* Faster `make uninstall'; fast install for JAVA.Ralf Wildenhues2008-09-071-8/+11
| | | | | | | | | | | | | | | | | * lib/am/inst-vars.am (am__nobase_strip_setup) (am__nobase_strip): New macros. (am__nobase_list): Factorize. * lib/am/data.am (uninstall-%DIR%%PRIMARY%): Use them, for a constant number of forks per uninstall. * lib/am/libs.am (uninstall-%DIR%LIBRARIES): Likewise. * lib/am/lisp.am (uninstall-%DIR%LISP): Likewise. * lib/am/progs.am (uninstall-%DIR%PROGRAMS): Fast uninstall. * lib/am/python.am (uninstall-%DIR%PYTHON): Fast uninstall. Echo all `rm' commands that are are executed. * lib/am/java.am (install-%DIR%JAVA, uninstall-%DIR%JAVA): Fast install and uninstall. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* Exit upon `install' failure, part one.Ralf Wildenhues2008-09-071-1/+2
| | | | | | | | | | | | | | * lib/am/data.am (install-%DIR%%PRIMARY%): Exit if any install command fails. * lib/am/python.am (install-%DIR%PYTHON): Likewise. * lib/am/scripts.am (install-%DIR%SCRIPTS): Likewise. * lib/am/texinfos.am (install-dvi-am, install-html-am) (install-info-am:, install-pdf-am): Likewise. * tests/instmany.test: New test, for SCRIPTS, DATA, and HEADERS. * tests/instmany-python.test: New test, for PYTHON. * tests/Makefile.am: Adjust. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* Fix multi-file installation for files in srcdir.Ralf Wildenhues2008-09-061-7/+10
| | | | | | | | | | | | | | | | | For files that can live in the build tree or the source tree, we have to expect that prepending `$(srcdir)/' to each name will let the install command line exceed length limitations. Thus use a new macro, $(am__base_list), to install in chunks of 40 files, similar to what we do for nobase_* files. There, lower the limit to 40, too. * lib/am/inst-vars.am (am__install_max): Lower to 40. (am__base_list): New macro. * lib/am/data.am (install-%DIR%%PRIMARY%) [%?BASE%]: Use it. * lib/am/texinfos.am (install-dvi-am, install-html-am) (install-info-am, install-pdf-am, install-ps-am): Likewise. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* For all possibly-relative subdirs, use $(am__cd).Ralf Wildenhues2008-09-041-1/+1
| | | | | | | | | | | | | | | | | | | | Up to now, $(am__cd) was only used within backquotes, to avoid extraneous output. This patch also uses it for every `cd' to a relative subdir, to prevent CDPATH from entering an unwanted directory. * Makefile.am (maintainer-check): Fix current check for $(am__cd) within backquotes a bit. Add new check for `cd' to a relative subdir. * automake.in (handle_tags, handle_configure): Adjust rules. * lib/am/ansi2knr.am: Likewise. * lib/am/configure.am: Likewise. * lib/am/distdir.am: Likewise. * lib/am/remake-hdr.am: Likewise. * lib/am/subdirs.am: Likewise. * lib/am/tags.am: Likewise. * lib/am/texibuild.am: Likewise. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* Fix rebuilding of removed subdir/Makefile.in files.Ralf Wildenhues2008-08-221-2/+2
| | | | | | | | | | | | * lib/am/configure.am (%MAKEFILE-IN%) [?!TOPDIR_P?]: If subdir/Makefile.in was removed, am--refresh would not update it. Fix up for it by running the per-directory rebuild rule. * tests/remake6.test, tests/remake6.test: New tests. * tests/Makefile.am: Adjust. * NEWS, THANKS: Update. Report and initial patch by Ilya N. Golubev. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* New variable am__install_max.Ralf Wildenhues2008-06-181-1/+3
| | | | | | | * lib/am/inst-vars.am (am__install_max): New variable. (am__nobase_list): Use it. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* For AC_CONFIG_LINKS(X,X), do not clean X in a non-VPATH build.Ralf Wildenhues2008-06-181-0/+2
| | | | | | | | | | | | | | | * automake.in (rewrite_inputs_into_dependencies): Do distribute inputs where input and output name are equal. This relies on the assumption that it only happens with AC_CONFIG_LINKS. (handle_configure) <CONFIG_CLEAN_VPATH_FILES>: New variable, for links where source and dest are equal. * lib/am/clean.am (distclean-generic): Remove, if build tree not equal source tree. * tests/conflnk4.test: New test. * tests/Makefile.am: Adjust. * NEWS: Update. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* Implement conditional AC_CONFIG_FILES: AM_COND_IF.Ralf Wildenhues2008-03-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | * automake.in (%ac_config_files_condition): New. (scan_autoconf_config_files): Record condition if any. (scan_autoconf_traces): Trace _AM_COND_IF, _AM_COND_ELSE, _AM_COND_ENDIF, updating @cond_stack as appropriate. (handle_configure): Prefix config.status rule with condition. Check that m4 quotation is done consistently. * m4/cond.m4 (AM_CONDITION): Define `_AM_COND_VALUE_name' with `name' being the name of the condition, to its shell condition. * m4/cond-if.m4: New file. (_AM_COND_IF, _AM_COND_ELSE, _AM_COND_ENDIF): New trace helpers. (AM_COND_IF): New macro, implements conditionals. * m4/Makefile.am: Adjust. * doc/automake.texi (Requirements, Optional, Conditionals): Document AM_COND_IF. * NEWS: Update. * tests/cond39.test, tests/cond40.test, tests/cond41.test, tests/cond42.test, tests/cond43.test: New tests. * tests/Makefile.am: Adjust. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* Exploit `install' with multiple files at once for some file types.Ralf Wildenhues2008-03-081-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With nobase targets, at most 50 files are installed at once, to avoid quadratic string concatenation and line length limits. This isn't yet done with base targets. One hope is that there, the typical file name length is lower. If this turns out to be a problem, it should be revisited. * lib/am/inst-vars.am (am__nobase_list): New helper macro for installation of multiple nobase files at once: sorts and lists files keyed by their target directory. * lib/am/data.am (%DIR%%PRIMARY%_INSTALL): No need to set it to $(install_sh_DATA) any more, not even for nobase targets. (install-%DIR%%PRIMARY%): Split base and nobase cases. Rewrite to pass lists of files which all go in the same directory to `install'. In the nobase case, make use of $(am__nobase_list) and $(MKDIR_P) each directory before populating it. Take care of files in source and build trees, and avoid creating directories where no files are to be installed. * lib/am/libs.am (%DIR%LIBRARIES_INSTALL): Likewise. (install-%DIR%LIBRARIES): Likewise. * lib/am/python.am (%DIR%PYTHON_INSTALL): Likewise. (install-%DIR%PYTHON): Likewise. Also take care to keep note of a list for byte compilation after installation. * lib/am/texinfos.am (install-dvi-am, install-html-am) (install-info-am, install-pdf-am, install-ps-am): Use file lists to install multiple files at once. * NEWS: Update. Suggested by Akim Demaille. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* Require unreleased Autoconf for fixed AC_PROG_INSTALL.Ralf Wildenhues2008-03-081-0/+1
| | | | | | | | | * m4/init.m4 (AM_INIT_AUTOMAKE): Bump AC_PREREQ to 2.61-341, regenerate files. * configure.ac: Also require Autoconf 2.61-341, to catch failure early and provide a sensible error message. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* Regenerate.Ralf Wildenhues2008-01-021-1/+1
|
* Reword the copyright notices to match what's suggested in GPLv3.Ralf Wildenhues2007-12-081-0/+1
|
* Regenerate.Ralf Wildenhues2007-12-081-4/+4
|
* Ternary operator in lib/am files.Akim Demaille2007-11-241-3/+3
| | | | | | | | | | | | | | | * automake.in (&transform_token): New. (&transform): Use it. Support %KEY?TRUE:FALSE%. (&make_paragraphs): Adjust the regexp to call %transform. * lib/am/data.am, lib/am/libs.am, lib/am/lisp.am, lib/am/ltlib.am, * lib/am/progs.am, lib/am/python.am, lib/am/scripts.am: Use %KEY?TRUE:FALSE%. * lib/am/inst-vars.am (am__strip_dir): Assign the result to f to be more alike am__vpath_adj. Adjust dependencies. Signed-off-by: Akim Demaille <akim@lrde.epita.fr>
* * lib/am/configure.am (%?REGEN-ACLOCAL-M4%): New targetRalf Wildenhues2007-07-221-0/+1
| | | | | | | | $(am__aclocal_m4_deps) without any dependencies, to avoid the "deleted .m4 file" problem. * tests/acloca22.test: New test. * tests/Makefile.am: Update. * NEWS: Update.
* * automake.in (scan_autoconf_config_files): Warn about leadingRalf Wildenhues2007-03-281-1/+1
| | | | | | | | `./' in config file names. * tests/canon-name.test: New test. * tests/Makefile.am: Update. * THANKS: Update. Suggestion by Claudio Fontana.
* * lib/am/header-vars.am (pkglibexecdir): New variable.Ralf Wildenhues2006-10-161-1/+2
| | | | | | | | | | * automake.in (%standard_prefix): Add it. * doc/automake.texi (Uniform): Document it. (Program Sources): Adjust. * NEWS: Update. * tests/libexec.test: New test. * tests/Makefile.am: Update. Suggested by Eric Blake.
* * configure.ac, NEWS: Bump version to 1.10a.Alexandre Duret-Lutz2006-10-151-1/+1
|
* * configure.ac, NEWS: Bump version to 1.10.branchpoint-1-10Release-1-10Alexandre Duret-Lutz2006-10-151-1/+1
| | | | * doc/automake.texi (Releases): Update for 1.10.
* For PR automake/500:Alexandre Duret-Lutz2006-08-301-1/+2
| | | | | | | | | * automake.in (handle_compile) <$default_includes>: Do not output the same -I twice. Use @am__isrc@ instead of ` -I$(srcdir)'. * m4/init.m4: Define am__isrc as ` -I$(srcdir)' only in non-VPATH builds since we always have `-I.'. * tests/subpkg.test: Make sure config headers are found in VPATH and non-VPATH builds.
* * NEWS, configure.ac: Bump version to 1.9c.Alexandre Duret-Lutz2006-08-201-1/+1
|
* * NEWS, configure.ac: Bump version to 1.9b.Release-1-9bAlexandre Duret-Lutz2006-08-201-1/+1
|
* * Makefile.am (maintainer-check): Check for mkdir_p.Alexandre Duret-Lutz2006-08-191-3/+3
| | | | | | | | | | | | | * automake.texi (Obsolete macros): Document AM_PROG_MKDIR_P. * lib/am/data.am, lib/am/distdir.am, lib/am/install.am, lib/am/java.am, lib/am/libs.am, lib/am/lisp.am, lib/am/ltlib.am, lib/am/mans.am, lib/am/progs.am, lib/am/python.am, lib/am/scripts.am, lib/am/texinfos.am: Use MKDIR_P instead of mkdir_p. * m4/mkdirp.m4 (AM_PROG_MKDIR_P): Define mkdir_p using $MKDIR_P, not as '$(MKDIR_P)', otherwise it will break `Makefile.in's that use mkdir_p without defining MKDIR_P. * tests/distdir.test, tests/instman.test, tests/txinfo21.test: Adjust.
* * automake.in: Register "Unified Parallel C" as language.Alexandre Duret-Lutz2006-08-141-1/+2
| | | | | | | | | | | | | | | | | (lang_upc_rewrite): New function. (resolve_linker): Consider UPCLINK. * lib/Automake/Variable.pm (%_ac_macro_for_var): Suggest AM_PROG_UPC for UPC and UPCFLAGS. * m4/upc.m4: New file. * m4/depend.m4 (_AM_DEPENDENCIES): Add UPC case. * m4/Makefile.am (dist_m4data_DATA): Add upc.m4. * doc/automake.texi (Unified Parallel C Support): New node. (Public macros): Mention AM_PROG_UPC. (Program and Library Variables, Flag Variables Ordering): Mention UPCFLAGS. * tests/upc.test, tests/upc2.test, tests/upc3.test: New file. * tests/Makefile.am (TESTS): Add them. * tests/ext.test: Also test upc files.