[rygel] doc: Drop vala devhelp target
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rygel] doc: Drop vala devhelp target
- Date: Tue, 3 Jul 2012 07:58:21 +0000 (UTC)
commit 9b2a9179d0a725184cfd060b26adaeebe35de9c2
Author: Jens Georg <mail jensge org>
Date: Fri Jun 29 14:15:10 2012 +0200
doc: Drop vala devhelp target
This generates a devhelp book with the same name as the gtk-doc devhelp
book. This confuses devhelp which shows rather randomly either the vala
book or the C book.
doc/reference/librygel-core/Makefile.am | 20 ++++----------------
doc/reference/librygel-renderer/Makefile.am | 20 ++++----------------
2 files changed, 8 insertions(+), 32 deletions(-)
---
diff --git a/doc/reference/librygel-core/Makefile.am b/doc/reference/librygel-core/Makefile.am
index 01814b1..0b948ea 100644
--- a/doc/reference/librygel-core/Makefile.am
+++ b/doc/reference/librygel-core/Makefile.am
@@ -31,14 +31,6 @@ valadoc: $(VALA_SOURCE_FILES_WITH_PATHS)
$(VALADOC_FLAGS) \
$(NULL)
-devhelp: $(VALA_SOURCE_FILES_WITH_PATHS)
- @rm -rf devhelp
- $(VALADOC) \
- -o devhelp \
- --doclet devhelp \
- $(VALADOC_FLAGS) \
- $(NULL)
-
gtkdoc: $(VALA_SOURCE_FILES_WITH_PATHS)
@rm -rf gtkdoc
$(VALADOC) \
@@ -50,23 +42,19 @@ gtkdoc: $(VALA_SOURCE_FILES_WITH_PATHS)
$(NULL)
clean-local:
- rm -rf valadoc devhelp gtkdoc
+ rm -rf valadoc gtkdoc
uninstall-hook:
- rm -rf $(DESTDIR)$(datadir)/devhelp/books/librygel-core
rm -rf $(DESTDIR)$(datadir)/gtk-doc/html/librygel-core
# The chmod corrects the directory permissions so that distcheck can remove the installed files.
-install-data-hook: devhelp gtkdoc
- $(MKDIR_P) $(DESTDIR)$(datadir)/devhelp/books/librygel-core/img
- $(INSTALL_DATA) -t $(DESTDIR)$(datadir)/devhelp/books/librygel-core $(srcdir)/devhelp/librygel-core/*.*
- $(INSTALL_DATA) -t $(DESTDIR)$(datadir)/devhelp/books/librygel-core/img $(srcdir)/devhelp/librygel-core/img/*
+install-data-hook: gtkdoc
$(MKDIR_P) $(DESTDIR)$(datadir)/gtk-doc/html/librygel-core
cp -d -R $(srcdir)/gtkdoc/html $(DESTDIR)$(datadir)/gtk-doc/html/librygel-core
chmod -R u+w $(DESTDIR)$(datadir)/gtk-doc/html/librygel-core
-all: valadoc devhelp gtkdoc
+all: valadoc gtkdoc
-EXTRA_DIST = devhelp gtkdoc valadoc
+EXTRA_DIST = gtkdoc valadoc
endif
diff --git a/doc/reference/librygel-renderer/Makefile.am b/doc/reference/librygel-renderer/Makefile.am
index b5fa1d0..93fd5da 100644
--- a/doc/reference/librygel-renderer/Makefile.am
+++ b/doc/reference/librygel-renderer/Makefile.am
@@ -36,14 +36,6 @@ valadoc: $(VALA_SOURCE_FILES_WITH_PATHS)
$(VALADOC_FLAGS) \
$(NULL)
-devhelp: $(VALA_SOURCE_FILES_WITH_PATHS)
- @rm -rf devhelp
- $(VALADOC) \
- -o devhelp \
- --doclet devhelp \
- $(VALADOC_FLAGS) \
- $(NULL)
-
gtkdoc: $(VALA_SOURCE_FILES_WITH_PATHS)
@rm -rf gtkdoc
$(VALADOC) \
@@ -55,22 +47,18 @@ gtkdoc: $(VALA_SOURCE_FILES_WITH_PATHS)
$(NULL)
clean-local:
- rm -rf valadoc devhelp gtkdoc
+ rm -rf valadoc gtkdoc
uninstall-hook:
- rm -rf $(DESTDIR)$(datadir)/devhelp/books/librygel-renderer
rm -rf $(DESTDIR)$(datadir)/gtk-doc/html/librygel-renderer
# The chmod corrects the directory permissions so that distcheck can remove the installed files.
-install-data-hook: devhelp gtkdoc
- $(MKDIR_P) $(DESTDIR)$(datadir)/devhelp/books/librygel-renderer/img
- $(INSTALL_DATA) -t $(DESTDIR)$(datadir)/devhelp/books/librygel-renderer $(srcdir)/devhelp/librygel-renderer/*.*
- $(INSTALL_DATA) -t $(DESTDIR)$(datadir)/devhelp/books/librygel-renderer/img $(srcdir)/devhelp/librygel-renderer/img/*
+install-data-hook: gtkdoc
cp -d -R $(srcdir)/gtkdoc/html $(DESTDIR)$(datadir)/gtk-doc/html/librygel-renderer
chmod -R u+w $(DESTDIR)$(datadir)/gtk-doc/html/librygel-renderer
-all: valadoc devhelp gtkdoc
+all: valadoc gtkdoc
-EXTRA_DIST = devhelp gtkdoc valadoc
+EXTRA_DIST = gtkdoc valadoc
endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]