Re: releasing 1.9 soon...

[David Nečas (Yeti) <yeti physics muni cz>]

On Fri, Sep 14, 2007 at 01:55:42AM +0200, David Nečas (Yeti) wrote:
> Well, it's always possible to distribute the files even if
> they are generated and useless.

Stefan, please apply the attached patch.  I can't see any
reliable method to check whether types and sections are
built files that would be less ugly than distributing them
even if they are built.

Yeti

--
http://gwyddion.net/

Index: gtk-doc.make
===================================================================
--- gtk-doc.make	(revision 490)
+++ gtk-doc.make	(working copy)
@@ -123,12 +123,6 @@
 	cd $(srcdir) && \
 	  rm -rf xml $(REPORT_FILES) \
 	         $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
-	case "x $(SCAN_OPTIONS) " in \
-	  *' --rebuild-types '*) rm -f $(srcdir)/$(DOC_MODULE).types;; \
-	esac
-	case "x $(SCAN_OPTIONS) " in \
-	  *' --rebuild-sections '*) rm -f $(srcdir)/$(DOC_MODULE)-sections.txt;; \
-	esac
 
 maintainer-clean-local: clean
 	cd $(srcdir) && rm -rf xml html
@@ -169,14 +163,8 @@
 	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
 	-cp $(srcdir)/xml/*.xml $(distdir)/xml
 	cp $(srcdir)/html/* $(distdir)/html
-	case "x $(SCAN_OPTIONS) " in \
-	  *' --rebuild-types '*) ;; \
-	  *) cp $(srcdir)/$(DOC_MODULE).types $(distdir)/;; \
-	esac
-	case "x $(SCAN_OPTIONS) " in \
-	  *' --rebuild-sections '*) ;; \
-	  *) cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/;; \
-	esac
+	cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
+	cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
 	-gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
 
 .PHONY : dist-hook-local docs
Index: gtk-doc.notmpl.make
===================================================================
--- gtk-doc.notmpl.make	(revision 490)
+++ gtk-doc.notmpl.make	(working copy)
@@ -108,12 +108,6 @@
 	cd $(srcdir) && \
 	  rm -rf xml $(REPORT_FILES) \
 	         $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
-	case "x $(SCAN_OPTIONS) " in \
-	  *' --rebuild-types '*) rm -f $(srcdir)/$(DOC_MODULE).types;; \
-	esac
-	case "x $(SCAN_OPTIONS) " in \
-	  *' --rebuild-sections '*) rm -f $(srcdir)/$(DOC_MODULE)-sections.txt;; \
-	esac
 
 maintainer-clean-local: clean
 	cd $(srcdir) && rm -rf html
@@ -150,14 +144,8 @@
 dist-hook: dist-check-gtkdoc dist-hook-local
 	mkdir $(distdir)/html
 	cp $(srcdir)/html/* $(distdir)/html
-	case "x $(SCAN_OPTIONS) " in \
-	  *' --rebuild-types '*) ;; \
-	  *) cp $(srcdir)/$(DOC_MODULE).types $(distdir)/;; \
-	esac
-	case "x $(SCAN_OPTIONS) " in \
-	  *' --rebuild-sections '*) ;; \
-	  *) cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/;; \
-	esac
+	cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
+	cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
 	-gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
 
 .PHONY : dist-hook-local docs