--- a/Makefile.am	Fri Oct 13 10:07:10 2006 +0000
+++ b/Makefile.am	Tue Nov 07 12:13:30 2006 +0000
@@ -1,9 +1,5 @@
 #------------------------------------------------------------------------------
 #
-#  Makefile.am
-#
-#  IgH EtherCAT master
-#
 #  $Id$
 #
 #  Copyright (C) 2006  Florian Pose, Ingenieurgemeinschaft IgH
@@ -39,19 +35,50 @@
 
 DIST_SUBDIRS = master devices script include examples
 
-EXTRA_DIST = documentation/ethercat_doc.pdf
+EXTRA_DIST = \
+	bootstrap \
+	documentation/ethercat_doc.pdf \
+	Doxyfile \
+	FEATURES \
+	globals.h \
+	LICENSE
+
+modules:
+	$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" modules
+
+modules_install:
+	$(MAKE) -C master modules_install
+	$(MAKE) -C devices modules_install
+
+clean-local:
+	$(MAKE) -C "$(LINUX_SOURCE_DIR)" M="@abs_srcdir@" clean
+	@rm -f Modules.symvers
 
 mydist:
 	@SVNREV=`svnversion $(srcdir)` && \
-		$(MAKE) dist-bzip2 distdir=$(PACKAGE)-$(VERSION)-r$${SVNREV}
+	  $(MAKE) dist-bzip2 \
+	  distdir=$(PACKAGE)-$(VERSION)-$(BRANCH)-r$${SVNREV}
 
 dist-hook:
 	if which svnversion >/dev/null 2>&1; then \
 		svnversion $(srcdir) 2>/dev/null >$(distdir)/svnrevision; \
 	fi
 
-install-data-local:
-	$(DEPMOD) -b "$(DESTDIR)" $(LINUX_KERNEL_VERSION)
+mrproper: clean cleandoc
+	rm -rf \
+		aclocal.m4 \
+		autoconf \
+		autom4te.cache \
+		config.h \
+		config.h.in \
+		config.log \
+		config.status \
+		config.kbuild \
+		configure.in \
+		configure \
+		Makefile \
+		Makefile.in \
+		stamp-h1
 
 doc:
 	doxygen Doxyfile