summaryrefslogtreecommitdiff
path: root/src/Makefile_Cxx.am
diff options
context:
space:
mode:
authorDaniel Kolesa <d.kolesa@osg.samsung.com>2017-10-19 20:11:49 +0200
committerDaniel Kolesa <d.kolesa@osg.samsung.com>2017-10-19 20:15:33 +0200
commit823edb94873c0d5bdd50118e861e68c82b25cf12 (patch)
tree3c5abcccf9bd4bb3eaf41996e3b4719eb9973e64 /src/Makefile_Cxx.am
parent867ad5000b4aa7bf91fb9300b2b4a2d4d0996568 (diff)
cxx build: update after the evas gesture build fix
The changes in f334f2a5042734218d599f189fda615db47be766 also need an update in the C++ build.
Diffstat (limited to 'src/Makefile_Cxx.am')
-rw-r--r--src/Makefile_Cxx.am11
1 files changed, 8 insertions, 3 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
49nodist_installed_evascxxmainheaders_DATA = lib/evas/Evas.eo.hh 49nodist_installed_evascxxmainheaders_DATA = lib/evas/Evas.eo.hh
50 50
51installed_evascxxcanvasheadersdir = $(includedir)/evas-cxx-@VMAJ@/canvas 51installed_evascxxcanvasheadersdir = $(includedir)/evas-cxx-@VMAJ@/canvas
52nodist_installed_evascxxcanvasheaders_DATA = $(evas_eolian_cxx_hh) $(evas_eolian_cxx_impl_hh) 52nodist_installed_evascxxcanvasheaders_DATA = $(evas_canvas_eolian_cxx_hh) $(evas_canvas_eolian_cxx_impl_hh)
53 53
54lib/evas/Evas.eo.hh: $(evas_eolian_pub_files) $(_EOLIAN_CXX_DEP) 54installed_evascxxgestureheadersdir = $(includedir)/evas-cxx-@VMAJ@/gesture
55nodist_installed_evascxxgestureheaders_DATA = $(evas_gesture_eolian_cxx_hh) $(evas_gesture_eolian_cxx_impl_hh)
56
57lib/evas/Evas.eo.hh: $(evas_canvas_eolian_pub_files) $(evas_gesture_eolian_pub_files) $(_EOLIAN_CXX_DEP)
55 $(AM_V_EOLCXX) \ 58 $(AM_V_EOLCXX) \
56 $(MKDIR_P) $(dir $@); \ 59 $(MKDIR_P) $(dir $@); \
57 $(EOLIAN_CXX) $(EOLIAN_FLAGS) -m -o $@ $(filter %.eo, $^) 60 $(EOLIAN_CXX) $(EOLIAN_FLAGS) -m -o $@ $(filter %.eo, $^)
58 61
59CLEANFILES += $(evas_eolian_cxx_hh) $(evas_eolian_cxx_impl_hh) lib/evas/Evas.eo.hh 62CLEANFILES += $(evas_canvas_eolian_cxx_hh) $(evas_canvas_eolian_cxx_impl_hh) \
63 $(evas_gesture_eolian_cxx_hh) $(evas_gesture_eolian_cxx_impl_hh) \
64 lib/evas/Evas.eo.hh
60 65
61### Eldbus C++ 66### Eldbus C++
62installed_eldbuscxxmainheadersdir = $(includedir)/eldbus_cxx-@VMAJ@ 67installed_eldbuscxxmainheadersdir = $(includedir)/eldbus_cxx-@VMAJ@