From 5e60e0d37e541d9f2311c7b60da61ba66a69f9e4 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sat, 1 Sep 2012 01:46:40 +0200
Subject: 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.
---
 build-aux/gen-lists-of-programs.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'build-aux')

diff --git a/build-aux/gen-lists-of-programs.sh b/build-aux/gen-lists-of-programs.sh
index 2db0745bc..c0b1fedc9 100755
--- a/build-aux/gen-lists-of-programs.sh
+++ b/build-aux/gen-lists-of-programs.sh
@@ -164,17 +164,18 @@ END
     ;;
   1,--automake|1,--for-automake)
     echo "## $msg"
+    progsdir=src
     echo no_install__progs =
     for p in $disabled_by_default_progs; do
-      echo no_install__progs += $p
+      echo no_install__progs += $progsdir/$p
     done
     echo build_if_possible__progs =
     for p in $build_if_possible_progs; do
-      echo build_if_possible__progs += $p
+      echo build_if_possible__progs += $progsdir/$p
     done
     echo default__progs =
     for p in $normal_progs; do
-      echo default__progs += $p
+      echo default__progs += $progsdir/$p
     done
     ;;
   *)
-- 
cgit v1.2.3-70-g09d2