Author: Alex Rousskov <rousskov@measurement-factory.com>

Fixed subdir handling when USE_LOADABLE_MODULES is false.

DIST_SUBDIRS was defined incorrectly. Moreover, we do not need to define
DIST_SUBDIRS because the default works:

  "If `SUBDIRS' is defined conditionally using Automake conditionals,
  Automake will define `DIST_SUBDIRS' automatically from the possibles
  values of `SUBDIRS' in all conditions."

The bug was exposed by ./test-builds.sh layer-01-minimal with "make distcheck"
test added.

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 46525be49c57ded4f831a1b3ec57817ea85118f5..8cd9e72ced2b6b61b2eadc3b6295a153da8179f4 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -3,17 +3,14 @@
 #  $Id$
 #
 
+SUBDIRS = libTrie
+
 if USE_LOADABLE_MODULES
-DIST_SUBDIRS = libLtdl
-SUBDIRS      = libLtdl
-else
-DIST_SUBDIRS =
-SUBDIRS      =
+SUBDIRS += libLtdl
 endif
 
-DIST_SUBDIRS += libTrie
-SUBDIRS      += libTrie
-CLEANFILES   =
+CLEANFILES =
+
 
 install: all
 install-strip: all