forked from enlightenment/efl
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:
parent
867ad5000b
commit
823edb9487
|
@ -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@
|
||||
|
|
|
@ -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 += \
|
||||
|
|
Loading…
Reference in New Issue