From 7af39bc4479650fbc705d57bba32826bfa2bb2ec Mon Sep 17 00:00:00 2001 From: Stefan Schmidt Date: Fri, 14 Oct 2016 12:36:25 +0200 Subject: [PATCH] examples: eolian_cxx: adapt code generation to changed eolian_gen commandline The commandline options have changed for eolian_gen to generate the code. Adapt the makefile helpers to fix the build break in examples --- src/examples/eolian_cxx/Makefile.am | 4 ++-- src/examples/eolian_cxx/Makefile.examples | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/examples/eolian_cxx/Makefile.am b/src/examples/eolian_cxx/Makefile.am index fa3e9ae..ed12249 100644 --- a/src/examples/eolian_cxx/Makefile.am +++ b/src/examples/eolian_cxx/Makefile.am @@ -137,10 +137,10 @@ eolian_cxx_callbacks_01_SOURCES = eolian_cxx_callbacks_01.cc true $< %.eo.c: %.eo - $(AM_V_EOL)$(EOLIAN_GEN) --legacy $(EOLIAN_FLAGS) --gc -o $@ $< + $(AM_V_EOL)$(EOLIAN_GEN) $(EOLIAN_FLAGS) -gc -o c:$@ $< %.eo.h: %.eo - $(AM_V_EOL)$(EOLIAN_GEN) $(EOLIAN_FLAGS) --gh -o $@ $< + $(AM_V_EOL)$(EOLIAN_GEN) $(EOLIAN_FLAGS) -gh -o h:$@ $< examples: $(ECXX_EXAMPLE_EOS) $(GENERATED) $(EXTRA_PROGRAMS) diff --git a/src/examples/eolian_cxx/Makefile.examples b/src/examples/eolian_cxx/Makefile.examples index d3a29a3..4ddd64d 100644 --- a/src/examples/eolian_cxx/Makefile.examples +++ b/src/examples/eolian_cxx/Makefile.examples @@ -28,10 +28,10 @@ all: $(OBJS) examples codegen: $(EOLIAN_CXX) $(EOLIAN_FLAGS) -I./colourable.eo -o colourable.eo.hh $(EOLIAN_CXX) $(EOLIAN_FLAGS) -I./colourablesquare.eo -o colourablesquare.eo.hh - $(EOLIAN_GEN) --legacy $(EOLIAN_FLAGS) --gc -o colourable.eo.c colourable.eo - $(EOLIAN_GEN) --legacy $(EOLIAN_FLAGS) --gc -o colourablesquare.eo.c colourablesquare.eo - $(EOLIAN_GEN) $(EOLIAN_FLAGS) --gh -o colourable.eo.h colourable.eo - $(EOLIAN_GEN) $(EOLIAN_FLAGS) --gh -o colourablesquare.eo.h colourablesquare.eo + $(EOLIAN_GEN) $(EOLIAN_FLAGS) -gc -o c:colourable.eo.c colourable.eo + $(EOLIAN_GEN) $(EOLIAN_FLAGS) -gc -o c:colourablesquare.eo.c colourablesquare.eo + $(EOLIAN_GEN) $(EOLIAN_FLAGS) -gh -o h:colourable.eo.h colourable.eo + $(EOLIAN_GEN) $(EOLIAN_FLAGS) -gh -o h:colourablesquare.eo.h colourablesquare.eo $(OBJS): codegen $(CC) -c colourable.c $(COMMON_FLAGS) -- 2.7.4