Update EFL to latest beta.

4 files changed, 15 insertions, 9 deletions

diff --git a/libraries/eet/doc/Doxyfile b/libraries/eet/doc/Doxyfile
index f6e3026..26a32a7 100644
--- a/libraries/eet/doc/Doxyfile
+++ b/libraries/eet/doc/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME           = Eet
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER         = 1.5.99.67344
+PROJECT_NUMBER         = 1.6.0-alpha
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description for a project that appears at the top of each page and should give viewer a quick idea about the purpose of the project. Keep the description short.
 
@@ -1267,7 +1267,7 @@ RTF_EXTENSIONS_FILE    =
 # If the GENERATE_MAN tag is set to YES (the default) Doxygen will
 # generate man pages
 
-GENERATE_MAN           = YES
+GENERATE_MAN           = NO
 
 # The MAN_OUTPUT tag is used to specify where the man pages will be put.
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be
diff --git a/libraries/eet/doc/Doxyfile.in b/libraries/eet/doc/Doxyfile.in
index eadf82a..8c427f8 100644
--- a/libraries/eet/doc/Doxyfile.in
+++ b/libraries/eet/doc/Doxyfile.in
@@ -1267,7 +1267,7 @@ RTF_EXTENSIONS_FILE    =
 # If the GENERATE_MAN tag is set to YES (the default) Doxygen will
 # generate man pages
 
-GENERATE_MAN           = YES
+GENERATE_MAN           = NO
 
 # The MAN_OUTPUT tag is used to specify where the man pages will be put.
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be
diff --git a/libraries/eet/doc/Makefile.am b/libraries/eet/doc/Makefile.am
index 145376f..4eeb438 100644
--- a/libraries/eet/doc/Makefile.am
+++ b/libraries/eet/doc/Makefile.am
@@ -8,19 +8,20 @@ PACKAGE_DOCNAME = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-doc
 if EFL_BUILD_DOC
 
 doc-clean:
-        rm -rf html/ latex/ man/ xml/ $(PACKAGE_DOCNAME).tar*
+        rm -rf html/ latex/ xml/ $(PACKAGE_DOCNAME).tar*
 
 doc: doc-clean
         $(efl_doxygen)
         cp $(srcdir)/img/* html/
         rm -rf $(PACKAGE_DOCNAME).tar*
         mkdir -p $(PACKAGE_DOCNAME)/doc
-        cp -R html/ latex/ man/ $(PACKAGE_DOCNAME)/doc
+        cp -R html/ latex/ $(PACKAGE_DOCNAME)/doc
         tar cf $(PACKAGE_DOCNAME).tar $(PACKAGE_DOCNAME)/
         bzip2 -9 $(PACKAGE_DOCNAME).tar
         rm -rf $(PACKAGE_DOCNAME)/
         mv $(PACKAGE_DOCNAME).tar.bz2 $(top_builddir)
-        @echo "Documentation Package: $(top_builddir)/$(PACKAGE_DOCNAME).tar.bz2"
+        @echo "Documentation Package: $(PACKAGE_DOCNAME).tar.bz2"
+        @echo "Documentation HTML: doc/html"
 
 clean-local: doc-clean
 
diff --git a/libraries/eet/doc/Makefile.in b/libraries/eet/doc/Makefile.in
index e285740..25de7ec 100644
--- a/libraries/eet/doc/Makefile.in
+++ b/libraries/eet/doc/Makefile.in
@@ -104,6 +104,8 @@ EINA_LIBS = @EINA_LIBS@
 EVIL_CFLAGS = @EVIL_CFLAGS@
 EVIL_LIBS = @EVIL_LIBS@
 EXEEXT = @EXEEXT@
+EXOTIC_CFLAGS = @EXOTIC_CFLAGS@
+EXOTIC_LIBS = @EXOTIC_LIBS@
 FGREP = @FGREP@
 GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
 GNUTLS_LIBS = @GNUTLS_LIBS@
@@ -143,6 +145,8 @@ PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -414,19 +418,20 @@ uninstall-am:
 .PHONY: doc
 
 @EFL_BUILD_DOC_TRUE@doc-clean:
-@EFL_BUILD_DOC_TRUE@    rm -rf html/ latex/ man/ xml/ $(PACKAGE_DOCNAME).tar*
+@EFL_BUILD_DOC_TRUE@    rm -rf html/ latex/ xml/ $(PACKAGE_DOCNAME).tar*
 
 @EFL_BUILD_DOC_TRUE@doc: doc-clean
 @EFL_BUILD_DOC_TRUE@    $(efl_doxygen)
 @EFL_BUILD_DOC_TRUE@    cp $(srcdir)/img/* html/
 @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/ $(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)/
 @EFL_BUILD_DOC_TRUE@    mv $(PACKAGE_DOCNAME).tar.bz2 $(top_builddir)
-@EFL_BUILD_DOC_TRUE@    @echo "Documentation Package: $(top_builddir)/$(PACKAGE_DOCNAME).tar.bz2"
+@EFL_BUILD_DOC_TRUE@    @echo "Documentation Package: $(PACKAGE_DOCNAME).tar.bz2"
+@EFL_BUILD_DOC_TRUE@    @echo "Documentation HTML: doc/html"
 
 @EFL_BUILD_DOC_TRUE@clean-local: doc-clean