efl: fix out-of-tree build of examples.

edje and embryo include files are in source dir, not build.

codegen example must have dependency to build in correct order :-/

SVN revision: 82605

diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am
index b2895817c25454459de9b3927e4d72296243baf0..199f0d8bde8634d174359103d76dac5e7aecca85 100644 (file)
--- a/src/Makefile_Edje.am
+++ b/src/Makefile_Edje.am
@@ -35,6 +35,7 @@ EDJE_COMMON_CPPFLAGS = \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DPACKAGE_DATA_DIR=\"$(datadir)/edje\" \
 -DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
+-DPACKAGE_SRC_DIR=\"`pwd`/$(top_srcdir)\" \
 -DEFL_EDJE_BUILD \
 @EFL_COV_CFLAGS@ \
 @EDJE_CFLAGS@ \

diff --git a/src/Makefile_Embryo.am b/src/Makefile_Embryo.am
index ab224d50d6eba480ead89d5164319b8473360a1e..8d07096f30741756eb0a977a8b8ee19003a3e1e6 100644 (file)
--- a/src/Makefile_Embryo.am
+++ b/src/Makefile_Embryo.am
@@ -61,7 +61,7 @@ bin_embryo_embryo_cc_CPPFLAGS = \
 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \
--DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
+-DPACKAGE_SRC_DIR=\"`pwd`/$(top_srcdir)\" \
 @EMBRYO_CFLAGS@ \
 @USE_EVIL_CFLAGS@
 

diff --git a/src/bin/edje/edje_cc_out.c b/src/bin/edje/edje_cc_out.c
index bdd213bfc81de3141093a77c34b474b142d53fa8..e3dd3d76d5c43225519c9641699fbebb85c0590a 100644 (file)
--- a/src/bin/edje/edje_cc_out.c
+++ b/src/bin/edje/edje_cc_out.c
@@ -1294,7 +1294,7 @@ data_write_scripts(Eet_File *ef)
                    "%s/src/bin/embryo/embryo_cc" BIN_EXT,
                    PACKAGE_BUILD_DIR);
           snprintf(inc_path, sizeof(inc_path),
-                   "%s/data/edje/include", PACKAGE_BUILD_DIR);
+                   "%s/data/edje/include", PACKAGE_SRC_DIR);
           if (!ecore_file_exists(embryo_cc_path))
             embryo_cc_path[0] = '\0';
        }

diff --git a/src/bin/embryo/embryo_cc_sc1.c b/src/bin/embryo/embryo_cc_sc1.c
index f9410411822ee2bc92ff75a1b66b2d55e7b07012..c8d534b47d40c261bafa782dde03f613ea166068 100644 (file)
--- a/src/bin/embryo/embryo_cc_sc1.c
+++ b/src/bin/embryo/embryo_cc_sc1.c
@@ -583,7 +583,7 @@ parseoptions(int argc, char **argv, char *iname, char *oname,
    if (getenv("EFL_RUN_IN_TREE"))
      {
         struct stat st;
-        snprintf(str, sizeof(str), "%s/data/embryo/", PACKAGE_BUILD_DIR);
+        snprintf(str, sizeof(str), "%s/data/embryo/", PACKAGE_SRC_DIR);
         if (stat(str, &st) != 0)
           str[0] = '\0';
      }

diff --git a/src/examples/ecore/Makefile.am b/src/examples/ecore/Makefile.am
index 3f8627303fac3cb6ad29a9630e69577bf2b3053f..12a6e11eeaffbe78995a4a40380f959ce9328b8e 100644 (file)
--- a/src/examples/ecore/Makefile.am
+++ b/src/examples/ecore/Makefile.am
@@ -6,6 +6,8 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/evas \
 -I$(top_srcdir)/src/lib/ecore \
 -I$(top_srcdir)/src/lib/ecore_input \
+-I$(top_srcdir)/src/lib/ecore_file \
+-I$(top_srcdir)/src/lib/ecore_imf \
 -I$(top_srcdir)/src/lib/ecore_con \
 -I$(top_srcdir)/src/lib/ecore_evas \
 -I$(top_srcdir)/src/lib/ecore_audio \

diff --git a/src/examples/edje/Makefile.am b/src/examples/edje/Makefile.am
index e392dea50fc33e7214c836181bcd870e9be96395..518e2eb5eacfdc0e1b6139c220ed61fdee1c5490 100644 (file)
--- a/src/examples/edje/Makefile.am
+++ b/src/examples/edje/Makefile.am
@@ -113,6 +113,7 @@ EXTRA_DIST = $(DIST_EDCS) $(DATA_FILES)
 
 AM_CPPFLAGS = \
 -I. \
+-I$(builddir) \
 -I$(top_srcdir)/src/lib/eina \
 -I$(top_builddir)/src/lib/eina \
 -I$(top_srcdir)/src/lib/eo \
@@ -147,6 +148,8 @@ codegen_example_generated.h
 codegen_example_generated.c codegen_example_generated.h: codegen.edj
        $(AM_V_GEN)$(EDJE_CODEGEN) $(EDJE_CODEGEN_FLAGS) codegen.edj example_group $(builddir)/codegen_example_generated.c $(builddir)/codegen_example_generated.h
 
+edje-codegen-example.$(OBJEXT): $(CODEGEN_GENERATED)
+
 edje_codegen_example_SOURCES = \
 edje-codegen-example.c
 nodist_edje_codegen_example_SOURCES = \