forked from enlightenment/efl
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:
parent
f0a0fd7f4e
commit
f8fde3d560
|
@ -35,6 +35,7 @@ EDJE_COMMON_CPPFLAGS = \
|
||||||
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
|
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
|
||||||
-DPACKAGE_DATA_DIR=\"$(datadir)/edje\" \
|
-DPACKAGE_DATA_DIR=\"$(datadir)/edje\" \
|
||||||
-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
|
-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
|
||||||
|
-DPACKAGE_SRC_DIR=\"`pwd`/$(top_srcdir)\" \
|
||||||
-DEFL_EDJE_BUILD \
|
-DEFL_EDJE_BUILD \
|
||||||
@EFL_COV_CFLAGS@ \
|
@EFL_COV_CFLAGS@ \
|
||||||
@EDJE_CFLAGS@ \
|
@EDJE_CFLAGS@ \
|
||||||
|
|
|
@ -61,7 +61,7 @@ bin_embryo_embryo_cc_CPPFLAGS = \
|
||||||
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
|
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
|
||||||
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
|
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
|
||||||
-DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \
|
-DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \
|
||||||
-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
|
-DPACKAGE_SRC_DIR=\"`pwd`/$(top_srcdir)\" \
|
||||||
@EMBRYO_CFLAGS@ \
|
@EMBRYO_CFLAGS@ \
|
||||||
@USE_EVIL_CFLAGS@
|
@USE_EVIL_CFLAGS@
|
||||||
|
|
||||||
|
|
|
@ -1294,7 +1294,7 @@ data_write_scripts(Eet_File *ef)
|
||||||
"%s/src/bin/embryo/embryo_cc" BIN_EXT,
|
"%s/src/bin/embryo/embryo_cc" BIN_EXT,
|
||||||
PACKAGE_BUILD_DIR);
|
PACKAGE_BUILD_DIR);
|
||||||
snprintf(inc_path, sizeof(inc_path),
|
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))
|
if (!ecore_file_exists(embryo_cc_path))
|
||||||
embryo_cc_path[0] = '\0';
|
embryo_cc_path[0] = '\0';
|
||||||
}
|
}
|
||||||
|
|
|
@ -583,7 +583,7 @@ parseoptions(int argc, char **argv, char *iname, char *oname,
|
||||||
if (getenv("EFL_RUN_IN_TREE"))
|
if (getenv("EFL_RUN_IN_TREE"))
|
||||||
{
|
{
|
||||||
struct stat st;
|
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)
|
if (stat(str, &st) != 0)
|
||||||
str[0] = '\0';
|
str[0] = '\0';
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,6 +6,8 @@ AM_CPPFLAGS = \
|
||||||
-I$(top_srcdir)/src/lib/evas \
|
-I$(top_srcdir)/src/lib/evas \
|
||||||
-I$(top_srcdir)/src/lib/ecore \
|
-I$(top_srcdir)/src/lib/ecore \
|
||||||
-I$(top_srcdir)/src/lib/ecore_input \
|
-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_con \
|
||||||
-I$(top_srcdir)/src/lib/ecore_evas \
|
-I$(top_srcdir)/src/lib/ecore_evas \
|
||||||
-I$(top_srcdir)/src/lib/ecore_audio \
|
-I$(top_srcdir)/src/lib/ecore_audio \
|
||||||
|
|
|
@ -113,6 +113,7 @@ EXTRA_DIST = $(DIST_EDCS) $(DATA_FILES)
|
||||||
|
|
||||||
AM_CPPFLAGS = \
|
AM_CPPFLAGS = \
|
||||||
-I. \
|
-I. \
|
||||||
|
-I$(builddir) \
|
||||||
-I$(top_srcdir)/src/lib/eina \
|
-I$(top_srcdir)/src/lib/eina \
|
||||||
-I$(top_builddir)/src/lib/eina \
|
-I$(top_builddir)/src/lib/eina \
|
||||||
-I$(top_srcdir)/src/lib/eo \
|
-I$(top_srcdir)/src/lib/eo \
|
||||||
|
@ -147,6 +148,8 @@ codegen_example_generated.h
|
||||||
codegen_example_generated.c codegen_example_generated.h: codegen.edj
|
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
|
$(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_SOURCES = \
|
||||||
edje-codegen-example.c
|
edje-codegen-example.c
|
||||||
nodist_edje_codegen_example_SOURCES = \
|
nodist_edje_codegen_example_SOURCES = \
|
||||||
|
|
Loading…
Reference in New Issue