edje: fix stupid dependencies issue.

NOTE: We can't still not properly finish cross compilation as all the
build system assume that we can run the just compiled edje_cc and epp...

3 files changed, 11 insertions, 5 deletions

diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am
index 50837de8ea..1908793619 100644
--- a/src/Makefile_Edje.am
+++ b/src/Makefile_Edje.am
@@ -4,6 +4,9 @@
 lib_LTLIBRARIES += lib/edje/libedje.la
 
 EDJE_COMMON_CPPFLAGS = \
+-I$(top_builddir) \
+-I$(top_srcdir)/src/lib/edje \
+-I$(top_builddir)/src/lib/edje \
 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DPACKAGE_DATA_DIR=\"$(datadir)/edje\" \
@@ -112,7 +115,7 @@ bin_edje_edje_cc_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
 bin_edje_edje_cc_LDADD =  $(USE_EDJE_BIN_LIBS)
 bin_edje_edje_cc_DEPENDENCIES = \
 @USE_EDJE_INTERNAL_LIBS@ \
-bin/edje/epp/epp # epp is an artificial dependency because edje_cc will use it at runtime, so we be sure if we depend on edje_cc we get epp.
+bin/edje/epp/epp$(EXEEXT) # epp is an artificial dependency because edje_cc will use it at runtime, so we be sure if we depend on edje_cc we get epp.
 
 bin_edje_edje_decc_SOURCES = \
 bin/edje/edje_decc.c \
@@ -191,6 +194,9 @@ $(CWARNFLAGS) \
 -DTARGET_TAB=9 \
 -DTARGET_VT=11
 if HAVE_WIN32
+bin_edje_epp_epp_CPPFLAGS += \
+-I$(top_srcdir)/src/lib/evil \
+-I$(top_builddir)/src/lib/evil
 bin_edje_epp_epp_LDADD = lib/evil/libevil.la
 endif
 
@@ -206,7 +212,7 @@ tests/edje/edje_tests_helpers.h
 bin_SCRIPTS += bin/edje/edje_recc
 
 # Useful to other modules that generate EDJ
-EDJE_CC = EFL_RUN_IN_TREE=1 $(builddir)/bin/edje/edje_cc
+EDJE_CC = EFL_RUN_IN_TREE=1 $(builddir)/bin/edje/edje_cc${EXEEXT}
 EDJE_CC_FLAGS_VERBOSE = $(EDJE_CC_FLAGS_VERBOSE_@AM_V@)
 EDJE_CC_FLAGS_VERBOSE_ = $(EDJE_CC_FLAGS_VERBOSE_@AM_DEFAULT_V@)
 EDJE_CC_FLAGS_VERBOSE_1 = -v
@@ -235,7 +241,7 @@ $(EDJE_COMMON_CPPFLAGS) \
 tests_edje_edje_suite_LDADD = @CHECK_LIBS@  $(USE_EDJE_BIN_LIBS)
 tests_edje_edje_suite_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
 
-tests/edje/data/test_layout.edj: tests/edje/data/test_layout.edc bin/edje/edje_cc
+tests/edje/data/test_layout.edj: tests/edje/data/test_layout.edc bin/edje/edje_cc${EXEEXT}
 	@$(MKDIR_P) tests/edje/data
 	$(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) -id $(srcdir)/tests/edje/data $< $@
 
diff --git a/src/Makefile_Emotion.am b/src/Makefile_Emotion.am
index 134212ccca..ca94a5675e 100644
--- a/src/Makefile_Emotion.am
+++ b/src/Makefile_Emotion.am
@@ -159,7 +159,7 @@ tests_emotion_emotion_test_CPPFLAGS = \
 tests_emotion_emotion_test_LDADD = @USE_EDJE_LIBS@ @USE_EMOTION_LIBS@
 tests_emotion_emotion_test_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@ @USE_EMOTION_INTERNAL_LIBS@
 
-tests/emotion/data/theme.edj: tests/emotion/data/theme.edc bin/edje/edje_cc
+tests/emotion/data/theme.edj: tests/emotion/data/theme.edc bin/edje/edje_cc${EXEEXT}
 	@$(MKDIR_P) tests/emotion/data
 	$(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) -id $(srcdir)/tests/emotion/data $< $@
 
diff --git a/src/Makefile_Ethumb.am b/src/Makefile_Ethumb.am
index 453be295c3..6dd14067e2 100644
--- a/src/Makefile_Ethumb.am
+++ b/src/Makefile_Ethumb.am
@@ -47,7 +47,7 @@ modules_ethumb_emotion_module_la_DEPENDENCIES = \
 modules_ethumb_emotion_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
 modules_ethumb_emotion_module_la_LIBTOOLFLAGS = --tag=disable-static
 
-modules/ethumb/emotion/template.edj: modules/ethumb/emotion/template.edc modules/ethumb/emotion/placeholder.png bin/edje/edje_cc
+modules/ethumb/emotion/template.edj: modules/ethumb/emotion/template.edc modules/ethumb/emotion/placeholder.png bin/edje/edje_cc${EXEEXT}
 	@$(MKDIR_P) modules/ethumb/emotion
 	$(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) -id $(srcdir)/modules/ethumb/emotion $< $@