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

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.
This commit is contained in:
Lauro Moura 2018-04-11 20:03:32 -03:00 committed by Felipe Magno de Almeida
parent 87c58a460a
commit 4214311a76
2 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/examples/efl_mono/Makefile.am
View File

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

18
src/examples/eolian_cxx/Makefile.am
View File

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