From 823edb94873c0d5bdd50118e861e68c82b25cf12 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 19 Oct 2017 20:11:49 +0200 Subject: [PATCH] cxx build: update after the evas gesture build fix The changes in f334f2a5042734218d599f189fda615db47be766 also need an update in the C++ build. --- src/Makefile_Cxx.am | 11 ++++++++--- src/Makefile_Evas.am | 8 ++++++-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/Makefile_Cxx.am b/src/Makefile_Cxx.am index da9bb5d872..24978ddcf1 100644 --- a/src/Makefile_Cxx.am +++ b/src/Makefile_Cxx.am @@ -49,14 +49,19 @@ dist_installed_evascxxmainheaders_DATA = lib/evas/Evas.hh nodist_installed_evascxxmainheaders_DATA = lib/evas/Evas.eo.hh installed_evascxxcanvasheadersdir = $(includedir)/evas-cxx-@VMAJ@/canvas -nodist_installed_evascxxcanvasheaders_DATA = $(evas_eolian_cxx_hh) $(evas_eolian_cxx_impl_hh) +nodist_installed_evascxxcanvasheaders_DATA = $(evas_canvas_eolian_cxx_hh) $(evas_canvas_eolian_cxx_impl_hh) -lib/evas/Evas.eo.hh: $(evas_eolian_pub_files) $(_EOLIAN_CXX_DEP) +installed_evascxxgestureheadersdir = $(includedir)/evas-cxx-@VMAJ@/gesture +nodist_installed_evascxxgestureheaders_DATA = $(evas_gesture_eolian_cxx_hh) $(evas_gesture_eolian_cxx_impl_hh) + +lib/evas/Evas.eo.hh: $(evas_canvas_eolian_pub_files) $(evas_gesture_eolian_pub_files) $(_EOLIAN_CXX_DEP) $(AM_V_EOLCXX) \ $(MKDIR_P) $(dir $@); \ $(EOLIAN_CXX) $(EOLIAN_FLAGS) -m -o $@ $(filter %.eo, $^) -CLEANFILES += $(evas_eolian_cxx_hh) $(evas_eolian_cxx_impl_hh) lib/evas/Evas.eo.hh +CLEANFILES += $(evas_canvas_eolian_cxx_hh) $(evas_canvas_eolian_cxx_impl_hh) \ + $(evas_gesture_eolian_cxx_hh) $(evas_gesture_eolian_cxx_impl_hh) \ + lib/evas/Evas.eo.hh ### Eldbus C++ installed_eldbuscxxmainheadersdir = $(includedir)/eldbus_cxx-@VMAJ@ diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am index 48603e9a8f..1449507b50 100644 --- a/src/Makefile_Evas.am +++ b/src/Makefile_Evas.am @@ -2549,8 +2549,12 @@ GENERATED_JS_BINDINGS += $(generated_evas_js_bindings) endif if HAVE_CXX11 -evas_eolian_cxx_hh = $(evas_eolian_pub_files:%.eo=%.eo.hh) $(evas_eolian_legacy_files:%.eo=%.eo.hh) -evas_eolian_cxx_impl_hh = $(evas_eolian_pub_files:%.eo=%.eo.impl.hh) $(evas_eolian_legacy_files:%.eo=%.eo.impl.hh) +evas_canvas_eolian_cxx_hh = $(evas_canvas_eolian_pub_files:%.eo=%.eo.hh) \ + $(evas_eolian_legacy_files:%.eo=%.eo.hh) +evas_canvas_eolian_cxx_impl_hh = $(evas_canvas_eolian_pub_files:%.eo=%.eo.impl.hh) \ + $(evas_eolian_legacy_files:%.eo=%.eo.impl.hh) +evas_gesture_eolian_cxx_hh = $(evas_gesture_eolian_pub_files:%.eo=%.eo.hh) +evas_gesture_eolian_cxx_impl_hh = $(evas_gesture_eolian_pub_files:%.eo=%.eo.impl.hh) endif EXTRA_DIST2 += \