enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

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
This commit is contained in:
Gustavo Sverzut Barbieri 2013-01-11 03:57:29 +00:00
parent f0a0fd7f4e
commit f8fde3d560
6 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Makefile_Edje.am
View File

@ -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@ \

2
src/Makefile_Embryo.am
View File

@ -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@

2
src/bin/edje/edje_cc_out.c
View File

@ -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';
}

2
src/bin/embryo/embryo_cc_sc1.c
View File

@ -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';
}

2
src/examples/ecore/Makefile.am
View File

@ -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 \

3
src/examples/edje/Makefile.am
View File

@ -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 = \