incorporate some of the recent buildsystem changes

[[Imported from SVN: r5316]]

bin/duneproject

@@ -236,16 +236,15 @@ mkdir "$PROJECT"
 
 ################## dune.module ##################
 cat > "$PROJECT/dune.module" <<C_DELIM
-
 #dune module information file#
 ##############################
 
 #Name of the module
-Module:$MODULE
-Version:$VERSION
-Maintainer:$MAINTAINER
+Module: $MODULE
+Version: $VERSION
+Maintainer: $MAINTAINER
 #depending on 
-Depends:$DEPENDENCIES
+Depends: $DEPENDENCIES
 C_DELIM
 
 ################## CONFIGURE.AC ##################
@@ -417,6 +416,9 @@ AUTOMAKE_OPTIONS = foreign 1.5
 DISTCHECK_CONFIGURE_FLAGS = --with-dune=\$(DUNEROOT) CXX="\$(CXX)" CC="\$(CC)"
 M_DELIM
 
+include $(top_srcdir)/am/top-rules
+include $(top_srcdir)/am/global-rules
+
 ################## STAMP-VC ##################
 touch $PROJECT/stamp-vc