[patch 15/39] make dist fixes for toplevel subdirs

The autotools can automatically track which subdirs have to be build,
according to some --with/--without decisions. However, it must be
ensured that if you take all variants together, all subdirs still must
be there. If we don't take care of that, we might lose some subdirs on
'make dist'. This patch makes sure that this works correctly and
additionally cleans up this file a little bit.

Signed-off-by: Robert Schwebel <[email protected]>

 Makefile.am |   55 ++++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 38 insertions(+), 17 deletions(-)

Index: Makefile.am
===================================================================
--- Makefile.am.orig
+++ Makefile.am
@@ -1,29 +1,50 @@
+OPT_SUBDIRS =
+
 if USING_LIBFFI
-LIBFFI_DIR = libffi
-else
-LIBFFI_DIR = 
+OPT_SUBDIRS += libffi
 endif
-  
+
 if USING_LIBGC
-LIBGC_DIR = libgc
-else
-LIBGC_DIR = 
+OPT_SUBDIRS += libgc
 endif
 
 if PNET_TOOLS
-
-SUBDIRS = . $(LIBGC_DIR) $(LIBFFI_DIR) include support image dumpasm engine ilasm ildasm \
-		  ilalink ilsize ilnative ilheader ilfind ildd codegen cscc \
-		  resgen ilstrip ilranlib ilgac csdoc csant clrwrap samples doc tests
-
+OPT_SUBDIRS += \
+	dumpasm \
+	ilasm \
+	ildasm \
+	ilalink \
+	ilsize \
+	engine \
+	ilnative \
+	ilheader \
+	ilfind \
+	ildd \
+	codegen \
+	cscc \
+	resgen \
+	ilstrip \
+	ilranlib \
+	ilgac \
+	csdoc \
+	csant \
+	clrwrap \
+	samples \
+	doc \
+	tests
 else
-
 ## We only want to build the runtime engine.
-SUBDIRS = . $(LIBGC_DIR) $(LIBFFI_DIR) include coremul support image engine
-
+OPT_SUBDIRS += \
+	coremul \
+	engine
 endif
 
-DIST_SUBDIRS = $(SUBDIRS)
-EXTRA_DIST = config-ml.in
+SUBDIRS = \
+	. \
+	include \
+	image \
+	support \
+	$(OPT_SUBDIRS)
 
+EXTRA_DIST = config-ml.in
 

--
 Dipl.-Ing. Robert Schwebel | http://www.pengutronix.de
 Pengutronix - Linux Solutions for Science and Industry
   Handelsregister:  Amtsgericht Hildesheim, HRA 2686
     Hannoversche Str. 2, 31134 Hildesheim, Germany
   Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9