Merge branch 'dist-subdirs' into 'stable-1.5'

More autotools cleanups

See merge request etherlab.org/ethercat!15

Makefile.am

@@ -30,15 +30,17 @@
 ACLOCAL_AMFLAGS = -I m4
 
 AM_DISTCHECK_CONFIGURE_FLAGS = \
-  --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
+	--disable-8139too \
+	--with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
 
 SUBDIRS = \
 	include \
 	script
 
 if ENABLE_KERNEL
-SUBDIRS += devices
-SUBDIRS += master
+SUBDIRS += \
+	devices \
+	master
 endif
 
 if BUILD_TOOL
@@ -46,26 +48,16 @@ SUBDIRS += tool
 endif
 
 if ENABLE_USERLIB
-SUBDIRS += lib
+# userspace examples depend on lib/
+SUBDIRS += \
+	lib \
+	examples
 endif
 
 if ENABLE_TTY
 SUBDIRS += tty
 endif
 
-# userspace example depends on lib/
-SUBDIRS += examples
-
-DIST_SUBDIRS = \
-	devices \
-	examples \
-	include \
-	lib \
-	m4 \
-	master \
-	script \
-	tool \
-	tty
 
 noinst_HEADERS = \
 	globals.h

devices/Makefile.am

@@ -33,12 +33,6 @@ SUBDIRS = \
 	e1000e \
 	igb
 
-DIST_SUBDIRS = \
-	ccat \
-	e1000 \
-	e1000e \
-	igb
-
 # using HEADERS to enable tags target
 noinst_HEADERS = \
 	8139too-2.6.13-ethercat.c \

examples/Makefile.am

@@ -54,6 +54,8 @@ SUBDIRS += \
 endif
 endif
 
+# Here DIST_SUBDIRS needs to be explicitely defined because
+# dc_rtai, mini and rtai are never added to `SUBDIRS`
 DIST_SUBDIRS = \
 	dc_rtai \
 	dc_user \