diff options
| author | Lauro Moura <lauromoura@expertisesolutions.com.br> | 2018-04-11 20:03:32 -0300 |
|---|---|---|
| committer | Felipe Magno de Almeida <felipe@expertisesolutions.com.br> | 2018-04-12 21:23:42 -0300 |
| commit | 4214311a76bfd27774186b0a93882689d8bdbd4b (patch) | |
| tree | 0ea69e7575ba483092fc4d18aff3408b6feb3da7 | |
| parent | 87c58a460a0f39477461ef93e6ce8b63f994c873 (diff) | |
| download | efl-4214311a76bfd27774186b0a93882689d8bdbd4b.tar.gz | |
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.am | 12 | ||||
| -rw-r--r-- | src/examples/eolian_cxx/Makefile.am | 18 |
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 include $(top_srcdir)/src/Makefile_Eolian_Mono_Helper.am include $(top_srcdir)/src/Makefile_Efl_Mono_MSBuild_Gen_Helper.am +# Eolian_Files_Helper +# Thus we need to override it here in order to make its pattern +# rules work properly. +_EOLIAN_GEN_DEP = ../../bin/eolian/eolian_gen${EXEEXT} + SRCS = example_numberwrapper.c EXTRA_FILES = example_numberwrapper.eo EXTRA_PROGRAMS = @@ -38,13 +43,6 @@ COMMON_FLAGS += \ -fPIC -DPIC endif - -# %.eo.c: %.eo -# $(AM_V_EOL)$(EOLIAN_GEN) $(EOLIAN_FLAGS) -gc -o c:$@ $< - -# %.eo.h: %.eo -# $(AM_V_EOL)$(EOLIAN_GEN) $(EOLIAN_FLAGS) -gh -o h:$@ $< - example_numberwrapper.c: example_numberwrapper.eo.h example_numberwrapper.eo.c noinst_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 = \ include $(top_srcdir)/src/Makefile_Eolian_Helper.am include $(top_srcdir)/src/Makefile_Eolian_Cxx_Helper.am +# Eolian_*_Helper.am has this variable as a relative path to src +# Thus we need to override it here in order to make its pattern +# rules work properly. +_EOLIAN_GEN_DEP = ../../bin/eolian/eolian_gen${EXEEXT} +_EOLIAN_CXX_DEP = ../../bin/eolian_cxx/eolian_cxx${EXEEXT} + AM_CXXFLAGS = \ -I$(srcdir) \ -I$(builddir) \ @@ -125,18 +131,6 @@ EXTRA_DIST = $(DATA_FILES) \ ns_colourable.eo \ ns_colourablesquare.eo -%.eo.hh: %.eo - $(AM_V_EOLCXX)$(EOLIAN_CXX) $(EOLIAN_FLAGS) -I${abs_srcdir} -o $@ $< - -%.eo.impl.hh: %.eo.hh - true $< - -%.eo.c: %.eo - $(AM_V_EOL)$(EOLIAN_GEN) $(EOLIAN_FLAGS) $(EOLIAN_GEN_FLAGS) -gc -o c:$@ $< - -%.eo.h: %.eo - $(AM_V_EOL)$(EOLIAN_GEN) $(EOLIAN_FLAGS) $(EOLIAN_GEN_FLAGS) -gh -o h:$@ $< - examples: $(ECXX_EXAMPLE_EOS) $(GENERATED) $(EXTRA_PROGRAMS) clean-local: |