XML output

Add XML output to doc
Add installation rule for doc

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

diff --git a/ChangeLog b/ChangeLog
index b2d0a0c..a87037e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1019,3 +1019,7 @@
 
        * Fix build on win32
 
+2012-12-17 Vincent Torri
+
+       * Add XML output to doc
+       * Add installation rule for doc

diff --git a/Makefile.am b/Makefile.am
index 9f16aeb..8f103f8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -197,7 +197,7 @@ if BUILD_ECORE_WAYLAND
 pkgconfig_DATA += ecore-wayland.pc
 endif
 
-.PHONY: doc coverage
+.PHONY: doc install-doc coverage
 
 # Documentation
 
@@ -205,6 +205,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/doc/Doxyfile.in b/doc/Doxyfile.in
index 43e73c1..eac0983 100644 (file)
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -167,7 +167,7 @@ GENERATE_MAN           = YES
 MAN_OUTPUT             = man
 MAN_EXTENSION          = .3
 MAN_LINKS              = YES
-GENERATE_XML           = NO
+GENERATE_XML           = YES
 XML_OUTPUT             = xml
 XML_SCHEMA             =
 XML_DTD                =

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 8bffa14..b8d23af 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,6 @@
 MAINTAINERCLEANFILES = Makefile.in ecore.dox
 
-.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-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
+       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)/
@@ -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 ecore.dox.in examples.dox

diff --git a/ecore-cocoa.pc.in b/ecore-cocoa.pc.in
index 91fc4ee..1414ca6 100644 (file)
--- a/ecore-cocoa.pc.in
+++ b/ecore-cocoa.pc.in
@@ -1,7 +1,9 @@
+PACKAGE_TARNAME=@PACKAGE_TARNAME@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
+docdir=@docdir@
 
 Name: ecore-cocoa
 Description: E core library, Cocoa module

diff --git a/ecore-con.pc.in b/ecore-con.pc.in
index 9b188aa..0a6e614 100644 (file)
--- a/ecore-con.pc.in
+++ b/ecore-con.pc.in
@@ -1,7 +1,9 @@
+PACKAGE_TARNAME=@PACKAGE_TARNAME@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
+docdir=@docdir@
 
 Name: ecore-con
 Description: E core library, Con module

diff --git a/ecore-directfb.pc.in b/ecore-directfb.pc.in
index 9eb104a..58765ca 100644 (file)
--- a/ecore-directfb.pc.in
+++ b/ecore-directfb.pc.in
@@ -1,7 +1,9 @@
+PACKAGE_TARNAME=@PACKAGE_TARNAME@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
+docdir=@docdir@
 
 Name: ecore-directfb
 Description: E core library, DirectFB module

diff --git a/ecore-evas.pc.in b/ecore-evas.pc.in
index 155abbe..88e1718 100644 (file)
--- a/ecore-evas.pc.in
+++ b/ecore-evas.pc.in
@@ -1,7 +1,9 @@
+PACKAGE_TARNAME=@PACKAGE_TARNAME@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
+docdir=@docdir@
 
 Name: ecore-evas
 Description: E core library, Evas module

diff --git a/ecore-fb.pc.in b/ecore-fb.pc.in
index 4e70c48..2273828 100644 (file)
--- a/ecore-fb.pc.in
+++ b/ecore-fb.pc.in
@@ -1,7 +1,9 @@
+PACKAGE_TARNAME=@PACKAGE_TARNAME@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
+docdir=@docdir@
 
 Name: ecore-fb
 Description: E core library, FB module

diff --git a/ecore-file.pc.in b/ecore-file.pc.in
index 833ff1e..556a6af 100644 (file)
--- a/ecore-file.pc.in
+++ b/ecore-file.pc.in
@@ -1,7 +1,9 @@
+PACKAGE_TARNAME=@PACKAGE_TARNAME@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
+docdir=@docdir@
 
 Name: ecore-file
 Description: E core library, File module

diff --git a/ecore-imf-evas.pc.in b/ecore-imf-evas.pc.in
index 23451c8..913c02b 100644 (file)
--- a/ecore-imf-evas.pc.in
+++ b/ecore-imf-evas.pc.in
@@ -1,7 +1,9 @@
+PACKAGE_TARNAME=@PACKAGE_TARNAME@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
+docdir=@docdir@
 
 Name: ecore-imf-evas
 Description: E core library, IMF Evas module

diff --git a/ecore-imf.pc.in b/ecore-imf.pc.in
index cc155ed..edac558 100644 (file)
--- a/ecore-imf.pc.in
+++ b/ecore-imf.pc.in
@@ -1,7 +1,9 @@
+PACKAGE_TARNAME=@PACKAGE_TARNAME@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
+docdir=@docdir@
 
 Name: ecore-imf
 Description: E core library, IMF module

diff --git a/ecore-input-evas.pc.in b/ecore-input-evas.pc.in
index f95325c..b2579e2 100644 (file)
--- a/ecore-input-evas.pc.in
+++ b/ecore-input-evas.pc.in
@@ -1,7 +1,9 @@
+PACKAGE_TARNAME=@PACKAGE_TARNAME@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
+docdir=@docdir@
 
 Name: ecore-input-evas
 Description: E core library, Input module Evas extension

diff --git a/ecore-input.pc.in b/ecore-input.pc.in
index b670b71..23adf86 100644 (file)
--- a/ecore-input.pc.in
+++ b/ecore-input.pc.in
@@ -1,7 +1,9 @@
+PACKAGE_TARNAME=@PACKAGE_TARNAME@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
+docdir=@docdir@
 
 Name: ecore-input
 Description: E core library, Input module

diff --git a/ecore-ipc.pc.in b/ecore-ipc.pc.in
index d66f404..db0869d 100644 (file)
--- a/ecore-ipc.pc.in
+++ b/ecore-ipc.pc.in
@@ -1,7 +1,9 @@
+PACKAGE_TARNAME=@PACKAGE_TARNAME@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
+docdir=@docdir@
 
 Name: ecore-ipc
 Description: E core library, IPC module

diff --git a/ecore-psl1ght.pc.in b/ecore-psl1ght.pc.in
index e81f4e8..d444686 100644 (file)
--- a/ecore-psl1ght.pc.in
+++ b/ecore-psl1ght.pc.in
@@ -1,7 +1,9 @@
+PACKAGE_TARNAME=@PACKAGE_TARNAME@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
+docdir=@docdir@
 
 Name: ecore-psl1ght
 Description: E core library, PSL1GHT module

diff --git a/ecore-sdl.pc.in b/ecore-sdl.pc.in
index 78170c1..6a6e08b 100644 (file)
--- a/ecore-sdl.pc.in
+++ b/ecore-sdl.pc.in
@@ -1,7 +1,9 @@
+PACKAGE_TARNAME=@PACKAGE_TARNAME@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
+docdir=@docdir@
 
 Name: ecore-sdl
 Description: E core library, SDL module

diff --git a/ecore-wayland.pc.in b/ecore-wayland.pc.in
index f4f5cf3..a1178f2 100644 (file)
--- a/ecore-wayland.pc.in
+++ b/ecore-wayland.pc.in
@@ -1,7 +1,9 @@
+PACKAGE_TARNAME=@PACKAGE_TARNAME@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
+docdir=@docdir@
 
 Name: ecore-wayland
 Description: E core library, Wayland module

diff --git a/ecore-win32.pc.in b/ecore-win32.pc.in
index ac5ab32..baee9f5 100644 (file)
--- a/ecore-win32.pc.in
+++ b/ecore-win32.pc.in
@@ -1,7 +1,9 @@
+PACKAGE_TARNAME=@PACKAGE_TARNAME@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
+docdir=@docdir@
 
 Name: ecore-win32
 Description: E core library, Win32 module

diff --git a/ecore-wince.pc.in b/ecore-wince.pc.in
index c937e88..acf6b52 100644 (file)
--- a/ecore-wince.pc.in
+++ b/ecore-wince.pc.in
@@ -1,7 +1,9 @@
+PACKAGE_TARNAME=@PACKAGE_TARNAME@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
+docdir=@docdir@
 
 Name: ecore-wince
 Description: E core library, WinCE module

diff --git a/ecore-x.pc.in b/ecore-x.pc.in
index a02b42b..987c396 100644 (file)
--- a/ecore-x.pc.in
+++ b/ecore-x.pc.in
@@ -1,7 +1,9 @@
+PACKAGE_TARNAME=@PACKAGE_TARNAME@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
+docdir=@docdir@
 
 Name: ecore-x
 Description: E core library, X module

diff --git a/ecore.pc.in b/ecore.pc.in
index db67e7a..8feb6a9 100644 (file)
--- a/ecore.pc.in
+++ b/ecore.pc.in
@@ -1,7 +1,9 @@
+PACKAGE_TARNAME=@PACKAGE_TARNAME@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
+docdir=@docdir@
 
 Name: ecore
 Description: Ecore event abstraction library