summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLauro Moura <lauromoura@expertisesolutions.com.br>2018-04-11 20:03:32 -0300
committerFelipe Magno de Almeida <felipe@expertisesolutions.com.br>2018-04-12 21:23:42 -0300
commit4214311a76bfd27774186b0a93882689d8bdbd4b (patch)
tree0ea69e7575ba483092fc4d18aff3408b6feb3da7
parent87c58a460a0f39477461ef93e6ce8b63f994c873 (diff)
examples: Improve efl_mono and eolian_cxx build
The examples were either not build or using repeated rules due to _EOLIAN_DEP_GEN not being set correctly was Makefile_Eolian_Helper.am assumes it being inclueded from src/, while each example folder has its own .am inside its folder.
-rw-r--r--src/examples/efl_mono/Makefile.am12
-rw-r--r--src/examples/eolian_cxx/Makefile.am18
2 files changed, 11 insertions, 19 deletions
diff --git a/src/examples/efl_mono/Makefile.am b/src/examples/efl_mono/Makefile.am
index 3bd53085c4..7d3f02a054 100644
--- a/src/examples/efl_mono/Makefile.am
+++ b/src/examples/efl_mono/Makefile.am
@@ -4,6 +4,11 @@ include $(top_srcdir)/src/Makefile_Eolian_Helper.am
4include $(top_srcdir)/src/Makefile_Eolian_Mono_Helper.am 4include $(top_srcdir)/src/Makefile_Eolian_Mono_Helper.am
5include $(top_srcdir)/src/Makefile_Efl_Mono_MSBuild_Gen_Helper.am 5include $(top_srcdir)/src/Makefile_Efl_Mono_MSBuild_Gen_Helper.am
6 6
7# Eolian_Files_Helper
8# Thus we need to override it here in order to make its pattern
9# rules work properly.
10_EOLIAN_GEN_DEP = ../../bin/eolian/eolian_gen${EXEEXT}
11
7SRCS = example_numberwrapper.c 12SRCS = example_numberwrapper.c
8EXTRA_FILES = example_numberwrapper.eo 13EXTRA_FILES = example_numberwrapper.eo
9EXTRA_PROGRAMS = 14EXTRA_PROGRAMS =
@@ -38,13 +43,6 @@ COMMON_FLAGS += \
38-fPIC -DPIC 43-fPIC -DPIC
39endif 44endif
40 45
41
42# %.eo.c: %.eo
43# $(AM_V_EOL)$(EOLIAN_GEN) $(EOLIAN_FLAGS) -gc -o c:$@ $<
44
45# %.eo.h: %.eo
46# $(AM_V_EOL)$(EOLIAN_GEN) $(EOLIAN_FLAGS) -gh -o h:$@ $<
47
48example_numberwrapper.c: example_numberwrapper.eo.h example_numberwrapper.eo.c 46example_numberwrapper.c: example_numberwrapper.eo.h example_numberwrapper.eo.c
49 47
50noinst_lib_LTLIBRARIES = libexample_numberwrapper.la 48noinst_lib_LTLIBRARIES = libexample_numberwrapper.la
diff --git a/src/examples/eolian_cxx/Makefile.am b/src/examples/eolian_cxx/Makefile.am
index 16cddb3410..f9b0ab8271 100644
--- a/src/examples/eolian_cxx/Makefile.am
+++ b/src/examples/eolian_cxx/Makefile.am
@@ -12,6 +12,12 @@ EOLIAN_FLAGS = \
12include $(top_srcdir)/src/Makefile_Eolian_Helper.am 12include $(top_srcdir)/src/Makefile_Eolian_Helper.am
13include $(top_srcdir)/src/Makefile_Eolian_Cxx_Helper.am 13include $(top_srcdir)/src/Makefile_Eolian_Cxx_Helper.am
14 14
15# Eolian_*_Helper.am has this variable as a relative path to src
16# Thus we need to override it here in order to make its pattern
17# rules work properly.
18_EOLIAN_GEN_DEP = ../../bin/eolian/eolian_gen${EXEEXT}
19_EOLIAN_CXX_DEP = ../../bin/eolian_cxx/eolian_cxx${EXEEXT}
20
15AM_CXXFLAGS = \ 21AM_CXXFLAGS = \
16 -I$(srcdir) \ 22 -I$(srcdir) \
17 -I$(builddir) \ 23 -I$(builddir) \
@@ -125,18 +131,6 @@ EXTRA_DIST = $(DATA_FILES) \
125ns_colourable.eo \ 131ns_colourable.eo \
126ns_colourablesquare.eo 132ns_colourablesquare.eo
127 133
128%.eo.hh: %.eo
129 $(AM_V_EOLCXX)$(EOLIAN_CXX) $(EOLIAN_FLAGS) -I${abs_srcdir} -o $@ $<
130
131%.eo.impl.hh: %.eo.hh
132 true $<
133
134%.eo.c: %.eo
135 $(AM_V_EOL)$(EOLIAN_GEN) $(EOLIAN_FLAGS) $(EOLIAN_GEN_FLAGS) -gc -o c:$@ $<
136
137%.eo.h: %.eo
138 $(AM_V_EOL)$(EOLIAN_GEN) $(EOLIAN_FLAGS) $(EOLIAN_GEN_FLAGS) -gh -o h:$@ $<
139
140examples: $(ECXX_EXAMPLE_EOS) $(GENERATED) $(EXTRA_PROGRAMS) 134examples: $(ECXX_EXAMPLE_EOS) $(GENERATED) $(EXTRA_PROGRAMS)
141 135
142clean-local: 136clean-local: