summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Kost <stefkost@src.gnome.org>2007-09-11 19:08:52 +0000
committerStefan Kost <stefkost@src.gnome.org>2007-09-11 19:08:52 +0000
commitb4b4e77f630b366c9068050c1f7533155788e66e (patch)
tree20cacc35c8aadbd2f60673dcadda1159171575bc
parent21a136f21836a4659738e42c540480ec2f157464 (diff)
downloadgtk-doc-b4b4e77f630b366c9068050c1f7533155788e66e.tar.gz
patch by: David Nečas <yeti@physics.muni.cz>
* gtk-doc.make: * gtk-doc.notmpl.make: svn path=/trunk/; revision=489
-rw-r--r--ChangeLog7
-rw-r--r--gtk-doc.make25
-rw-r--r--gtk-doc.notmpl.make27
3 files changed, 47 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index 9a3e3e6..2ba3cd5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-09-11 Stefan Kost <ensonic@users.sf.net>
+
+ patch by: David Nečas <yeti@physics.muni.cz>
+
+ * gtk-doc.make:
+ * gtk-doc.notmpl.make:
+
2007-09-03 Stefan Kost <ensonic@users.sf.net>
* MAINTAINERS:
diff --git a/gtk-doc.make b/gtk-doc.make
index ef350de..d8a4a2f 100644
--- a/gtk-doc.make
+++ b/gtk-doc.make
@@ -119,9 +119,19 @@ clean-local:
rm -f *~ *.bak
rm -rf .libs
+distclean-local:
+ 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 \
- $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt $(REPORT_FILES)
+ cd $(srcdir) && rm -rf xml html
install-data-local:
installfiles=`echo $(srcdir)/html/*`; \
@@ -159,9 +169,14 @@ dist-hook: dist-check-gtkdoc dist-hook-local
-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-cp $(srcdir)/xml/*.xml $(distdir)/xml
cp $(srcdir)/html/* $(distdir)/html
- if test -f $(srcdir)/$(DOC_MODULE).types; then \
- cp $(srcdir)/$(DOC_MODULE).types $(distdir)/$(DOC_MODULE).types; \
- fi
+ 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
-gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
.PHONY : dist-hook-local docs
diff --git a/gtk-doc.notmpl.make b/gtk-doc.notmpl.make
index 7157a7e..346a004 100644
--- a/gtk-doc.notmpl.make
+++ b/gtk-doc.notmpl.make
@@ -104,9 +104,19 @@ clean-local:
rm -f *~ *.bak
rm -rf .libs
+distclean-local:
+ 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 \
- $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt $(REPORT_FILES)
+ cd $(srcdir) && rm -rf html
install-data-local:
installfiles=`echo $(srcdir)/html/*`; \
@@ -138,13 +148,16 @@ dist-check-gtkdoc:
endif
dist-hook: dist-check-gtkdoc dist-hook-local
- mkdir $(distdir)/xml
mkdir $(distdir)/html
- -cp $(srcdir)/xml/*.xml $(distdir)/xml
cp $(srcdir)/html/* $(distdir)/html
- if test -f $(srcdir)/$(DOC_MODULE).types; then \
- cp $(srcdir)/$(DOC_MODULE).types $(distdir)/$(DOC_MODULE).types; \
- fi
+ 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
-gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
.PHONY : dist-hook-local docs