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

cxx build: update after the evas gesture build fix 

The changes in f334f2a504 also need
an update in the C++ build.
This commit is contained in:
Daniel Kolesa 2017-10-19 20:11:49 +02:00
parent 867ad5000b
commit 823edb9487
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Makefile_Cxx.am
View File

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

8
src/Makefile_Evas.am
View File

@ -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 += \