diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-09-01 01:46:40 +0200 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2012-09-01 21:25:13 +0200 |
| commit | 5e60e0d37e541d9f2311c7b60da61ba66a69f9e4 (patch) | |
| tree | fc028f51dc5a7444e679630b8b60ac47cc5b3abc /Makefile.am | |
| parent | 4f2e62ba9fd482375fdc085de71a5c947741d140 (diff) | |
| download | coreutils-5e60e0d37e541d9f2311c7b60da61ba66a69f9e4.tar.xz | |
build: don't use recursive make to build the 'src' subdirectory
* Makefile.am (SUBDIRS): Remove 'src'. Ensure '.' is listed before
'tests' and 'gnulib-tests'.
(dist-hook): Adjust: we must now tweak the top-level Makefile.in
in $(distdir), not the one in the 'src/' subdir (which is gone).
(include): The '$(top_srcdir)/src/local.mk' file.
* build-aux/gen-lists-of-programs.sh: Adjust the generation of the
automake input fragment.
* tests/Makefile.am (.built-programs): Adjust.
* cfg.mk (all_programs): Remove this convenience rule; it's no
longer needed, now that we can rely directly on the contents of
$(all_programs).
(sc_option_desc_uppercase, check-programs-vs-x:): Adjust lists
of prerequisites accordingly.
(all-progs-but-lbracket): Simplify definition accordingly.
* configure.ac ($OPTIONAL_BIN_PROGS): Adjust definition.
($OPTIONAL_PKGLIB_PROGS): Likewise.
($NO_INSTALL_PROGS_DEFAULT): Tweak definition, for consistency.
(AC_CONFIG_FILES): Remove 'src/Makefile'.
* src/Makefile.am: Rename ...
* src/local.mk: ... like this, with a lot of adjustments. In
addition ...
(all_programs): ... remove this now-unneeded convenience target.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index f3d6eda57..6a56f6832 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,7 +17,7 @@ ALL_RECURSIVE_TARGETS = -SUBDIRS = lib src po tests gnulib-tests +SUBDIRS = lib po . tests gnulib-tests changelog_etc = \ ChangeLog-2005 \ @@ -92,7 +92,7 @@ BUILT_SOURCES = .version # See the rm_subst comment for details. dist-hook: gen-ChangeLog $(AM_V_GEN)echo $(VERSION) > $(distdir)/.tarball-version - $(AM_V_at)perl -pi -e '$(rm_subst)' $(distdir)/src/Makefile.in + $(AM_V_at)perl -pi -e '$(rm_subst)' $(distdir)/Makefile.in gen_start_date = 2008-02-08 .PHONY: gen-ChangeLog @@ -170,5 +170,6 @@ check-git-hook-script-sync: rm -rf $$t; \ test $$fail = 0 +include $(top_srcdir)/src/local.mk include $(top_srcdir)/doc/local.mk include $(top_srcdir)/man/local.mk |