alpha1 release autofoo/build tree work to pass distcheck and actually workv1.8.0-alpha1

19 files changed, 91 insertions, 48 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index f4f49a8ccd..6ceedd2153 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,7 +15,7 @@ check_PROGRAMS =
 TESTS =
 EXTRA_DIST =
 
-EFL_INSTALL_DATA_HOOK=
+EFL_INSTALL_EXEC_HOOK=
 
 include Makefile_Efl.am
 
@@ -102,9 +102,5 @@ clean-local:
         find . -type f -name '*.gcda' -delete
         find . -type f -name check-results.xml -delete
 
-install-data-hook:
-        $(EFL_INSTALL_DATA_HOOK)
-        for i in $(lib_LTLIBRARIES); do \
-                export file=`basename $$i`; \
-                sed -e "s/-luuid//" $(DESTDIR)${libdir}/$$file > $(DESTDIR)${libdir}/$$file.tmp && mv $(DESTDIR)${libdir}/$$file.tmp $(DESTDIR)${libdir}/$$file; \
-        done
+install-exec-hook:
+        $(EFL_INSTALL_EXEC_HOOK)
diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am
index 6c1daf939e..6b4cad4849 100644
--- a/src/Makefile_Edje.am
+++ b/src/Makefile_Edje.am
@@ -210,7 +210,35 @@ bin/edje/edje_convert.c \
 bin/edje/edje_data_convert.c \
 bin/edje/edje_convert_main.c \
 lib/edje/edje_convert.c \
-tests/edje/edje_tests_helpers.h
+tests/edje/edje_tests_helpers.h \
+tests/edje/data/complex_layout.edc \
+tests/edje/data/test_layout.edc \
+tests/emotion/data/theme.edc \
+tests/emotion/data/icon.edc \
+tests/emotion/data/bpause.png \
+tests/emotion/data/bplay.png \
+tests/emotion/data/bstop.png \
+tests/emotion/data/e_logo.png \
+tests/emotion/data/fr1.png \
+tests/emotion/data/fr2.png \
+tests/emotion/data/fr3.png \
+tests/emotion/data/fr4.png \
+tests/emotion/data/fr5.png \
+tests/emotion/data/fr6.png \
+tests/emotion/data/fr7.png \
+tests/emotion/data/h_slider.png \
+tests/emotion/data/knob.png \
+tests/emotion/data/orb.png \
+tests/emotion/data/pnl.png \
+tests/emotion/data/sl.png \
+tests/emotion/data/tiles.png \
+tests/emotion/data/video_frame_bottom.png \
+tests/emotion/data/video_frame_left.png \
+tests/emotion/data/video_frame_right.png \
+tests/emotion/data/video_frame_top.png \
+tests/emotion/data/whb.png \
+tests/emotion/data/window_inner_shadow.png
+
 
 bin_SCRIPTS += bin/edje/edje_recc
 
diff --git a/src/Makefile_Eeze.am b/src/Makefile_Eeze.am
index eaa41d7a56..499193d4dd 100644
--- a/src/Makefile_Eeze.am
+++ b/src/Makefile_Eeze.am
@@ -134,7 +134,7 @@ bin_eeze_eeze_scanner_DEPENDENCIES = @USE_EEZE_INTERNAL_LIBS@
 
 setuid_root_mode = a=rx,u+xs
 
-EFL_INSTALL_DATA_HOOK+=@chmod $(setuid_root_mode) $(DESTDIR)$(bindir)/eeze_scanner$(EXEEXT) || true;
+EFL_INSTALL_EXEC_HOOK+=@chmod $(setuid_root_mode) $(DESTDIR)$(bindir)/eeze_scanner$(EXEEXT) || true;
 
 
 ### Unit tests
diff --git a/src/lib/ecore/Ecore_Common.h b/src/lib/ecore/Ecore_Common.h
index 83307f2fd5..eceb4ed34e 100644
--- a/src/lib/ecore/Ecore_Common.h
+++ b/src/lib/ecore/Ecore_Common.h
@@ -2,6 +2,8 @@
 extern "C" {
 #endif
 
+#include <Efl_Config.h>
+
 /**
  * @defgroup Ecore_Init_Group Ecore initialization, shutdown functions and reset on fork.
  * @ingroup Ecore
@@ -30,8 +32,8 @@ EAPI int ecore_shutdown(void);
  * @{
  */
 
-#define ECORE_VERSION_MAJOR 1
-#define ECORE_VERSION_MINOR 8
+#define ECORE_VERSION_MAJOR EFL_VERSION_MAJOR
+#define ECORE_VERSION_MINOR EFL_VERSION_MINOR
 
 typedef struct _Ecore_Version
 {
diff --git a/src/lib/ecore_x/Ecore_X.h b/src/lib/ecore_x/Ecore_X.h
index e0e24ae98c..4341711682 100644
--- a/src/lib/ecore_x/Ecore_X.h
+++ b/src/lib/ecore_x/Ecore_X.h
@@ -2,6 +2,7 @@
 #define _ECORE_X_H
 
 #include <Eina.h>
+#include <Efl_Config.h>
 
 #ifdef EAPI
 # undef EAPI
@@ -25,6 +26,19 @@
 # endif // ifdef __GNUC__
 #endif // ifdef _MSC_VER
 
+#define ECORE_X_VERSION_MAJOR EFL_VERSION_MAJOR
+#define ECORE_X_VERSION_MINOR EFL_VERSION_MINOR
+
+typedef struct _Ecore_X_Version
+{
+      int major;
+      int minor;
+      int micro;
+      int revision;
+} Ecore_X_Version;
+
+EAPI extern Ecore_X_Version *ecore_x_version;
+
 #include "ecore_x_version.h"
 
 #include <sys/types.h>
diff --git a/src/lib/ecore_x/ecore_x_version.h.in b/src/lib/ecore_x/ecore_x_version.h.in
index 24de5f86fd..98f1d6a9db 100644
--- a/src/lib/ecore_x/ecore_x_version.h.in
+++ b/src/lib/ecore_x/ecore_x_version.h.in
@@ -1,19 +1,6 @@
 #ifndef _ECORE_X_VERSION_H_
 #define _ECORE_X_VERSION_H_ 1
 
-#define ECORE_X_VERSION_MAJOR @VMAJ@
-#define ECORE_X_VERSION_MINOR @VMIN@
-
-typedef struct _Ecore_X_Version
-{
-   int major;
-   int minor;
-   int micro;
-   int revision;
-} Ecore_X_Version;
-
-EAPI extern Ecore_X_Version *ecore_x_version;
-
 #ifndef @HAVE_ECORE_X_BACKEND@
 #define @HAVE_ECORE_X_BACKEND@ 1
 #endif
diff --git a/src/lib/edje/Edje.h b/src/lib/edje/Edje.h
index 8a460e9ab7..015dcad432 100644
--- a/src/lib/edje/Edje.h
+++ b/src/lib/edje/Edje.h
@@ -214,6 +214,7 @@ param in edje programs
 
 #include <Evas.h>
 #include <Eo.h>
+#include <Efl_Config.h>
 
 #ifdef EAPI
 # undef EAPI
@@ -245,8 +246,8 @@ param in edje programs
 extern "C" {
 #endif
 
-#define EDJE_VERSION_MAJOR 1
-#define EDJE_VERSION_MINOR 8
+#define EDJE_VERSION_MAJOR EFL_VERSION_MAJOR
+#define EDJE_VERSION_MINOR EFL_VERSION_MINOR
 
 #include "Edje_Common.h"
 #ifndef EFL_NOLEGACY_API_SUPPORT
diff --git a/src/lib/eet/Eet.h b/src/lib/eet/Eet.h
index de57e4a3d7..ab907335cc 100644
--- a/src/lib/eet/Eet.h
+++ b/src/lib/eet/Eet.h
@@ -97,6 +97,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <Eina.h>
+#include <Efl_Config.h>
 
 #ifdef EAPI
 # undef EAPI
@@ -136,8 +137,8 @@ extern "C" {
  *
  */
 
-#define EET_VERSION_MAJOR 1
-#define EET_VERSION_MINOR 8
+#define EET_VERSION_MAJOR EFL_VERSION_MAJOR
+#define EET_VERSION_MINOR EFL_VERSION_MINOR
 /**
  * @typedef Eet_Version
  *
diff --git a/src/lib/eeze/Eeze.h b/src/lib/eeze/Eeze.h
index 82ef11ae82..55d2230884 100644
--- a/src/lib/eeze/Eeze.h
+++ b/src/lib/eeze/Eeze.h
@@ -73,6 +73,7 @@
 #define EEZE_UDEV_H
 
 #include <Eina.h>
+#include <Efl_Config.h>
 
 #ifdef EAPI
 # undef EAPI
@@ -270,8 +271,8 @@ struct Eeze_Udev_Watch;
  */
 typedef struct Eeze_Udev_Watch Eeze_Udev_Watch;
 
-#define EEZE_VERSION_MAJOR 1
-#define EEZE_VERSION_MINOR 8
+#define EEZE_VERSION_MAJOR EFL_VERSION_MAJOR
+#define EEZE_VERSION_MINOR EFL_VERSION_MINOR
 
    typedef struct _Eeze_Version
      {
diff --git a/src/lib/efl/Efl_Config.h.in b/src/lib/efl/Efl_Config.h.in
index 5bf7f6a004..ad17684a3d 100644
--- a/src/lib/efl/Efl_Config.h.in
+++ b/src/lib/efl/Efl_Config.h.in
@@ -13,4 +13,7 @@
 /* @EFL_API_EO_DEF@ */
 #endif
 
+#define EFL_VERSION_MAJOR @EFL_VERSION_MAJOR@
+#define EFL_VERSION_MINOR @EFL_VERSION_MINOR@
+
 #endif
diff --git a/src/lib/efreet/Efreet.h b/src/lib/efreet/Efreet.h
index ae1ec188b8..e2360ee0e7 100644
--- a/src/lib/efreet/Efreet.h
+++ b/src/lib/efreet/Efreet.h
@@ -72,6 +72,7 @@
  */
 
 #include <Eina.h>
+#include <Efl_Config.h>
 
 #ifdef EAPI
 # undef EAPI
@@ -103,8 +104,8 @@
 extern "C" {
 #endif
 
-#define EFREET_VERSION_MAJOR 1
-#define EFREET_VERSION_MINOR 8
+#define EFREET_VERSION_MAJOR EFL_VERSION_MAJOR
+#define EFREET_VERSION_MINOR EFL_VERSION_MINOR
    
    typedef struct _Efreet_Version
      {
diff --git a/src/lib/eina/eina_main.h b/src/lib/eina/eina_main.h
index 41ea2a5b57..d7a7f0b01f 100644
--- a/src/lib/eina/eina_main.h
+++ b/src/lib/eina/eina_main.h
@@ -19,6 +19,8 @@
 #ifndef EINA_MAIN_H_
 #define EINA_MAIN_H_
 
+#include <Efl_Config.h>
+
 #include "eina_types.h"
 
 /**
@@ -44,13 +46,13 @@
  * @def EINA_VERSION_MAJOR
  * @brief Major version of Eina
  */
-#define EINA_VERSION_MAJOR 1
+#define EINA_VERSION_MAJOR EFL_VERSION_MAJOR
 
 /**
  * @def EINA_VERSION_MINOR
  * @brief Minor version of Eina
  */
-#define EINA_VERSION_MINOR 8
+#define EINA_VERSION_MINOR EFL_VERSION_MINOR
 
 /**
  * @typedef Eina_Version
diff --git a/src/lib/eio/Eio.h b/src/lib/eio/Eio.h
index fde08d1071..7c9bd06b2e 100644
--- a/src/lib/eio/Eio.h
+++ b/src/lib/eio/Eio.h
@@ -30,6 +30,7 @@
 
 #include <Eina.h>
 #include <Eet.h>
+#include <Efl_Config.h>
 
 #ifdef EAPI
 # undef EAPI
@@ -62,8 +63,8 @@
 extern "C" {
 #endif
 
-#define EIO_VERSION_MAJOR 1
-#define EIO_VERSION_MINOR 8
+#define EIO_VERSION_MAJOR EFL_VERSION_MAJOR
+#define EIO_VERSION_MINOR EFL_VERSION_MINOR
 
     /**
     * @typedef Eio_Version
diff --git a/src/lib/eldbus/Eldbus.h b/src/lib/eldbus/Eldbus.h
index cc069a0594..478fcea92f 100644
--- a/src/lib/eldbus/Eldbus.h
+++ b/src/lib/eldbus/Eldbus.h
@@ -78,6 +78,7 @@
 
 #include <Eina.h>
 #include <stdarg.h>
+#include <Efl_Config.h>
 
 #ifdef EAPI
 # undef EAPI
@@ -115,8 +116,8 @@ extern "C" {
  *
  * @{
  */
-#define ELDBUS_VERSION_MAJOR 1
-#define ELDBUS_VERSION_MINOR 8
+#define ELDBUS_VERSION_MAJOR EFL_VERSION_MAJOR
+#define ELDBUS_VERSION_MINOR EFL_VERSION_MINOR
 
 #define ELDBUS_FDO_BUS "org.freedesktop.DBus"
 #define ELDBUS_FDO_PATH "/org/freedesktop/DBus"
diff --git a/src/lib/embryo/Embryo.h b/src/lib/embryo/Embryo.h
index e9020d4ced..923afe73aa 100644
--- a/src/lib/embryo/Embryo.h
+++ b/src/lib/embryo/Embryo.h
@@ -336,6 +336,8 @@ This is the @e only file you need to include.
 #ifndef _EMBRYO_H
 #define _EMBRYO_H
 
+#include <Efl_Config.h>
+
 #ifdef EAPI
 # undef EAPI
 #endif
@@ -366,8 +368,8 @@ This is the @e only file you need to include.
 extern "C" {
 #endif
 
-#define EMBRYO_VERSION_MAJOR 1
-#define EMBRYO_VERSION_MINOR 8
+#define EMBRYO_VERSION_MAJOR EFL_VERSION_MAJOR
+#define EMBRYO_VERSION_MINOR EFL_VERSION_MINOR
    
    typedef struct _Embryo_Version
      {
diff --git a/src/lib/emotion/Emotion.h b/src/lib/emotion/Emotion.h
index 34d1cc3af0..7240d2f251 100644
--- a/src/lib/emotion/Emotion.h
+++ b/src/lib/emotion/Emotion.h
@@ -92,6 +92,7 @@
  */
 
 #include <Evas.h>
+#include <Efl_Config.h>
 
 #ifdef EAPI
 # undef EAPI
@@ -262,8 +263,8 @@ typedef enum _Emotion_Aspect    Emotion_Aspect; /**< Aspect ratio option. */
 extern "C" {
 #endif
 
-#define EMOTION_VERSION_MAJOR 1
-#define EMOTION_VERSION_MINOR 8
+#define EMOTION_VERSION_MAJOR EFL_VERSION_MAJOR
+#define EMOTION_VERSION_MINOR EFL_VERSION_MINOR
    
    typedef struct _Emotion_Version
      {
diff --git a/src/lib/ephysics/EPhysics.h b/src/lib/ephysics/EPhysics.h
index 90ea09f046..f3716f9d00 100644
--- a/src/lib/ephysics/EPhysics.h
+++ b/src/lib/ephysics/EPhysics.h
@@ -65,6 +65,7 @@
  */
 
 #include <Evas.h>
+#include <Efl_Config.h>
 
 #ifdef EAPI
 # undef EAPI
@@ -96,8 +97,8 @@
 extern "C" {
 #endif
 
-#define EPHYSICS_VERSION_MAJOR 0
-#define EPHYSICS_VERSION_MINOR 1
+#define EPHYSICS_VERSION_MAJOR EFL_VERSION_MAJOR
+#define EPHYSICS_VERSION_MINOR EFL_VERSION_MINOR
 
 /**
  * @file
diff --git a/src/lib/ethumb/Ethumb.h b/src/lib/ethumb/Ethumb.h
index fd4dff708a..4f91433588 100644
--- a/src/lib/ethumb/Ethumb.h
+++ b/src/lib/ethumb/Ethumb.h
@@ -2,6 +2,7 @@
 #define __ETHUMB_H__ 1
 
 #include <Eina.h>
+#include <Efl_Config.h>
 
 #ifdef EAPI
 # undef EAPI
@@ -33,8 +34,8 @@
 extern "C" {
 #endif
 
-#define ETHUMB_VERSION_MAJOR 1
-#define ETHUMB_VERSION_MINOR 8
+#define ETHUMB_VERSION_MAJOR EFL_VERSION_MAJOR
+#define ETHUMB_VERSION_MINOR EFL_VERSION_MINOR
    
    typedef struct _Ethumb_Version
      {
diff --git a/src/lib/evas/Evas_Common.h b/src/lib/evas/Evas_Common.h
index 007c0acf8f..3dbe604794 100644
--- a/src/lib/evas/Evas_Common.h
+++ b/src/lib/evas/Evas_Common.h
@@ -2,8 +2,8 @@
 # error You shall not include this header directly
 #endif
 
-#define EVAS_VERSION_MAJOR 1
-#define EVAS_VERSION_MINOR 8
+#define EVAS_VERSION_MAJOR EFL_VERSION_MAJOR
+#define EVAS_VERSION_MINOR EFL_VERSION_MINOR
 
 typedef struct _Evas_Version
 {