XML output

Add XML output to doc
Add installation rule for doc

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/branches/emotion-1.7@81116 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/ChangeLog b/ChangeLog
index 8c257c1..cdf1b23 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -67,3 +67,8 @@
 2012-12-07  Luis Felipe Strano Moraes
 
        * Release 1.7.3
+
+2012-12-17 Vincent Torri
+
+       * Add XML output to doc
+       * Add installation rule for doc

diff --git a/Makefile.am b/Makefile.am
index 248f9bd..41a0082 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,10 +43,14 @@ m4/gst-element-check.m4
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = emotion.pc
 
-.PHONY: doc
+.PHONY: doc install-doc
 
 # Documentation
 
 doc:
        @echo "entering doc/"
        make -C doc doc
+
+install-doc:
+       @echo "entering doc/"
+       make -C doc install-doc

diff --git a/configure.ac b/configure.ac
index d8c148e..f125394 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -350,6 +350,9 @@ echo "  Eio..................: ${have_eio}"
 echo "  V4L2.................: ${have_v4l2}"
 echo
 echo "Documentation..........: ${build_doc}"
+if test "x${build_doc}" = "xyes" ; then
+echo "    Installation.......: make install-doc"
+fi
 echo "Examples.............: ${enable_build_examples}"
 echo "Examples installed...: ${enable_install_examples}"
 echo

diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index 907be04..fdc3c54 100644 (file)
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -102,7 +102,7 @@ GENERATE_MAN           = YES
 MAN_OUTPUT             = man
 MAN_EXTENSION          = .3
 MAN_LINKS              = YES
-GENERATE_XML           = NO
+GENERATE_XML           = YES
 XML_SCHEMA             = 
 XML_DTD                = 
 GENERATE_AUTOGEN_DEF   = NO

diff --git a/doc/Makefile.am b/doc/Makefile.am
index f5cdc41..347d1f4 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,6 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-.PHONY: doc
+.PHONY: doc install-doc
 
 PACKAGE_DOCNAME = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-doc
 
@@ -9,10 +9,12 @@ if EFL_BUILD_DOC
 doc-clean:
        rm -rf html/ latex/ man/ xml/ $(top_builddir)/$(PACKAGE_DOCNAME).tar*
 
-doc: all doc-clean
+doc-build: all
        $(efl_doxygen)
-       cp $(srcdir)/img/* html/
-       cp $(srcdir)/img/* latex/
+       cp img/* html/
+       cp img/* latex/
+
+doc: doc-build
        rm -rf $(PACKAGE_DOCNAME).tar*
        mkdir -p $(PACKAGE_DOCNAME)/doc
        cp -R html/ latex/ man/ $(PACKAGE_DOCNAME)/doc
@@ -23,11 +25,20 @@ doc: all doc-clean
 
 clean-local: doc-clean
 
+install-doc: doc-build
+       install -d $(docdir)
+       cp -R html latex man xml $(docdir)
+
+uninstall-local:
+       rm -rf $(docdir)/html $(docdir)/latex $(docdir)/man $(docdir)/xml
+
 else
 
 doc:
        @echo "Documentation not built. Run ./configure --help"
 
+install-doc: doc
+
 endif
 
 EXTRA_DIST = Doxyfile.in $(wildcard img/*.*) e.css head.html foot.html examples.dox

diff --git a/emotion.pc.in b/emotion.pc.in
index 5126c3b..4de41b3 100644 (file)
--- a/emotion.pc.in
+++ b/emotion.pc.in
@@ -1,7 +1,9 @@
+PACKAGE_TARNAME=@PACKAGE_TARNAME@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
+docdir=@docdir@
 
 Name: emotion
 Description: Emotion evas based multimedia library