[gtk-doc] makefiles: add two flavours for flat makefiles. Fixes #501107

[Stefan Kost <stefkost src gnome org>]

commit 8716ce6972ce7444a28496c0782c8c0facb6aed3
Author: Stefan Kost <ensonic users sf net>
Date:   Thu Jun 10 14:21:02 2010 +0300

    makefiles: add two flavours for flat makefiles. Fixes #501107
    
    When using non recursive Makefile, we currently get warnings aboutr EXTRA_DIST
    being overridden. Make variants of the makefiles that use EXTRA_DIST += instead.

 Makefile.am  |   18 ++++++++++++++----
 gtkdocize.in |    6 +++---
 2 files changed, 17 insertions(+), 7 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index b303289..99ee15d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,9 +32,11 @@ gtkdocdata_DATA = \
 	devhelp.xsl		\
 	devhelp2.xsl		\
 	gtk-doc.make		\
-	gtk-doc.notmpl.make		\
-	home.png		\
-	left.png		\
+	gtk-doc.notmpl.make	\
+	gtk-doc.flat.make	\
+	gtk-doc.notmpl-flat.make	\
+	home.png			\
+	left.png			\
 	right.png		\
 	up.png			\
 	style.css
@@ -48,12 +50,20 @@ aclocal_DATA = gtk-doc.m4
 sgmldir = $(datadir)/sgml/gtk-doc
 sgml_DATA = gtk-doc.cat
 
+gtk-doc.flat.make: gtk-doc.make
+	@$(SED) -e "s/EXTRA_DIST =/EXTRA_DIST +=/" $< >$@
+
+gtk-doc.notmpl-flat.make: gtk-doc.notmpl.make
+	@$(SED) -e "s/EXTRA_DIST =/EXTRA_DIST +=/" $< >$@
+
 EXTRA_DIST = \
 	MAINTAINERS     \
 	gtk-doc.pc.in   \
 	gtk-doc.m4      \
 	gtk-doc.make    \
-	gtk-doc.notmpl.make    \
+	gtk-doc.notmpl.make \
+	gtk-doc.flat.make \
+	gtk-doc.notmpl-flat.make \
 	gtk-doc.doap \
 	gtk-doc.spec.in \
 	gtk-doc.spec    \
diff --git a/gtkdocize.in b/gtkdocize.in
index 36837bc..43c9eac 100644
--- a/gtkdocize.in
+++ b/gtkdocize.in
@@ -18,7 +18,7 @@ flavour=legacy
 
 # mini help
 usage="\
-usage: $progname [ --copy ] [ --docdir DIR ] [ --flavour {legacy|no-tmpl} ]"
+usage: $progname [ --copy ] [ --docdir DIR ] [ --flavour {legacy|legacy-flat|no-tmpl|no-tmpl-flat} ]"
 
 # detect configure script
 no_configure_found=0
@@ -87,9 +87,9 @@ while test $# -gt 0; do
 done
 
 case "$flavour" in
-  legacy)
+  legacy*)
     ;;
-  no-tmpl)
+  no-tmpl*)
     makefile=gtk-doc.notmpl.make
     ;;
   *)