From 67b2a0b744394d07addaf11306289f5a68c82201 Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Mon, 14 May 2012 23:28:27 +0000
Subject: [PATCH] Fixed documentation generation

---
 doc/Makefile     | 15 +++++++++------
 doc/gtkdoc.sh    | 10 +++++-----
 doc/project.conf | 11 ++++++++---
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/doc/Makefile b/doc/Makefile
index 574ba58..89b0fb6 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,5 +1,5 @@
 SUBDIRS	= gtkdoc
-TARGETS	= gtkdoc/cpp.types gtkdoc/sgml.stamp html/index.html
+TARGETS	= gtkdoc/cpp.types gtkdoc/tmpl.stamp gtkdoc/sgml.stamp gtkdoc/html.stamp
 PREFIX	= /usr/local
 DESTDIR	=
 RM	?= rm -f
@@ -16,19 +16,22 @@ subdirs:
 gtkdoc/cpp.types:
 	./gtkdoc.sh -P "$(PREFIX)" -- "gtkdoc/cpp.types"
 
-gtkdoc/sgml.stamp: gtkdoc/cpp.types
+gtkdoc/tmpl.stamp: gtkdoc/cpp.types
+	./gtkdoc.sh -P "$(PREFIX)" -- "gtkdoc/tmpl.stamp"
+
+gtkdoc/sgml.stamp: gtkdoc/tmpl.stamp
 	./gtkdoc.sh -P "$(PREFIX)" -- "gtkdoc/sgml.stamp"
 
-html/index.html: gtkdoc/cpp-docs.xml gtkdoc/sgml.stamp
-	./gtkdoc.sh -P "$(PREFIX)" -- "html/index.html"
+gtkdoc/html.stamp: gtkdoc/cpp-docs.xml gtkdoc/sgml.stamp
+	./gtkdoc.sh -P "$(PREFIX)" -- "gtkdoc/html.stamp"
 
 clean:
 	@for i in $(SUBDIRS); do (cd $$i && $(MAKE) clean) || exit; done
-	$(RM) -- $(gtkdoc/cpp.types_OBJS) $(gtkdoc/sgml.stamp_OBJS) $(html/index.html_OBJS)
+	$(RM) -- $(gtkdoc/cpp.types_OBJS) $(gtkdoc/tmpl.stamp_OBJS) $(gtkdoc/sgml.stamp_OBJS) $(gtkdoc/html.stamp_OBJS)
 
 distclean:
 	@for i in $(SUBDIRS); do (cd $$i && $(MAKE) distclean) || exit; done
-	$(RM) -- $(gtkdoc/cpp.types_OBJS) $(gtkdoc/sgml.stamp_OBJS) $(html/index.html_OBJS)
+	$(RM) -- $(gtkdoc/cpp.types_OBJS) $(gtkdoc/tmpl.stamp_OBJS) $(gtkdoc/sgml.stamp_OBJS) $(gtkdoc/html.stamp_OBJS)
 	$(RM) -- $(TARGETS)
 
 install: $(TARGETS)
diff --git a/doc/gtkdoc.sh b/doc/gtkdoc.sh
index 86353ba..a393000 100755
--- a/doc/gtkdoc.sh
+++ b/doc/gtkdoc.sh
@@ -95,15 +95,15 @@ while [ $# -gt 0 ]; do
 
 	#create
 	case "$target" in
-		html/index.html)
-			$MKDIR "html" &&
-			(cd "html" &&
+		gtkdoc/html.stamp)
+			$MKDIR "gtkdoc/html" &&
+			(cd "gtkdoc/html" &&
 				$DEBUG $GTKDOC_MKHTML "$MODULE" \
-					"../gtkdoc/$MODULE-docs.xml") &&
+					"../$MODULE-docs.xml") &&
 			(cd "gtkdoc" &&
 				$DEBUG $GTKDOC_FIXXREF \
 					--module="$MODULE" \
-					--module-dir="../html" \
+					--module-dir="html" \
 					--html-dir="$DATADIR/doc/html/$MODULE")
 			;;
 		gtkdoc/sgml.stamp)
diff --git a/doc/project.conf b/doc/project.conf
index d73ff49..1fc10b9 100644
--- a/doc/project.conf
+++ b/doc/project.conf
@@ -1,17 +1,22 @@
 subdirs=gtkdoc
-targets=gtkdoc/cpp.types,gtkdoc/sgml.stamp,html/index.html
+targets=gtkdoc/cpp.types,gtkdoc/tmpl.stamp,gtkdoc/sgml.stamp,gtkdoc/html.stamp
 dist=Makefile,GRAMMAR,gtkdoc.sh
 
 [gtkdoc/cpp.types]
 type=script
 script=./gtkdoc.sh
 
-[gtkdoc/sgml.stamp]
+[gtkdoc/tmpl.stamp]
 type=script
 script=./gtkdoc.sh
 depends=gtkdoc/cpp.types
 
-[html/index.html]
+[gtkdoc/sgml.stamp]
+type=script
+script=./gtkdoc.sh
+depends=gtkdoc/tmpl.stamp
+
+[gtkdoc/html.stamp]
 type=script
 script=./gtkdoc.sh
 depends=gtkdoc/cpp-docs.xml,gtkdoc/sgml.stamp