Imported Upstream version 1.7.4upstream/1.7.4

13 files changed, 88 insertions, 30 deletions

diff --git a/ChangeLog b/ChangeLog
index cc849a0..2597acb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -135,4 +135,12 @@
 
 	* 1.7.3 release
 
+2012-12-17 Vincent Torri
+
+	* Add XML output to doc
+	* Add installation rule for doc
+
+2012-12-21  Luis Felipe Strano Moraes
+
+	* 1.7.4 release
 
diff --git a/Makefile.am b/Makefile.am
index 4d9f2c5..9916f0e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,10 +35,14 @@ eeze.spec.in \
 eeze.spec \
 m4/efl_doxygen.m4
 
-.PHONY: doc
+.PHONY: doc install-doc
 
 # Documentation
 
 doc: all
 	@echo "entering doc/"
 	$(MAKE) -C doc doc
+
+install-doc:
+	@echo "entering doc/"
+	make -C doc install-doc
diff --git a/Makefile.in b/Makefile.in
index cfe79ee..0d70baa 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -865,7 +865,7 @@ uninstall-am: uninstall-pkgconfigDATA
 	uninstall uninstall-am uninstall-pkgconfigDATA
 
 
-.PHONY: doc
+.PHONY: doc install-doc
 
 # Documentation
 
@@ -873,6 +873,10 @@ doc: all
 	@echo "entering doc/"
 	$(MAKE) -C doc doc
 
+install-doc:
+	@echo "entering doc/"
+	make -C doc install-doc
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/NEWS b/NEWS
index 70b100d..f1019f6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,11 @@
-Eeze 1.7.3
+Eeze 1.7.4
+
+Changes since Eeze 1.7.3:
+-------------------------
+
+   * Add XML output to doc
+   * Add installation rule for doc
+
 
 Changes since Eeze 1.7.2:
 -------------------------
diff --git a/README b/README
index e1a5393..89f7d3f 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-Eeze 1.7.0
+Eeze 1.7.4
 
 ******************************************************************************
 
diff --git a/configure b/configure
index 3dceea5..2cd34b3 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for eeze 1.7.3.
+# Generated by GNU Autoconf 2.68 for eeze 1.7.4.
 #
 # Report bugs to <enlightenment-devel@lists.sourceforge.net>.
 #
@@ -570,8 +570,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='eeze'
 PACKAGE_TARNAME='eeze'
-PACKAGE_VERSION='1.7.3'
-PACKAGE_STRING='eeze 1.7.3'
+PACKAGE_VERSION='1.7.4'
+PACKAGE_STRING='eeze 1.7.4'
 PACKAGE_BUGREPORT='enlightenment-devel@lists.sourceforge.net'
 PACKAGE_URL=''
 
@@ -1363,7 +1363,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures eeze 1.7.3 to adapt to many kinds of systems.
+\`configure' configures eeze 1.7.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1433,7 +1433,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of eeze 1.7.3:";;
+     short | recursive ) echo "Configuration of eeze 1.7.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1570,7 +1570,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-eeze configure 1.7.3
+eeze configure 1.7.4
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1993,7 +1993,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by eeze $as_me 1.7.3, which was
+It was created by eeze $as_me 1.7.4, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2817,7 +2817,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='eeze'
- VERSION='1.7.3'
+ VERSION='1.7.4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -11493,7 +11493,7 @@ _ACEOF
 
 
 cat >>confdefs.h <<_ACEOF
-#define VMIC 3
+#define VMIC 4
 _ACEOF
 
 
@@ -11501,7 +11501,7 @@ cat >>confdefs.h <<_ACEOF
 #define VREV 0
 _ACEOF
 
-version_info="8:3:7"
+version_info="8:4:7"
 release_info=""
 
 
@@ -14588,7 +14588,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by eeze $as_me 1.7.3, which was
+This file was extended by eeze $as_me 1.7.4, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14654,7 +14654,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-eeze config.status 1.7.3
+eeze config.status 1.7.4
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 
@@ -16463,6 +16463,9 @@ echo
 echo "IPv6...................: ${have_ipv6}"
 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/configure.ac b/configure.ac
index 66e8197..eeeb68c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
 m4_define([v_maj], [1])
 m4_define([v_min], [7])
-m4_define([v_mic], [3])
+m4_define([v_mic], [4])
 m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v '\(export\|Unversioned directory\)' || echo 0) | awk -F : '{printf("%s\n", $1);}' | tr -d ' :MSP\n']))
 m4_if(v_rev, [0], [m4_define([v_rev], m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))])
 ##--   When released, remove the dnl on the below line
@@ -282,6 +282,9 @@ echo
 echo "IPv6...................: ${have_ipv6}"
 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 da43f44..1dadc4e 100644
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -53,7 +53,7 @@ GENERATE_TAGFILE       =
 GENERATE_TESTLIST      = YES
 GENERATE_TODOLIST      = YES
 GENERATE_TREEVIEW      = NO
-GENERATE_XML           = NO
+GENERATE_XML           = YES
 GRAPHICAL_HIERARCHY    = NO
 HAVE_DOT               = NO
 HHC_LOCATION           = 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index aed7b5f..b57313d 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,6 @@
 MAINTAINERCLEANFILES = Makefile.in eeze.dox
 
-.PHONY: doc
+.PHONY: doc install-doc
 
 PACKAGE_DOCNAME = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-doc
 
@@ -9,13 +9,16 @@ 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 img/* html/
+	cp img/* latex/
+
+doc: doc-build
 	cp $(srcdir)/img/* latex/
 	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 +26,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 eeze.dox.in
diff --git a/doc/Makefile.in b/doc/Makefile.in
index c1346fd..a521109 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -319,6 +319,7 @@ maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+@EFL_BUILD_DOC_FALSE@uninstall-local:
 @EFL_BUILD_DOC_FALSE@clean-local:
 clean: clean-am
 
@@ -384,7 +385,7 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am:
+uninstall-am: uninstall-local
 
 .MAKE: install-am install-strip
 
@@ -398,21 +399,24 @@ uninstall-am:
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	uninstall uninstall-am
+	uninstall uninstall-am uninstall-local
 
 
-.PHONY: doc
+.PHONY: doc install-doc
 
 @EFL_BUILD_DOC_TRUE@doc-clean:
 @EFL_BUILD_DOC_TRUE@	rm -rf html/ latex/ man/ xml/ $(top_builddir)/$(PACKAGE_DOCNAME).tar*
 
-@EFL_BUILD_DOC_TRUE@doc: all doc-clean
+@EFL_BUILD_DOC_TRUE@doc-build: all
 @EFL_BUILD_DOC_TRUE@	$(efl_doxygen)
-@EFL_BUILD_DOC_TRUE@	cp $(srcdir)/img/* html/
+@EFL_BUILD_DOC_TRUE@	cp img/* html/
+@EFL_BUILD_DOC_TRUE@	cp img/* latex/
+
+@EFL_BUILD_DOC_TRUE@doc: doc-build
 @EFL_BUILD_DOC_TRUE@	cp $(srcdir)/img/* latex/
 @EFL_BUILD_DOC_TRUE@	rm -rf $(PACKAGE_DOCNAME).tar*
 @EFL_BUILD_DOC_TRUE@	mkdir -p $(PACKAGE_DOCNAME)/doc
-@EFL_BUILD_DOC_TRUE@	cp -R html/ latex/ man/ $(PACKAGE_DOCNAME)/doc
+@EFL_BUILD_DOC_TRUE@	cp -R html/ latex/ man/ xml/ $(PACKAGE_DOCNAME)/doc
 @EFL_BUILD_DOC_TRUE@	tar cf $(PACKAGE_DOCNAME).tar $(PACKAGE_DOCNAME)/
 @EFL_BUILD_DOC_TRUE@	bzip2 -9 $(PACKAGE_DOCNAME).tar
 @EFL_BUILD_DOC_TRUE@	rm -rf $(PACKAGE_DOCNAME)/
@@ -420,9 +424,18 @@ uninstall-am:
 
 @EFL_BUILD_DOC_TRUE@clean-local: doc-clean
 
+@EFL_BUILD_DOC_TRUE@install-doc: doc-build
+@EFL_BUILD_DOC_TRUE@	install -d $(docdir)
+@EFL_BUILD_DOC_TRUE@	cp -R html latex man xml $(docdir)
+
+@EFL_BUILD_DOC_TRUE@uninstall-local:
+@EFL_BUILD_DOC_TRUE@	rm -rf $(docdir)/html $(docdir)/latex $(docdir)/man $(docdir)/xml
+
 @EFL_BUILD_DOC_FALSE@doc:
 @EFL_BUILD_DOC_FALSE@	@echo "Documentation not built. Run ./configure --help"
 
+@EFL_BUILD_DOC_FALSE@install-doc: doc
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/eeze.pc b/eeze.pc
index 4009b73..08bcebf 100644
--- a/eeze.pc
+++ b/eeze.pc
@@ -1,11 +1,13 @@
+PACKAGE_TARNAME=eeze
 prefix=/home/lfelipe/e-release/release/local
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
+docdir=${prefix}/share/doc/${PACKAGE_TARNAME}
 
 Name: eeze
 Description: device convenience library for efl
 Requires.private: ecore >= 1.6.99 eina >= 1.6.99 libudev
-Version: 1.7.3
+Version: 1.7.4
 Libs: -L${libdir} -leeze
 Cflags: -I${includedir}/eeze-1
diff --git a/eeze.pc.in b/eeze.pc.in
index 606b789..ad5a1f8 100644
--- a/eeze.pc.in
+++ b/eeze.pc.in
@@ -1,7 +1,9 @@
+PACKAGE_TARNAME=@PACKAGE_TARNAME@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
+docdir=@docdir@
 
 Name: eeze
 Description: device convenience library for efl
diff --git a/eeze.spec b/eeze.spec
index 4e3740e..e6b9728 100644
--- a/eeze.spec
+++ b/eeze.spec
@@ -3,7 +3,7 @@
 
 Summary: Device Convenience Library
 Name: eeze
-Version: 1.7.3
+Version: 1.7.4
 Release: %{_rel}
 License: BSD
 Group: System Environment/Libraries