XML output

Add XML output to doc
Add installation rule for doc

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

diff --git a/ChangeLog b/ChangeLog
index e7febff..e7abfda 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -655,3 +655,8 @@
 2012-12-12  Daniel Willmann
 
        * Fix possible buffer overflow in functions relying on EET_T_LAST.
+
+2012-12-17 Vincent Torri
+
+       * Add XML output to doc
+       * Add installation rule for doc

diff --git a/Makefile.am b/Makefile.am
index 79b2a28..3fd649a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,7 +43,7 @@ m4/efl_path_max.m4
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = eet.pc
 
-.PHONY: doc
+.PHONY: doc install-doc
 
 # Documentation
 
@@ -51,6 +51,10 @@ doc:
        @echo "entering doc/"
        $(MAKE) -C doc doc
 
+install-doc:
+       @echo "entering doc/"
+       make -C doc install-doc
+
 # Unit tests
 
 if EFL_ENABLE_TESTS

diff --git a/configure.ac b/configure.ac
index da27438..249de95 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -528,6 +528,7 @@ echo
 echo "  Documentation........: ${build_doc}"
 if test "x${build_doc}" = "xyes" ; then
    echo "    Building...........: make doc"
+   echo "    Installation.......: make install-doc"
 fi
 echo "  Examples.............: ${build_examples}"
 echo "  Examples installed...: ${install_examples}"

diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index f9d22c8..3753226 100644 (file)
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -1296,7 +1296,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 f49a79b..db67bac 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,7 +1,6 @@
-
 MAINTAINERCLEANFILES = Makefile.in eet.dox
 
-.PHONY: doc
+.PHONY: doc install-doc
 
 PACKAGE_DOCNAME = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-doc
 
@@ -10,12 +9,15 @@ if EFL_BUILD_DOC
 doc-clean:
        rm -rf html/ latex/ xml/ $(PACKAGE_DOCNAME).tar*
 
-doc: doc-clean
+doc-build: all
        $(efl_doxygen)
-       cp $(srcdir)/img/* html/
+       cp img/* html/
+       cp img/* latex/
+
+doc: doc-build
        rm -rf $(PACKAGE_DOCNAME).tar*
        mkdir -p $(PACKAGE_DOCNAME)/doc
-       cp -R html/ latex/ $(PACKAGE_DOCNAME)/doc
+       cp -R html/ latex/ 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: doc-clean
 
 clean-local: doc-clean
 
+install-doc: doc-build
+       install -d $(docdir)
+       cp -R html latex 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 = $(builddir)/Doxyfile \

diff --git a/eet.pc.in b/eet.pc.in
index ee95887..1c175b3 100644 (file)
--- a/eet.pc.in
+++ b/eet.pc.in
@@ -1,7 +1,9 @@
+PACKAGE_TARNAME=@PACKAGE_TARNAME@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
+docdir=@docdir@
 
 Name: eet
 Description: Library for speedy data storage, retrieval, and compression