From 3717d0382dd73ae16602d86dc7e36e795b1b9df8 Mon Sep 17 00:00:00 2001 From: Lauro Moura Date: Mon, 15 Apr 2019 19:16:43 -0300 Subject: [PATCH] cxx: Fix eldbus meta include name Summary: It should not conflict with Eldbus_Model header Fixes T7805 Reviewers: vtorri Reviewed By: vtorri Subscribers: cedric, #reviewers, #committers Tags: #efl Maniphest Tasks: T7805 Differential Revision: https://phab.enlightenment.org/D8611 --- src/Makefile_Cxx.am | 6 +++--- src/bindings/cxx/eldbus_cxx/Eldbus_Model.hh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Makefile_Cxx.am b/src/Makefile_Cxx.am index 6b0ebeb..1e5936d 100644 --- a/src/Makefile_Cxx.am +++ b/src/Makefile_Cxx.am @@ -107,7 +107,7 @@ nodist_installed_eocxxheaders_DATA = $(eo_eolian_cxx_hh) $(eo_eolian_cxx_impl_hh nodist_installed_eflcxxmainheaders_DATA = $(efl_eolian_cxx_hh) $(efl_eolian_cxx_impl_hh) lib/efl/Efl.eo.hh nodist_installed_elementarycxxmainheaders_DATA = $(elementary_eolian_cxx_hh) $(elementary_eolian_cxx_impl_hh) \ lib/elementary/Elementary.eo.hh -nodist_installed_eldbuscxxmainheaders_DATA = $(eldbus_eolian_cxx_hh) $(eldbus_eolian_cxx_impl_hh) lib/eldbus/Eldbus_Model.eo.hh +nodist_installed_eldbuscxxmainheaders_DATA = $(eldbus_eolian_cxx_hh) $(eldbus_eolian_cxx_impl_hh) lib/eldbus/Eldbus.eo.hh CLEANFILES += $(eo_eolian_cxx_hh) $(eo_eolian_cxx_impl_hh) @@ -148,12 +148,12 @@ CLEANFILES += $(evas_canvas_eolian_cxx_hh) $(evas_canvas_eolian_cxx_impl_hh) \ lib/evas/Evas.eo.hh -lib/eldbus/Eldbus_Model.eo.hh: $(eldbus_eolian_files) $(_EOLIAN_CXX_DEP) +lib/eldbus/Eldbus.eo.hh: $(eldbus_eolian_files) $(_EOLIAN_CXX_DEP) $(AM_V_EOLCXX) \ $(MKDIR_P) $(dir $@); \ $(EOLIAN_CXX) $(EOLIAN_FLAGS) -m -o $@ $(filter %.eo, $^) -CLEANFILES += $(eldbus_eolian_cxx_hh) $(eldbus_eolian_cxx_impl_hh) lib/eldbus/Eldbus_Model.eo.hh +CLEANFILES += $(eldbus_eolian_cxx_hh) $(eldbus_eolian_cxx_impl_hh) lib/eldbus/Eldbus.eo.hh ### Eet C++ diff --git a/src/bindings/cxx/eldbus_cxx/Eldbus_Model.hh b/src/bindings/cxx/eldbus_cxx/Eldbus_Model.hh index f2aa9e1..7d8bb27 100644 --- a/src/bindings/cxx/eldbus_cxx/Eldbus_Model.hh +++ b/src/bindings/cxx/eldbus_cxx/Eldbus_Model.hh @@ -5,7 +5,7 @@ #ifdef EFL_BETA_API_SUPPORT -#include +#include #endif #endif -- 2.7.4