diff options
| author | Stefan Kost <stefkost@src.gnome.org> | 2007-09-17 21:00:37 +0000 |
|---|---|---|
| committer | Stefan Kost <stefkost@src.gnome.org> | 2007-09-17 21:00:37 +0000 |
| commit | eef49e5076651e2d104aa4bc49642f6d4beeabb2 (patch) | |
| tree | 3e53534f403163f4121a807f68f774df9e6cbcb1 | |
| parent | 5d483081d122e8511d49d692948b91d072996dc0 (diff) | |
| download | gtk-doc-eef49e5076651e2d104aa4bc49642f6d4beeabb2.tar.gz | |
Revert some Makefile improvements, as we can't control the quoting
* gtk-doc.make:
* gtk-doc.notmpl.make:
Revert some Makefile improvements, as we can't control the quoting
reliably.
svn path=/trunk/; revision=491
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | gtk-doc.make | 16 | ||||
| -rw-r--r-- | gtk-doc.notmpl.make | 16 |
3 files changed, 12 insertions, 28 deletions
@@ -1,3 +1,10 @@ +2007-09-17 Stefan Kost <ensonic@users.sf.net> + + * gtk-doc.make: + * gtk-doc.notmpl.make: + Revert some Makefile improvements, as we can't control the quoting + reliably. + 2007-09-11 Stefan Kost <ensonic@users.sf.net> * gtkdoc-mkdb.in: @@ -9,6 +16,7 @@ * gtk-doc.make: * gtk-doc.notmpl.make: + Makefile improvements. 2007-09-03 Stefan Kost <ensonic@users.sf.net> diff --git a/gtk-doc.make b/gtk-doc.make index d8a4a2f..6283fef 100644 --- a/gtk-doc.make +++ b/gtk-doc.make @@ -123,12 +123,6 @@ 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 @@ -169,14 +163,8 @@ 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 - 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 diff --git a/gtk-doc.notmpl.make b/gtk-doc.notmpl.make index 346a004..09eab05 100644 --- a/gtk-doc.notmpl.make +++ b/gtk-doc.notmpl.make @@ -108,12 +108,6 @@ 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 html @@ -150,14 +144,8 @@ endif 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 |