summaryrefslogtreecommitdiff
path: root/src/Makefile_Cxx.am
diff options
context:
space:
mode:
authorFelipe Magno de Almeida <felipe@expertisesolutions.com.br>2016-10-12 14:53:46 +0900
committerFelipe Magno de Almeida <felipe@expertisesolutions.com.br>2016-10-13 17:56:11 +0900
commiteb1fd44dbbc96fce0cebd4f4fd1144e7e06e8ff2 (patch)
tree1536893df399db492cc828af8eec2e8eea35da9a /src/Makefile_Cxx.am
parentf63ede42818595ae7d92f7a4fe5f053d5c898cee (diff)
cxx: Fix Makefiles for C++ compilation and installation
Diffstat (limited to 'src/Makefile_Cxx.am')
-rw-r--r--src/Makefile_Cxx.am31
1 files changed, 16 insertions, 15 deletions
diff --git a/src/Makefile_Cxx.am b/src/Makefile_Cxx.am
index 442d4fda3f..52bdb760ac 100644
--- a/src/Makefile_Cxx.am
+++ b/src/Makefile_Cxx.am
@@ -4,7 +4,7 @@ if HAVE_CXX11
4CLEANFILES += $(eo_eolian_cxx_hh) $(eo_eolian_cxx_impl_hh) 4CLEANFILES += $(eo_eolian_cxx_hh) $(eo_eolian_cxx_impl_hh)
5 5
6installed_eocxxheadersdir = $(includedir)/eo-cxx-@VMAJ@/ 6installed_eocxxheadersdir = $(includedir)/eo-cxx-@VMAJ@/
7nodist_installed_eocxxheaders_DATA = $(eo_eolian_cxx_hh) $(eo_eolian_cxx_impl) 7nodist_installed_eocxxheaders_DATA = $(eo_eolian_cxx_hh) $(eo_eolian_cxx_impl_hh)
8dist_installed_eocxxheaders_DATA = \ 8dist_installed_eocxxheaders_DATA = \
9bindings/cxx/eo_cxx/eo_concrete.hh \ 9bindings/cxx/eo_cxx/eo_concrete.hh \
10bindings/cxx/eo_cxx/eo_cxx_interop.hh \ 10bindings/cxx/eo_cxx/eo_cxx_interop.hh \
@@ -20,7 +20,7 @@ bindings/cxx/eo_cxx/eo_private.hh
20 20
21### Elementary C++ 21### Elementary C++
22installed_elementarycxxmainheadersdir = $(includedir)/elementary-cxx-@VMAJ@/ 22installed_elementarycxxmainheadersdir = $(includedir)/elementary-cxx-@VMAJ@/
23nodist_installed_elementarycxxmainheaders_DATA = $(elementary_eolian_cxx_hh) $(elementary_eolian_cxx_impl) \ 23nodist_installed_elementarycxxmainheaders_DATA = $(elementary_eolian_cxx_hh) $(elementary_eolian_cxx_impl_hh) \
24lib/elementary/Elementary.hh 24lib/elementary/Elementary.hh
25 25
26lib/elementary/Elementary.hh: $(elementary_eolian_cxx_hh) 26lib/elementary/Elementary.hh: $(elementary_eolian_cxx_hh)
@@ -46,11 +46,11 @@ lib/elementary/Elementary.hh: $(elementary_eolian_cxx_hh)
46 @for i in $(elementary_eolian_cxx_hh); do echo "#include <$$(basename $$i)>" >> $(top_builddir)/src/lib/elementary/Elementary.hh; done 46 @for i in $(elementary_eolian_cxx_hh); do echo "#include <$$(basename $$i)>" >> $(top_builddir)/src/lib/elementary/Elementary.hh; done
47 @echo @ECHO_E@ "#endif\n" >> $(top_builddir)/src/lib/elementary/Elementary.hh 47 @echo @ECHO_E@ "#endif\n" >> $(top_builddir)/src/lib/elementary/Elementary.hh
48 48
49CLEANFILES += $(elementary_eolian_cxx_hh) $(elementary_eolian_cxx_impl) lib/elementary/Elementary.hh 49CLEANFILES += $(elementary_eolian_cxx_hh) $(elementary_eolian_cxx_impl_hh) lib/elementary/Elementary.hh
50 50
51### Efl C++ 51### Efl C++
52installed_eflcxxmainheadersdir = $(includedir)/efl-cxx-@VMAJ@/ 52installed_eflcxxmainheadersdir = $(includedir)/efl-cxx-@VMAJ@/
53nodist_installed_eflcxxmainheaders_DATA = $(efl_eolian_cxx_hh) $(efl_eolian_cxx_impl) lib/efl/Efl.hh 53nodist_installed_eflcxxmainheaders_DATA = $(efl_eolian_cxx_hh) $(efl_eolian_cxx_impl_hh) lib/efl/Efl.hh
54 54
55lib/efl/Efl.hh: $(efl_eolian_cxx_hh) 55lib/efl/Efl.hh: $(efl_eolian_cxx_hh)
56 @echo @ECHO_E@ "#ifndef EFL_CXX_HH\n#define EFL_CXX_HH\n" > $(top_builddir)/src/lib/efl/Efl.hh 56 @echo @ECHO_E@ "#ifndef EFL_CXX_HH\n#define EFL_CXX_HH\n" > $(top_builddir)/src/lib/efl/Efl.hh
@@ -58,14 +58,14 @@ lib/efl/Efl.hh: $(efl_eolian_cxx_hh)
58 @for i in $(efl_eolian_cxx_hh); do echo "#include <$$(basename $$i)>" >> $(top_builddir)/src/lib/efl/Efl.hh; done 58 @for i in $(efl_eolian_cxx_hh); do echo "#include <$$(basename $$i)>" >> $(top_builddir)/src/lib/efl/Efl.hh; done
59 @echo @ECHO_E@ "#endif\n\n#endif\n" >> $(top_builddir)/src/lib/efl/Efl.hh 59 @echo @ECHO_E@ "#endif\n\n#endif\n" >> $(top_builddir)/src/lib/efl/Efl.hh
60 60
61CLEANFILES += $(efl_eolian_cxx_hh) $(efl_eolian_cxx_impl) lib/efl/Efl.hh 61CLEANFILES += $(efl_eolian_cxx_hh) $(efl_eolian_cxx_impl_hh) lib/efl/Efl.hh
62 62
63### Evas C++ 63### Evas C++
64installed_evascxxmainheadersdir = $(includedir)/evas-cxx-@VMAJ@/ 64installed_evascxxmainheadersdir = $(includedir)/evas-cxx-@VMAJ@/
65nodist_installed_evascxxmainheaders_DATA = lib/evas/Evas.hh 65nodist_installed_evascxxmainheaders_DATA = lib/evas/Evas.hh
66 66
67installed_evascxxcanvasheadersdir = $(includedir)/evas-cxx-@VMAJ@/canvas 67installed_evascxxcanvasheadersdir = $(includedir)/evas-cxx-@VMAJ@/canvas
68nodist_installed_evascxxcanvasheaders_DATA = $(evas_eolian_cxx_hh) $(evas_eolian_cxx_impl) 68nodist_installed_evascxxcanvasheaders_DATA = $(evas_eolian_cxx_hh) $(evas_eolian_cxx_impl_hh)
69 69
70lib/evas/Evas.hh: $(evas_eolian_cxx_hh) 70lib/evas/Evas.hh: $(evas_eolian_cxx_hh)
71 @echo @ECHO_E@ "#ifndef EFL_CXX_EVAS_HH\n#define EFL_CXX_EVAS_HH\n" > $(top_builddir)/src/lib/evas/Evas.hh 71 @echo @ECHO_E@ "#ifndef EFL_CXX_EVAS_HH\n#define EFL_CXX_EVAS_HH\n" > $(top_builddir)/src/lib/evas/Evas.hh
@@ -73,11 +73,11 @@ lib/evas/Evas.hh: $(evas_eolian_cxx_hh)
73 @for i in $(evas_eolian_cxx_hh); do echo "#include <canvas/$$(basename $$i)>" >> $(top_builddir)/src/lib/evas/Evas.hh; done 73 @for i in $(evas_eolian_cxx_hh); do echo "#include <canvas/$$(basename $$i)>" >> $(top_builddir)/src/lib/evas/Evas.hh; done
74 @echo @ECHO_E@ "#endif\n\n#endif\n" >> $(top_builddir)/src/lib/evas/Evas.hh 74 @echo @ECHO_E@ "#endif\n\n#endif\n" >> $(top_builddir)/src/lib/evas/Evas.hh
75 75
76CLEANFILES += $(evas_eolian_cxx_hh) $(evas_eolian_cxx_impl) lib/evas/Evas.hh 76CLEANFILES += $(evas_eolian_cxx_hh) $(evas_eolian_cxx_impl_hh) lib/evas/Evas.hh
77 77
78### Eldbus C++ 78### Eldbus C++
79installed_eldbuscxxmainheadersdir = $(includedir)/eldbus_cxx-@VMAJ@ 79installed_eldbuscxxmainheadersdir = $(includedir)/eldbus_cxx-@VMAJ@
80nodist_installed_eldbuscxxmainheaders_DATA = $(eldbus_eolian_cxx_hh) $(eldbus_eolian_cxx_impl) lib/eldbus/Eldbus_Model.hh 80nodist_installed_eldbuscxxmainheaders_DATA = $(eldbus_eolian_cxx_hh) $(eldbus_eolian_cxx_impl_hh) lib/eldbus/Eldbus_Model.hh
81dist_installed_eldbuscxxmainheaders_DATA = \ 81dist_installed_eldbuscxxmainheaders_DATA = \
82bindings/cxx/eldbus_cxx/eldbus_basic.hh \ 82bindings/cxx/eldbus_cxx/eldbus_basic.hh \
83bindings/cxx/eldbus_cxx/eldbus_error.hh \ 83bindings/cxx/eldbus_cxx/eldbus_error.hh \
@@ -98,7 +98,7 @@ lib/eldbus/Eldbus_Model.hh: $(eldbus_eolian_cxx_hh)
98 @for i in $(eldbus_eolian_cxx_hh); do echo "#include <$$(basename $$i)>" >> $(top_builddir)/src/lib/eldbus/Eldbus_Model.hh; done 98 @for i in $(eldbus_eolian_cxx_hh); do echo "#include <$$(basename $$i)>" >> $(top_builddir)/src/lib/eldbus/Eldbus_Model.hh; done
99 @echo @ECHO_E@ "#endif\n\n#endif\n" >> $(top_builddir)/src/lib/eldbus/Eldbus_Model.hh 99 @echo @ECHO_E@ "#endif\n\n#endif\n" >> $(top_builddir)/src/lib/eldbus/Eldbus_Model.hh
100 100
101CLEANFILES += $(eldbus_eolian_cxx_hh) $(eldbus_eolian_cxx_impl) lib/eldbus/Eldbus_Model.hh 101CLEANFILES += $(eldbus_eolian_cxx_hh) $(eldbus_eolian_cxx_impl_hh) lib/eldbus/Eldbus_Model.hh
102 102
103### Eet C++ 103### Eet C++
104installed_eetcxxheadersdir = $(includedir)/eet-cxx-@VMAJ@ 104installed_eetcxxheadersdir = $(includedir)/eet-cxx-@VMAJ@
@@ -110,7 +110,7 @@ bindings/cxx/eet_cxx/Eet.hh
110 110
111### Generated headers src/lib/edje 111### Generated headers src/lib/edje
112installed_edjecxxmainheadersdir = $(includedir)/edje-cxx-@VMAJ@/ 112installed_edjecxxmainheadersdir = $(includedir)/edje-cxx-@VMAJ@/
113nodist_installed_edjecxxmainheaders_DATA = $(edje_eolian_cxx_hh) $(edje_eolian_cxx_impl) lib/edje/Edje.hh 113nodist_installed_edjecxxmainheaders_DATA = $(edje_eolian_cxx_hh) $(edje_eolian_cxx_impl_hh) lib/edje/Edje.hh
114 114
115lib/edje/Edje.hh: $(edje_eolian_cxx_hh) 115lib/edje/Edje.hh: $(edje_eolian_cxx_hh)
116 @echo @ECHO_E@ "#ifndef EFL_CXX_EDJE_HH\n#define EFL_CXX_EDJE_HH\n" > $(top_builddir)/src/lib/edje/Edje.hh 116 @echo @ECHO_E@ "#ifndef EFL_CXX_EDJE_HH\n#define EFL_CXX_EDJE_HH\n" > $(top_builddir)/src/lib/edje/Edje.hh
@@ -118,14 +118,14 @@ lib/edje/Edje.hh: $(edje_eolian_cxx_hh)
118 @for i in $(edje_eolian_cxx_hh); do echo "#include <$$(basename $$i)>" >> $(top_builddir)/src/lib/edje/Edje.hh; done 118 @for i in $(edje_eolian_cxx_hh); do echo "#include <$$(basename $$i)>" >> $(top_builddir)/src/lib/edje/Edje.hh; done
119 @echo @ECHO_E@ "#endif\n\n#endif\n" >> $(top_builddir)/src/lib/edje/Edje.hh 119 @echo @ECHO_E@ "#endif\n\n#endif\n" >> $(top_builddir)/src/lib/edje/Edje.hh
120 120
121CLEANFILES += $(edje_eolian_cxx_hh) $(edje_eolian_cxx_impl) lib/edje/Edje.hh 121CLEANFILES += $(edje_eolian_cxx_hh) $(edje_eolian_cxx_impl_hh) lib/edje/Edje.hh
122 122
123### Ecore src/lib/ecore 123### Ecore src/lib/ecore
124installed_ecorecxxheadersdir = $(includedir)/ecore-cxx-@VMAJ@ 124installed_ecorecxxheadersdir = $(includedir)/ecore-cxx-@VMAJ@
125dist_installed_ecorecxxheaders_DATA = \ 125dist_installed_ecorecxxheaders_DATA = \
126bindings/cxx/ecore_cxx/Ecore.hh \ 126bindings/cxx/ecore_cxx/Ecore.hh \
127bindings/cxx/ecore_cxx/Ecore_Manual.hh 127bindings/cxx/ecore_cxx/Ecore_Manual.hh
128nodist_installed_ecorecxxheaders_DATA = $(ecore_eolian_cxx_hh) $(ecore_eolian_cxx_impl) \ 128nodist_installed_ecorecxxheaders_DATA = $(ecore_eolian_cxx_hh) $(ecore_eolian_cxx_impl_hh) \
129lib/ecore/Ecore.eo.hh 129lib/ecore/Ecore.eo.hh
130 130
131lib/ecore/Ecore.eo.hh: $(ecore_eolian_cxx_hh) 131lib/ecore/Ecore.eo.hh: $(ecore_eolian_cxx_hh)
@@ -134,12 +134,13 @@ lib/ecore/Ecore.eo.hh: $(ecore_eolian_cxx_hh)
134 @for i in $(ecore_eolian_cxx_hh); do echo "#include <$$(basename $$i)>" >> $(top_builddir)/src/lib/ecore/Ecore.eo.hh; done 134 @for i in $(ecore_eolian_cxx_hh); do echo "#include <$$(basename $$i)>" >> $(top_builddir)/src/lib/ecore/Ecore.eo.hh; done
135 @echo @ECHO_E@ "#endif\n\n#endif\n" >> $(top_builddir)/src/lib/ecore/Ecore.eo.hh 135 @echo @ECHO_E@ "#endif\n\n#endif\n" >> $(top_builddir)/src/lib/ecore/Ecore.eo.hh
136 136
137CLEANFILES += $(ecore_eolian_cxx_hh) $(ecore_eolian_cxx_impl) lib/ecore/Ecore.eo.hh 137CLEANFILES += $(ecore_eolian_cxx_hh) $(ecore_eolian_cxx_impl_hh) lib/ecore/Ecore.eo.hh
138 138
139## Eina src/lib/eina 139## Eina src/lib/eina
140installed_einacxxheadersdir = $(includedir)/eina-cxx-@VMAJ@ 140installed_einacxxheadersdir = $(includedir)/eina-cxx-@VMAJ@
141dist_installed_einacxxheaders_DATA = \ 141dist_installed_einacxxheaders_DATA = \
142bindings/cxx/eina_cxx/eina_accessor.hh \ 142bindings/cxx/eina_cxx/eina_accessor.hh \
143bindings/cxx/eina_cxx/eina_aligned_union.hh \
143bindings/cxx/eina_cxx/eina_array.hh \ 144bindings/cxx/eina_cxx/eina_array.hh \
144bindings/cxx/eina_cxx/eina_clone_allocators.hh \ 145bindings/cxx/eina_cxx/eina_clone_allocators.hh \
145bindings/cxx/eina_cxx/eina_deleter.hh \ 146bindings/cxx/eina_cxx/eina_deleter.hh \
@@ -178,7 +179,7 @@ bindings/cxx/eina_cxx/Eina.hh
178 179
179### Eio 180### Eio
180installed_eiocxxmainheadersdir = $(includedir)/eio-cxx-@VMAJ@/ 181installed_eiocxxmainheadersdir = $(includedir)/eio-cxx-@VMAJ@/
181nodist_installed_eiocxxmainheaders_DATA = $(eio_eolian_cxx_hh) $(eio_eolian_cxx_impl) lib/eio/Eio.hh 182nodist_installed_eiocxxmainheaders_DATA = $(eio_eolian_cxx_hh) $(eio_eolian_cxx_impl_hh) lib/eio/Eio.hh
182 183
183lib/eio/Eio.hh: $(eio_eolian_cxx_hh) 184lib/eio/Eio.hh: $(eio_eolian_cxx_hh)
184 @echo @ECHO_E@ "#ifndef EFL_CXX_EIO_HH\n#define EFL_CXX_EIO_HH\n" > $(top_builddir)/src/lib/eio/Eio.hh 185 @echo @ECHO_E@ "#ifndef EFL_CXX_EIO_HH\n#define EFL_CXX_EIO_HH\n" > $(top_builddir)/src/lib/eio/Eio.hh
@@ -186,7 +187,7 @@ lib/eio/Eio.hh: $(eio_eolian_cxx_hh)
186 @for i in $(eio_eolian_cxx_hh); do echo "#include <$$(basename $$i)>" >> $(top_builddir)/src/lib/eio/Eio.hh; done 187 @for i in $(eio_eolian_cxx_hh); do echo "#include <$$(basename $$i)>" >> $(top_builddir)/src/lib/eio/Eio.hh; done
187 @echo @ECHO_E@ "#endif\n\n#endif\n" >> $(top_builddir)/src/lib/eio/Eio.hh 188 @echo @ECHO_E@ "#endif\n\n#endif\n" >> $(top_builddir)/src/lib/eio/Eio.hh
188 189
189CLEANFILES += $(eio_eolian_cxx_hh) $(eio_eolian_cxx_impl) lib/eio/Eio.hh 190CLEANFILES += $(eio_eolian_cxx_hh) $(eio_eolian_cxx_impl_hh) lib/eio/Eio.hh
190 191
191### Tests 192### Tests
192 193