XML output

Add XML output to doc
Add installation rule for doc

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

diff --git a/ChangeLog b/ChangeLog
index c18af64..8ac3d2e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -92,3 +92,7 @@
 
        * 1.7.3 release
 
+2012-12-17 Vincent Torri
+
+       * Add XML output to doc
+       * Add installation rule for doc

diff --git a/Makefile.am b/Makefile.am
index 1d9b0ec..726c9e4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -71,10 +71,14 @@ m4/efl_binary.m4 \
 m4/efl_compiler_flag.m4 \
 m4/efl_doxygen.m4
 
-.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 dd74d4b..771ad13 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -400,6 +400,9 @@ echo "    EOfono test........: $have_edbus_ofono_test"
 echo "    EUkit test.........: $have_edbus_ukit_test"
 echo
 echo "Documentation..........: ${build_doc}"
+if test "x${build_doc}" = "xyes" ; then
+echo "    Installation.......: make install-doc"
+fi
 echo
 echo "Compilation............: make (or gmake)"
 echo "  CPPFLAGS.............: $CPPFLAGS"

diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index 0572ae9..6feea6e 100644 (file)
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -1288,7 +1288,7 @@ MAN_LINKS              = NO
 # 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 881eb10..8c392dd 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,20 +1,23 @@
 MAINTAINERCLEANFILES = Makefile.in e_dbus_doxy_warnings.txt
 
-.PHONY: doc
+.PHONY: doc install-doc
 
 PACKAGE_DOCNAME = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-doc
 
 if EFL_BUILD_DOC
 
 doc-clean:
-       rm -rf html/ latex/ $(top_builddir)/$(PACKAGE_DOCNAME).tar*
+       rm -rf html/ latex/ man/ xml/ $(top_builddir)/$(PACKAGE_DOCNAME).tar*
 
-doc: all
+doc-build: all
        $(efl_doxygen)
-       cp $(srcdir)/images/* 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)/
@@ -22,11 +25,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 = Doxyfile.in $(wildcard images/*.*) e.css head.html foot.html

diff --git a/edbus.pc.in b/edbus.pc.in
index e3e368c..c08e693 100644 (file)
--- a/edbus.pc.in
+++ b/edbus.pc.in
@@ -1,7 +1,9 @@
+PACKAGE_TARNAME=@PACKAGE_TARNAME@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
+docdir=@docdir@
 
 Name: edbus
 Description: DBus convenience library