XML output

Add XML output to doc
Add installation rule for doc

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

diff --git a/ChangeLog b/ChangeLog
index 402e3ef..6cad1e0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -380,3 +380,8 @@
 2012-12-13  Lucas De Marchi
 
     * Fix EINA_INLIST_FOREACH_SAFE macro
+
+2012-12-17 Vincent Torri
+
+       * Add XML output to doc
+       * Add installation rule for doc

diff --git a/Makefile.am b/Makefile.am
index 6036f04..5ff1896 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -52,13 +52,17 @@ m4/common/efl_voltron.m4 \
 m4/eina/eina_bench.m4 \
 m4/eina/eina_check.m4
 
-.PHONY: doc benchmark
+.PHONY: doc install-doc benchmark
 
 # Documentation
 
 doc:
        @echo "entering doc/"
-       @cd doc && $(MAKE) doc
+       @$(MAKE) -C doc doc
+
+install-doc:
+       @echo "entering doc/"
+       @$(MAKE) -C doc install-doc
 
 # Unit tests
 

diff --git a/configure.ac b/configure.ac
index 55707f2..e5e08dd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -625,6 +625,9 @@ echo "  File xattr...........: ${efl_func_setxattr}"
 echo "  shm_open.............: ${efl_func_shm_open}"
 echo
 echo "  Documentation........: ${build_doc}"
+if test "x${build_doc}" = "xyes" ; then
+echo "    Installation.......: make install-doc"
+fi
 echo "  Tests................: ${enable_tests} (Coverage: ${efl_enable_coverage})"
 echo "  Examples.............: ${enable_build_examples}"
 echo "  Tiler Example........: ${build_tiler_example}"

diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index cac9c1c..5137235 100644 (file)
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -1297,7 +1297,7 @@ MAN_LINKS              = YES
 # generate an XML file that captures the structure of
 # the code including all documentation.
 
-GENERATE_XML           = NO
+GENERATE_XML           = YES
 
 # The XML_OUTPUT tag is used to specify where the XML pages will be put.
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 33a2c9b..b7d3a71 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,6 @@
-MAINTAINERCLEANFILES = Makefile.in 
+MAINTAINERCLEANFILES = Makefile.in
 
-.PHONY: doc
+.PHONY: doc install-doc
 
 PACKAGE_DOCNAME = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-doc
 
@@ -9,13 +9,15 @@ if EFL_BUILD_DOC
 doc-clean:
        rm -rf html/ latex/ man/ xml/ $(top_builddir)/$(PACKAGE_DOCNAME).tar*
 
-doc: all
+doc-build: all
        $(efl_doxygen)
-       cp $(srcdir)/img/* html/
-       cp $(srcdir)/img/*.eps 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
+       cp -R html/ latex/ man/ xml/ $(PACKAGE_DOCNAME)/doc
        tar cf $(PACKAGE_DOCNAME).tar $(PACKAGE_DOCNAME)/
        bzip2 -9 $(PACKAGE_DOCNAME).tar
        rm -rf $(PACKAGE_DOCNAME)/
@@ -25,11 +27,20 @@ doc: all
 
 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 = $(srcdir)/Doxyfile.in \

diff --git a/eina.pc.in b/eina.pc.in
index 95b815b..caaf153 100644 (file)
--- a/eina.pc.in
+++ b/eina.pc.in
@@ -1,7 +1,9 @@
+PACKAGE_TARNAME=@PACKAGE_TARNAME@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
+docdir=@docdir@
 
 Name: Eina
 Description: A Library that implements fast data types and miscellaneous tools