summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Magno de Almeida <felipe@expertisesolutions.com.br>2014-05-04 12:19:39 +0200
committerCedric Bail <cedric.bail@free.fr>2014-05-04 12:21:30 +0200
commit814982389759069625f4fb0c460436a8f4d894c6 (patch)
tree3ff7ddf4880bc1ec21d65f9369e0024047a782e7
parent05963f40523c952470cce5ab5aac582cca1d4d32 (diff)
eolian-cxx: fix make distcheck and automake files for Eolian C++
Summary: Fixed distcheck for Eolian C++. Made the generated files as nodist so it doesn't get picked up for generation way too early. Reviewers: cedric, seoz CC: cedric Maniphest Tasks: T1220 Differential Revision: https://phab.enlightenment.org/D820 Signed-off-by: Cedric Bail <cedric.bail@free.fr>
-rw-r--r--Makefile.am5
-rw-r--r--configure.ac86
-rw-r--r--m4/efl.m42
-rw-r--r--pc/.gitignore4
-rw-r--r--pc/ecore-audio-cxx.pc.in12
-rw-r--r--pc/ecore-cxx.pc.in16
-rw-r--r--pc/edje-cxx.pc.in23
-rw-r--r--src/Makefile.am6
-rw-r--r--src/Makefile_Ecore_Audio_Cxx.am46
-rw-r--r--src/Makefile_Ecore_Cxx.am30
-rw-r--r--src/Makefile_Edje_Cxx.am31
-rw-r--r--src/Makefile_Eet_Cxx.am8
-rw-r--r--src/Makefile_Eina_Cxx.am6
-rw-r--r--src/Makefile_Eo_Cxx.am3
-rw-r--r--src/Makefile_Eolian_Cxx.am61
-rw-r--r--src/Makefile_Evas_Cxx.am37
-rw-r--r--src/bin/eolian_cxx/eolian_cxx.cc36
-rw-r--r--src/examples/evas/.gitignore1
-rw-r--r--src/examples/evas/Makefile.am15
19 files changed, 262 insertions, 166 deletions
diff --git a/Makefile.am b/Makefile.am
index 4bdb0775bc..d18778d750 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -126,8 +126,10 @@ pc/eo-cxx.pc \
126pc/eolian.pc \ 126pc/eolian.pc \
127pc/eolian-cxx.pc \ 127pc/eolian-cxx.pc \
128pc/eet.pc \ 128pc/eet.pc \
129pc/eet-cxx.pc \
129pc/evas.pc \ 130pc/evas.pc \
130pc/ecore.pc \ 131pc/ecore.pc \
132pc/ecore-cxx.pc \
131pc/ecore-con.pc \ 133pc/ecore-con.pc \
132pc/ecore-ipc.pc \ 134pc/ecore-ipc.pc \
133pc/ecore-file.pc \ 135pc/ecore-file.pc \
@@ -144,6 +146,7 @@ pc/efreet.pc \
144pc/efreet-mime.pc \ 146pc/efreet-mime.pc \
145pc/efreet-trash.pc \ 147pc/efreet-trash.pc \
146pc/edje.pc \ 148pc/edje.pc \
149pc/edje-cxx.pc \
147pc/emotion.pc \ 150pc/emotion.pc \
148pc/ethumb.pc \ 151pc/ethumb.pc \
149pc/ethumb_client.pc \ 152pc/ethumb_client.pc \
@@ -242,7 +245,7 @@ pkgconfig_DATA += pc/ephysics.pc
242endif 245endif
243 246
244if HAVE_ECORE_AUDIO 247if HAVE_ECORE_AUDIO
245pkgconfig_DATA += pc/ecore-audio.pc 248pkgconfig_DATA += pc/ecore-audio.pc pc/ecore-audio-cxx.pc
246endif 249endif
247 250
248# Cmake configs: 251# Cmake configs:
diff --git a/configure.ac b/configure.ac
index 40e297e4e9..777e8469fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -960,6 +960,9 @@ fi
960 960
961AM_CONDITIONAL([HAVE_CXX11], [test "x${have_cxx11}" -a "xyes"]) 961AM_CONDITIONAL([HAVE_CXX11], [test "x${have_cxx11}" -a "xyes"])
962 962
963EFL_INTERNAL_DEPEND_PKG([EINA_CXX], [Eina])
964EFL_EVAL_PKGS([EINA_CXX])
965
963EFL_LIB_END([Eina_Cxx]) 966EFL_LIB_END([Eina_Cxx])
964#### End of Eina CXX 967#### End of Eina CXX
965 968
@@ -1010,6 +1013,16 @@ EFL_EVAL_PKGS([EET])
1010EFL_LIB_END([Eet]) 1013EFL_LIB_END([Eet])
1011#### End of Eet 1014#### End of Eet
1012 1015
1016#### Eet CXX
1017EFL_LIB_START([Eet_Cxx])
1018
1019EFL_INTERNAL_DEPEND_PKG([EET_CXX], [Eina_Cxx])
1020EFL_INTERNAL_DEPEND_PKG([EET_CXX], [Eet])
1021
1022EFL_EVAL_PKGS([EET_CXX])
1023
1024EFL_LIB_END([Eet_Cxx])
1025#### End of Eet CXX
1013 1026
1014#### Eo 1027#### Eo
1015 1028
@@ -1050,6 +1063,14 @@ AM_CONDITIONAL([EO_BUILD_EXAMPLE_EVAS], [test "x${have_elm}" = "xyes"])
1050EFL_LIB_END([Eo]) 1063EFL_LIB_END([Eo])
1051#### End of Eo 1064#### End of Eo
1052 1065
1066#### Eo CXX
1067EFL_LIB_START([Eo_Cxx])
1068
1069EFL_EVAL_PKGS([EO_CXX])
1070
1071EFL_LIB_END([Eo_Cxx])
1072#### End of Eo CXX
1073
1053#### Eolian 1074#### Eolian
1054 1075
1055EFL_LIB_START([Eolian]) 1076EFL_LIB_START([Eolian])
@@ -1084,6 +1105,33 @@ EFL_INTERNAL_DEPEND_PKG([EOLIAN], [eina])
1084EFL_LIB_END([Eolian]) 1105EFL_LIB_END([Eolian])
1085#### End of Eolian 1106#### End of Eolian
1086 1107
1108EFL_LIB_START([Eolian_Cxx])
1109### Default values
1110
1111### Additional options to configure
1112
1113### Checks for programs
1114
1115## Compatibility layers
1116
1117### Checks for libraries
1118EFL_INTERNAL_DEPEND_PKG([EOLIAN], [eina])
1119EFL_INTERNAL_DEPEND_PKG([EOLIAN], [eo])
1120
1121### Checks for header files
1122
1123### Checks for types
1124
1125### Checks for structures
1126
1127### Checks for compiler characteristics
1128
1129### Checks for linker characteristics
1130
1131### Checks for library functions
1132
1133### Check availability
1134EFL_LIB_END([Eolian_Cxx])
1087 1135
1088#### Evas 1136#### Evas
1089 1137
@@ -1884,6 +1932,13 @@ EFL_ADD_FEATURE([EVAS], [dither-mask], [${build_evas_dither_mask}])
1884EFL_LIB_END([Evas]) 1932EFL_LIB_END([Evas])
1885#### End of Evas 1933#### End of Evas
1886 1934
1935#### Edje CXX
1936EFL_LIB_START([Evas_Cxx])
1937
1938EFL_EVAL_PKGS([EVAS_CXX])
1939
1940EFL_LIB_END([Evas_Cxx])
1941#### End of Edje CXX
1887 1942
1888#### Embryo 1943#### Embryo
1889 1944
@@ -2198,6 +2253,18 @@ fi
2198EFL_LIB_END([Ecore]) 2253EFL_LIB_END([Ecore])
2199#### End of Ecore 2254#### End of Ecore
2200 2255
2256#### Ecore CXX
2257EFL_LIB_START([Ecore_Cxx])
2258
2259EFL_INTERNAL_DEPEND_PKG([ECORE_CXX], [Eina_Cxx])
2260EFL_INTERNAL_DEPEND_PKG([ECORE_CXX], [Ecore])
2261EFL_INTERNAL_DEPEND_PKG([ECORE_CXX], [Eina])
2262EFL_INTERNAL_DEPEND_PKG([ECORE_CXX], [Eo])
2263
2264EFL_EVAL_PKGS([ECORE_CXX])
2265
2266EFL_LIB_END([Ecore_Cxx])
2267#### End of Ecore CXX
2201 2268
2202#### Ecore_Con 2269#### Ecore_Con
2203 2270
@@ -2769,6 +2836,14 @@ AM_CONDITIONAL([HAVE_ECORE_AUDIO_SNDFILE], [test "x${want_sndfile}" = "xyes"])
2769 2836
2770#### End of Ecore_Audio 2837#### End of Ecore_Audio
2771 2838
2839#### Ecore Audio CXX
2840EFL_LIB_START([Ecore_Audio_Cxx])
2841
2842EFL_EVAL_PKGS([ECORE_AUDIO_CXX])
2843
2844EFL_LIB_END([Ecore_Audio_Cxx])
2845#### End of Ecore Audio CXX
2846
2772#### Ecore_Win32 2847#### Ecore_Win32
2773EFL_LIB_START_OPTIONAL([Ecore_Win32], [test "${have_win32}" = "yes"]) 2848EFL_LIB_START_OPTIONAL([Ecore_Win32], [test "${have_win32}" = "yes"])
2774 2849
@@ -3882,6 +3957,14 @@ sys/wait.h \
3882EFL_LIB_END([Edje]) 3957EFL_LIB_END([Edje])
3883#### End of Edje 3958#### End of Edje
3884 3959
3960#### Edje CXX
3961EFL_LIB_START([Edje_Cxx])
3962
3963EFL_EVAL_PKGS([EDJE_CXX])
3964
3965EFL_LIB_END([Edje_Cxx])
3966#### End of Edje CXX
3967
3885#### Emotion 3968#### Emotion
3886EFL_LIB_START([Emotion]) 3969EFL_LIB_START([Emotion])
3887 3970
@@ -4142,6 +4225,7 @@ pc/evas-drm.pc
4142pc/evas.pc 4225pc/evas.pc
4143pc/evas-cxx.pc 4226pc/evas-cxx.pc
4144pc/ecore.pc 4227pc/ecore.pc
4228pc/ecore-cxx.pc
4145pc/ecore-con.pc 4229pc/ecore-con.pc
4146pc/ecore-ipc.pc 4230pc/ecore-ipc.pc
4147pc/ecore-file.pc 4231pc/ecore-file.pc
@@ -4160,6 +4244,7 @@ pc/ecore-evas.pc
4160pc/ecore-imf.pc 4244pc/ecore-imf.pc
4161pc/ecore-imf-evas.pc 4245pc/ecore-imf-evas.pc
4162pc/ecore-audio.pc 4246pc/ecore-audio.pc
4247pc/ecore-audio-cxx.pc
4163pc/ecore-avahi.pc 4248pc/ecore-avahi.pc
4164pc/embryo.pc 4249pc/embryo.pc
4165pc/eio.pc 4250pc/eio.pc
@@ -4170,6 +4255,7 @@ pc/efreet-trash.pc
4170pc/eeze.pc 4255pc/eeze.pc
4171pc/ephysics.pc 4256pc/ephysics.pc
4172pc/edje.pc 4257pc/edje.pc
4258pc/edje-cxx.pc
4173pc/emotion.pc 4259pc/emotion.pc
4174pc/ethumb.pc 4260pc/ethumb.pc
4175pc/ethumb_client.pc 4261pc/ethumb_client.pc
diff --git a/m4/efl.m4 b/m4/efl.m4
index 5c75ab3a89..b820b0f430 100644
--- a/m4/efl.m4
+++ b/m4/efl.m4
@@ -366,7 +366,7 @@ m4_defn([UP])_LIBS=" ${m4_defn([UP])_LDFLAGS} ${EFL_COV_LIBS} ${EFL_LIBS} ${m4_d
366m4_defn([UP])_INTERNAL_LIBS="${m4_defn([UP])_INTERNAL_LIBS} ${requirements_internal_libs_[]m4_defn([DOWN])}" 366m4_defn([UP])_INTERNAL_LIBS="${m4_defn([UP])_INTERNAL_LIBS} ${requirements_internal_libs_[]m4_defn([DOWN])}"
367USE_[]m4_defn([UP])_LIBS="${m4_defn([UP])_LIBS} lib/${libdirname}/lib${libname}.la" 367USE_[]m4_defn([UP])_LIBS="${m4_defn([UP])_LIBS} lib/${libdirname}/lib${libname}.la"
368USE_[]m4_defn([UP])_INTERNAL_LIBS="${m4_defn([UP])_INTERNAL_LIBS} lib/${libdirname}/lib${libname}.la" 368USE_[]m4_defn([UP])_INTERNAL_LIBS="${m4_defn([UP])_INTERNAL_LIBS} lib/${libdirname}/lib${libname}.la"
369m4_defn([UP])_CFLAGS="${EFL_COV_CFLAGS} ${EFL_CFLAGS} ${m4_defn([UP])_CFLAGS} -I\$(top_srcdir)/src/lib/${libdirname} -I\$(top_builddir)/src/lib/${libdirname} ${requirements_cflags_[]m4_defn([DOWN])} ${requirements_cflags_efl} -DEFL_[]m4_defn([UP])_BUILD=1" 369m4_defn([UP])_CFLAGS="${EFL_COV_CFLAGS} ${EFL_CFLAGS} ${m4_defn([UP])_CFLAGS} -I\$(top_srcdir)/src/lib/${libdirname} -I\$(top_builddir)/src/lib/${libdirname} -I\$(top_srcdir)/src/bindings/${libdirname} -I\$(top_builddir)/src/bindings/${libdirname} ${requirements_cflags_[]m4_defn([DOWN])} ${requirements_cflags_efl} -DEFL_[]m4_defn([UP])_BUILD=1"
370requirements_pc_[]m4_defn([DOWN])="${requirements_pc_[]m4_defn([DOWN])} ${requirements_pc_efl}" 370requirements_pc_[]m4_defn([DOWN])="${requirements_pc_[]m4_defn([DOWN])} ${requirements_pc_efl}"
371requirements_pc_deps_[]m4_defn([DOWN])="${requirements_pc_deps_[]m4_defn([DOWN])} ${requirements_pc_deps_efl}" 371requirements_pc_deps_[]m4_defn([DOWN])="${requirements_pc_deps_[]m4_defn([DOWN])} ${requirements_pc_deps_efl}"
372 372
diff --git a/pc/.gitignore b/pc/.gitignore
index f872dd524e..911d9a9f2d 100644
--- a/pc/.gitignore
+++ b/pc/.gitignore
@@ -55,4 +55,6 @@
55/eolian-cxx.pc 55/eolian-cxx.pc
56/eo-cxx.pc 56/eo-cxx.pc
57/evas-cxx.pc 57/evas-cxx.pc
58/ecore-audio-cxx.pc.in 58/ecore-cxx.pc
59/edje-cxx.pc
60/ecore-audio-cxx.pc
diff --git a/pc/ecore-audio-cxx.pc.in b/pc/ecore-audio-cxx.pc.in
new file mode 100644
index 0000000000..6e40f21c7b
--- /dev/null
+++ b/pc/ecore-audio-cxx.pc.in
@@ -0,0 +1,12 @@
1prefix=@prefix@
2exec_prefix=@exec_prefix@
3libdir=@libdir@
4includedir=@includedir@
5
6Name: ecore-audio-cxx
7Description: E core library, audio module C++ API
8Requires.private: @requirements_pc_ecore_audio@
9Version: @VERSION@
10Libs: -L${libdir} -lecore_audio
11Libs.private: @requirements_libs_ecore_audio@
12Cflags: -I${includedir}/efl-@VMAJ@ -I${includedir}/efl-@VMAJ@ -I${includedir}/ecore-audio-@VMAJ@ -I${includedir}/ecore-audio-cxx-@VMAJ@
diff --git a/pc/ecore-cxx.pc.in b/pc/ecore-cxx.pc.in
new file mode 100644
index 0000000000..3951447d70
--- /dev/null
+++ b/pc/ecore-cxx.pc.in
@@ -0,0 +1,16 @@
1prefix=@prefix@
2exec_prefix=@exec_prefix@
3libdir=@libdir@
4includedir=@includedir@
5modules=@libdir@/ecore
6module_arch=@MODULE_ARCH@
7eoincludedir=@datarootdir@/eolian/include
8eolian_flags=-I${eoincludedir}/ecore-@VMAJ@
9
10Name: ecore C++ API
11Description: Ecore event abstraction library C++ API
12Requires.private: @requirements_pc_ecore@
13Version: @VERSION@
14Libs: -L${libdir} -lecore
15Libs.private: @requirements_libs_ecore@
16Cflags: -I${includedir}/efl-@VMAJ@ -I${includedir}/ecore-@VMAJ@ -I${includedir}/ecore-cxx-@VMAJ@
diff --git a/pc/edje-cxx.pc.in b/pc/edje-cxx.pc.in
new file mode 100644
index 0000000000..45e47c4c7b
--- /dev/null
+++ b/pc/edje-cxx.pc.in
@@ -0,0 +1,23 @@
1prefix=@prefix@
2exec_prefix=@exec_prefix@
3libdir=@libdir@
4modules=@libdir@/edje/modules
5module_arch=@MODULE_ARCH@
6includedir=@includedir@
7datarootdir=@datarootdir@
8datadir=@datadir@/edje
9vmaj=@VMAJ@
10vmin=@VMIN@
11vmic=@VMIC@
12multisense=@want_multisense@
13physics=@want_physics@
14eoincludedir=@datarootdir@/eolian/include
15eolian_flags=-I${eoincludedir}/edje-@VMAJ@
16
17Name: edje C++ API
18Description: Enlightened graphical design and layout engine C++ API.
19Requires.private: @requirements_pc_edje@
20Version: @VERSION@
21Libs: -L${libdir} -ledje
22Libs.private: @requirements_libs_edje@
23Cflags: -I${includedir}/efl-@VMAJ@ -I${includedir}/edje-@VMAJ@ -I${includedir}/edje-cxx-@VMAJ@
diff --git a/src/Makefile.am b/src/Makefile.am
index 2e9a133900..a4d0a69232 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -33,7 +33,6 @@ include Makefile_Escape.am
33include Makefile_Eina.am 33include Makefile_Eina.am
34include Makefile_Eo.am 34include Makefile_Eo.am
35include Makefile_Eet.am 35include Makefile_Eet.am
36include Makefile_Eet_Cxx.am
37include Makefile_Eolian.am 36include Makefile_Eolian.am
38include Makefile_Evas.am 37include Makefile_Evas.am
39include Makefile_Ecore.am 38include Makefile_Ecore.am
@@ -58,7 +57,6 @@ include Makefile_Ecore_Evas.am
58include Makefile_Ecore_Audio.am 57include Makefile_Ecore_Audio.am
59include Makefile_Ecore_Audio_Cxx.am 58include Makefile_Ecore_Audio_Cxx.am
60include Makefile_Ecore_Avahi.am 59include Makefile_Ecore_Avahi.am
61include Makefile_Evas_Cxx.am
62include Makefile_Embryo.am 60include Makefile_Embryo.am
63include Makefile_Eio.am 61include Makefile_Eio.am
64include Makefile_Eldbus.am 62include Makefile_Eldbus.am
@@ -70,10 +68,12 @@ include Makefile_Emotion.am
70include Makefile_Ethumb.am 68include Makefile_Ethumb.am
71include Makefile_Ethumb_Client.am 69include Makefile_Ethumb_Client.am
72 70
73include Makefile_Eolian_Cxx.am
74include Makefile_Eina_Cxx.am 71include Makefile_Eina_Cxx.am
72include Makefile_Eolian_Cxx.am
73include Makefile_Eet_Cxx.am
75include Makefile_Eo_Cxx.am 74include Makefile_Eo_Cxx.am
76include Makefile_Edje_Cxx.am 75include Makefile_Edje_Cxx.am
76include Makefile_Evas_Cxx.am
77 77
78.PHONY: benchmark examples 78.PHONY: benchmark examples
79 79
diff --git a/src/Makefile_Ecore_Audio_Cxx.am b/src/Makefile_Ecore_Audio_Cxx.am
index edf23a9500..94ebc43b75 100644
--- a/src/Makefile_Ecore_Audio_Cxx.am
+++ b/src/Makefile_Ecore_Audio_Cxx.am
@@ -3,7 +3,8 @@ if HAVE_CXX11
3 3
4### Generated headers 4### Generated headers
5 5
6generated_ecore_audio_cxx_bindings = \ 6generated_ecore_audio_cxx_bindings =
7#\
7lib/ecore_audio/ecore_audio.eo.hh \ 8lib/ecore_audio/ecore_audio.eo.hh \
8lib/ecore_audio/ecore_audio_in.eo.hh \ 9lib/ecore_audio/ecore_audio_in.eo.hh \
9lib/ecore_audio/ecore_audio_out.eo.hh \ 10lib/ecore_audio/ecore_audio_out.eo.hh \
@@ -12,7 +13,7 @@ lib/ecore_audio/ecore_audio_out_sndfile.eo.hh \
12lib/ecore_audio/ecore_audio_out_pulse.eo.hh \ 13lib/ecore_audio/ecore_audio_out_pulse.eo.hh \
13lib/ecore_audio/ecore_audio_in_tone.eo.hh 14lib/ecore_audio/ecore_audio_in_tone.eo.hh
14 15
15BUILT_SOURCES += \ 16#BUILT_SOURCES += \
16lib/ecore_audio/Ecore_Audio.hh \ 17lib/ecore_audio/Ecore_Audio.hh \
17$(generated_ecore_audio_cxx_bindings) 18$(generated_ecore_audio_cxx_bindings)
18 19
@@ -23,36 +24,27 @@ lib/ecore_audio/Ecore_Audio.hh:
23 @echo -e "#endif\n\n#endif\n" >> $(top_builddir)/src/lib/ecore_audio/Ecore_Audio.hh 24 @echo -e "#endif\n\n#endif\n" >> $(top_builddir)/src/lib/ecore_audio/Ecore_Audio.hh
24 25
25installed_ecoreaudiocxxmainheadersdir = $(includedir)/ecore-audio-cxx-@VMAJ@ 26installed_ecoreaudiocxxmainheadersdir = $(includedir)/ecore-audio-cxx-@VMAJ@
26dist_installed_ecoreaudiocxxmainheaders_DATA = \ 27#dist_installed_ecoreaudiocxxmainheaders_DATA = \
27lib/ecore_audio/Ecore_Audio.hh \ 28lib/ecore_audio/Ecore_Audio.hh \
28$(generated_ecore_audio_cxx_bindings) 29$(generated_ecore_audio_cxx_bindings)
29 30
30### Unit tests 31### Unit tests
31 32
32if EFL_ENABLE_TESTS 33# if EFL_ENABLE_TESTS
33
34check_PROGRAMS += tests/ecore_audio_cxx/cxx_compile_test
35TESTS += tests/ecore_audio_cxx/cxx_compile_test
36
37tests_ecore_audio_cxx_cxx_compile_test_SOURCES = tests/ecore_audio_cxx/cxx_compile_test.cc
38tests_ecore_audio_cxx_cxx_compile_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl -I$(top_builddir)/src/lib/efl \
39-I$(top_srcdir)/src/lib/ecore_audio \
40-I$(top_builddir)/src/lib/ecore_audio \
41-I$(top_srcdir)/src/lib/ecore \
42-I$(top_builddir)/src/lib/ecore \
43-I$(top_srcdir)/src/lib/eo \
44-I$(top_builddir)/src/lib/eo \
45-I$(top_srcdir)/src/bindings/eo_cxx \
46-I$(top_builddir)/src/bindings/eo_cxx \
47-I$(top_srcdir)/src/bindings/ecore_cxx \
48-I$(top_builddir)/src/bindings/ecore_cxx \
49-I$(top_srcdir)/src/bindings/eina_cxx \
50-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/ecore_audio_cxx\" \
51-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/ecore_audio_cxx\" \
52@CHECK_CFLAGS@ @ECORE_CFLAGS@ @EINA_CFLAGS@
53tests_ecore_audio_cxx_cxx_compile_test_LDADD = @CHECK_LIBS@ @USE_ECORE_LIBS@
54tests_ecore_audio_cxx_cxx_compile_test_DEPENDENCIES = @USE_ECORE_INTERNAL_LIBS@
55 34
56endif 35# check_PROGRAMS += tests/ecore_audio_cxx/cxx_compile_test
36# TESTS += tests/ecore_audio_cxx/cxx_compile_test
37
38# tests_ecore_audio_cxx_cxx_compile_test_SOURCES = tests/ecore_audio_cxx/cxx_compile_test.cc
39# tests_ecore_audio_cxx_cxx_compile_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl -I$(top_builddir)/src/lib/efl \
40# -DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/ecore_audio_cxx\" \
41# -DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/ecore_audio_cxx\" \
42# @CHECK_CFLAGS@ @ECORE_CFLAGS@ @EINA_CFLAGS@ @EO_CFLAGS@ @ECORE_AUDIO_CFLAGS@ \
43# @ECORE_CXX_CFLAGS@ @EINA_CXX_CFLAGS@ @EO_CXX_CFLAGS@ @ECORE_AUDIO_CXX_CFLAGS@
44
45# tests_ecore_audio_cxx_cxx_compile_test_LDADD = @CHECK_LIBS@ @USE_ECORE_LIBS@
46# tests_ecore_audio_cxx_cxx_compile_test_DEPENDENCIES = @USE_ECORE_INTERNAL_LIBS@
47
48# endif
57 49
58endif 50endif
diff --git a/src/Makefile_Ecore_Cxx.am b/src/Makefile_Ecore_Cxx.am
index ec2b64a4c2..63f3cfc552 100644
--- a/src/Makefile_Ecore_Cxx.am
+++ b/src/Makefile_Ecore_Cxx.am
@@ -14,12 +14,10 @@ lib/ecore/ecore_idle_exiter.eo.hh \
14lib/ecore/ecore_animator.eo.hh \ 14lib/ecore/ecore_animator.eo.hh \
15lib/ecore/ecore_parent.eo.hh 15lib/ecore/ecore_parent.eo.hh
16 16
17BUILT_SOURCES += \ 17BUILT_SOURCES += lib/ecore/Ecore.eo.hh $(generated_ecore_cxx_bindings)
18lib/ecore/Ecore.eo.hh \
19$(generated_ecore_cxx_bindings)
20 18
21installed_ecorecxxheadersdir = $(includedir)/ecore-cxx-@VMAJ@ 19installed_ecorecxxheadersdir = $(includedir)/ecore-cxx-@VMAJ@
22dist_installed_ecorecxxheaders_DATA = \ 20nodist_installed_ecorecxxheaders_DATA = \
23lib/ecore/Ecore.eo.hh \ 21lib/ecore/Ecore.eo.hh \
24$(generated_ecore_cxx_bindings) 22$(generated_ecore_cxx_bindings)
25 23
@@ -44,29 +42,21 @@ tests/ecore_cxx/ecore_cxx_suite.cc \
44tests/ecore_cxx/ecore_cxx_test_safe_call.cc 42tests/ecore_cxx/ecore_cxx_test_safe_call.cc
45 43
46tests_ecore_cxx_ecore_cxx_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ 44tests_ecore_cxx_ecore_cxx_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
47-I$(top_srcdir)/src/bindings/ecore_cxx \
48-I$(top_srcdir)/src/bindings/eina_cxx \
49-I$(top_srcdir)/src/bindings/eo_cxx \
50-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/ecore_cxx\" \ 45-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/ecore_cxx\" \
51-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/ecore_cxx\" \ 46-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/ecore_cxx\" \
52@CHECK_CFLAGS@ \ 47@CHECK_CFLAGS@ @ECORE_CXX_CFLAGS@ @EINA_CXX_CFLAGS@ @EINA_CFLAGS@ \
53@ECORE_CFLAGS@ \ 48@ECORE_CFLAGS@ @EO_CFLAGS@ @EO_CXX_CFLAGS@
54@EINA_CFLAGS@
55 49
56tests_ecore_cxx_ecore_cxx_suite_LDADD = \ 50tests_ecore_cxx_ecore_cxx_suite_LDADD = @CHECK_LIBS@ @USE_ECORE_LIBS@
57@CHECK_LIBS@ \ 51tests_ecore_cxx_ecore_cxx_suite_DEPENDENCIES = @USE_ECORE_INTERNAL_LIBS@
58@USE_ECORE_LIBS@
59tests_ecore_cxx_ecore_cxx_suite_DEPENDENCIES = \
60@USE_ECORE_INTERNAL_LIBS@
61 52
62tests_ecore_cxx_cxx_compile_test_SOURCES = tests/ecore_cxx/cxx_compile_test.cc 53tests_ecore_cxx_cxx_compile_test_SOURCES = tests/ecore_cxx/cxx_compile_test.cc
63tests_ecore_cxx_cxx_compile_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl -I$(top_builddir)/src/lib/efl \ 54tests_ecore_cxx_cxx_compile_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
64-I$(top_srcdir)/src/bindings/ecore_cxx \
65-I$(top_srcdir)/src/bindings/eina_cxx \
66-I$(top_srcdir)/src/bindings/eo_cxx \
67-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/ecore_cxx\" \ 55-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/ecore_cxx\" \
68-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/ecore_cxx\" \ 56-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/ecore_cxx\" \
69@CHECK_CFLAGS@ @ECORE_CFLAGS@ @EINA_CFLAGS@ 57@CHECK_CFLAGS@ @ECORE_CXX_CFLAGS@ @EINA_CXX_CFLAGS@ @EINA_CFLAGS@ \
58@ECORE_CFLAGS@ @EO_CFLAGS@ @EO_CXX_CFLAGS@
59
70tests_ecore_cxx_cxx_compile_test_LDADD = @CHECK_LIBS@ @USE_ECORE_LIBS@ 60tests_ecore_cxx_cxx_compile_test_LDADD = @CHECK_LIBS@ @USE_ECORE_LIBS@
71tests_ecore_cxx_cxx_compile_test_DEPENDENCIES = @USE_ECORE_INTERNAL_LIBS@ 61tests_ecore_cxx_cxx_compile_test_DEPENDENCIES = @USE_ECORE_INTERNAL_LIBS@
72 62
diff --git a/src/Makefile_Edje_Cxx.am b/src/Makefile_Edje_Cxx.am
index 094855dbb7..91fc9b918f 100644
--- a/src/Makefile_Edje_Cxx.am
+++ b/src/Makefile_Edje_Cxx.am
@@ -11,13 +11,8 @@ BUILT_SOURCES += \
11lib/edje/Edje.hh \ 11lib/edje/Edje.hh \
12$(generated_edje_cxx_bindings) 12$(generated_edje_cxx_bindings)
13 13
14EXTRA_DIST += \
15lib/edje/Edje.hh \
16$(edje_cxx_bindngs)
17
18installed_edjecxxmainheadersdir = $(includedir)/edje-cxx-@VMAJ@/ 14installed_edjecxxmainheadersdir = $(includedir)/edje-cxx-@VMAJ@/
19 15nodist_installed_edjecxxmainheaders_DATA = \
20dist_installed_edjecxxmainheaders_DATA = \
21lib/edje/Edje.hh \ 16lib/edje/Edje.hh \
22$(generated_edje_cxx_bindings) 17$(generated_edje_cxx_bindings)
23 18
@@ -35,27 +30,13 @@ check_PROGRAMS += tests/edje_cxx/cxx_compile_test
35TESTS += tests/edje_cxx/cxx_compile_test 30TESTS += tests/edje_cxx/cxx_compile_test
36 31
37tests_edje_cxx_cxx_compile_test_SOURCES = tests/edje_cxx/cxx_compile_test.cc 32tests_edje_cxx_cxx_compile_test_SOURCES = tests/edje_cxx/cxx_compile_test.cc
38tests_edje_cxx_cxx_compile_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl -I$(top_builddir)/src/lib/efl \ 33tests_edje_cxx_cxx_compile_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
39-I$(top_srcdir)/src/lib/edje \
40-I$(top_builddir)/src/lib/edje \
41-I$(top_srcdir)/src/lib/evas \
42-I$(top_builddir)/src/lib/evas \
43-I$(top_srcdir)/src/lib/evas/canvas \
44-I$(top_builddir)/src/lib/evas/canvas \
45-I$(top_srcdir)/src/lib/ecore \
46-I$(top_builddir)/src/lib/ecore \
47-I$(top_srcdir)/src/lib/eo \
48-I$(top_builddir)/src/lib/eo \
49-I$(top_srcdir)/src/bindings/eo_cxx \
50-I$(top_builddir)/src/bindings/eo_cxx \
51-I$(top_srcdir)/src/bindings/ecore_cxx \
52-I$(top_builddir)/src/bindings/ecore_cxx \
53-I$(top_srcdir)/src/bindings/eina_cxx \
54-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/edje_cxx\" \ 34-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/edje_cxx\" \
55-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/edje_cxx\" \ 35-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/edje_cxx\" \
56@CHECK_CFLAGS@ @ECORE_CFLAGS@ @EINA_CFLAGS@ 36@CHECK_CFLAGS@ @ECORE_CXX_CFLAGS@ @EINA_CXX_CFLAGS@ @EDJE_CXX_CFLAGS@ @EO_CXX_CFLAGS@ \
57tests_edje_cxx_cxx_compile_test_LDADD = @CHECK_LIBS@ @USE_ECORE_LIBS@ 37@ECORE_CFLAGS@ @EINA_CFLAGS@ @EVAS_CFLAGS@ @EDJE_CFLAGS@ @EO_CFLAGS@
58tests_edje_cxx_cxx_compile_test_DEPENDENCIES = @USE_ECORE_INTERNAL_LIBS@ 38tests_edje_cxx_cxx_compile_test_LDADD = @CHECK_LIBS@ @USE_EDJE_LIBS@
39tests_edje_cxx_cxx_compile_test_DEPENDENCIES = @USE_EDJE_INTERNAL_LIBS@
59 40
60endif 41endif
61 42
diff --git a/src/Makefile_Eet_Cxx.am b/src/Makefile_Eet_Cxx.am
index 4686de6c4e..4d608f00c8 100644
--- a/src/Makefile_Eet_Cxx.am
+++ b/src/Makefile_Eet_Cxx.am
@@ -26,15 +26,11 @@ tests/eet_cxx/eet_cxx_test_descriptors.cc
26 26
27tests_eet_cxx_eet_cxx_suite_CPPFLAGS = \ 27tests_eet_cxx_eet_cxx_suite_CPPFLAGS = \
28-I$(top_builddir)/src/lib/efl \ 28-I$(top_builddir)/src/lib/efl \
29-I$(top_builddir)/src/bindings/eina_cxx \
30-I$(top_builddir)/src/bindings/eet_cxx \
31-I$(top_srcdir)/src/bindings/eina_cxx \
32-I$(top_srcdir)/src/bindings/eet_cxx \
33-DTESTS_WD=\"`pwd`\" \ 29-DTESTS_WD=\"`pwd`\" \
34-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eet_cxx\" \ 30-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eet_cxx\" \
31-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)/src/tests/eet_cxx\" \
35-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eet_cxx\" \ 32-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eet_cxx\" \
36@CHECK_CFLAGS@ \ 33@CHECK_CFLAGS@ @EET_CXX_CFLAGS@ @EINA_CXX_CFLAGS@ @EET_CFLAGS@ @EINA_CFLAGS@
37@EET_CFLAGS@
38tests_eet_cxx_eet_cxx_suite_LDADD = @CHECK_LIBS@ @USE_EET_LIBS@ 34tests_eet_cxx_eet_cxx_suite_LDADD = @CHECK_LIBS@ @USE_EET_LIBS@
39tests_eet_cxx_eet_cxx_suite_DEPENDENCIES = @USE_EET_INTERNAL_LIBS@ 35tests_eet_cxx_eet_cxx_suite_DEPENDENCIES = @USE_EET_INTERNAL_LIBS@
40 36
diff --git a/src/Makefile_Eina_Cxx.am b/src/Makefile_Eina_Cxx.am
index 1e3265612e..d9887c7420 100644
--- a/src/Makefile_Eina_Cxx.am
+++ b/src/Makefile_Eina_Cxx.am
@@ -50,14 +50,12 @@ tests/eina_cxx/eina_cxx_test_optional.cc \
50tests/eina_cxx/eina_cxx_test_value.cc 50tests/eina_cxx/eina_cxx_test_value.cc
51 51
52tests_eina_cxx_eina_cxx_suite_CXXFLAGS = -I$(top_builddir)/src/lib/efl \ 52tests_eina_cxx_eina_cxx_suite_CXXFLAGS = -I$(top_builddir)/src/lib/efl \
53-I$(top_builddir)/src/bindings/eina_cxx \
54-I$(top_srcdir)/src/bindings/eina_cxx \
55-DTESTS_WD=\"`pwd`\" \ 53-DTESTS_WD=\"`pwd`\" \
56-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eina_cxx\" \ 54-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eina_cxx\" \
57-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)/src/tests/eina_cxx\" \ 55-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)/src/tests/eina_cxx\" \
58-DTESTS_BUILD_DIR=PACKAGE_BUILD_DIR \ 56-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eina_cxx\" \
59@CHECK_CFLAGS@ \ 57@CHECK_CFLAGS@ \
60@EINA_CFLAGS@ 58@EINA_CXX_CFLAGS@
61tests_eina_cxx_eina_cxx_suite_LDADD = @CHECK_LIBS@ @USE_EINA_LIBS@ 59tests_eina_cxx_eina_cxx_suite_LDADD = @CHECK_LIBS@ @USE_EINA_LIBS@
62tests_eina_cxx_eina_cxx_suite_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@ 60tests_eina_cxx_eina_cxx_suite_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@
63 61
diff --git a/src/Makefile_Eo_Cxx.am b/src/Makefile_Eo_Cxx.am
index d33c77c901..2574ca2834 100644
--- a/src/Makefile_Eo_Cxx.am
+++ b/src/Makefile_Eo_Cxx.am
@@ -13,4 +13,5 @@ bindings/eo_cxx/eo_wref.hh \
13bindings/eo_cxx/eo_inherit.hh \ 13bindings/eo_cxx/eo_inherit.hh \
14bindings/eo_cxx/eo_ops.hh \ 14bindings/eo_cxx/eo_ops.hh \
15bindings/eo_cxx/eo_private.hh \ 15bindings/eo_cxx/eo_private.hh \
16bindings/eo_cxx/eo_inherit_bindings.hh 16bindings/eo_cxx/eo_inherit_bindings.hh \
17bindings/eo_cxx/Eo.hh
diff --git a/src/Makefile_Eolian_Cxx.am b/src/Makefile_Eolian_Cxx.am
index 63e2b95149..47578a3c55 100644
--- a/src/Makefile_Eolian_Cxx.am
+++ b/src/Makefile_Eolian_Cxx.am
@@ -1,8 +1,28 @@
1 1
2### Library
3
4installed_eoliancxxmainheadersdir = $(includedir)/eolian-cxx-@VMAJ@/
5dist_installed_eoliancxxmainheaders_DATA = \
6lib/eolian_cxx/Eolian_Cxx.hh
7
8installed_eoliancxxheadersdir = $(includedir)/eolian-cxx-@VMAJ@/
9dist_installed_eoliancxxheaders_DATA = \
10lib/eolian_cxx/eo_generate.hh \
11lib/eolian_cxx/eo_types.hh \
12lib/eolian_cxx/eo_validate.hh \
13lib/eolian_cxx/grammar/comment.hh \
14lib/eolian_cxx/grammar/eo_class_constructors_generator.hh \
15lib/eolian_cxx/grammar/eo_class_events.generator.hh \
16lib/eolian_cxx/grammar/eo_class_functions_generator.hh \
17lib/eolian_cxx/grammar/eo_class_generator.hh \
18lib/eolian_cxx/grammar/eo_header_generator.hh \
19lib/eolian_cxx/grammar/inheritance_base_generator.hh \
20lib/eolian_cxx/grammar/parameters_generator.hh \
21lib/eolian_cxx/grammar/tab.hh
22
2### Binary 23### Binary
3 24
4bin_PROGRAMS += \ 25bin_PROGRAMS += bin/eolian_cxx/eolian_cxx
5 bin/eolian_cxx/eolian_cxx
6 26
7bin_eolian_cxx_eolian_cxx_SOURCES = \ 27bin_eolian_cxx_eolian_cxx_SOURCES = \
8 bin/eolian_cxx/comments.cc \ 28 bin/eolian_cxx/comments.cc \
@@ -13,40 +33,13 @@ bin_eolian_cxx_eolian_cxx_SOURCES = \
13 bin/eolian_cxx/safe_strings.hh \ 33 bin/eolian_cxx/safe_strings.hh \
14 bin/eolian_cxx/eolian_cxx.cc 34 bin/eolian_cxx/eolian_cxx.cc
15 35
16bin_eolian_cxx_eolian_cxx_CFLAGS = \ 36bin_eolian_cxx_eolian_cxx_CXXFLAGS = -I$(top_builddir)/src/lib/efl \
17 @EOLIAN_CFLAGS@ 37@CHECK_CFLAGS@ @EINA_CFLAGS@ @EINA_CXX_CFLAGS@ @EO_CFLAGS@ \
18 38@EOLIAN_CXX_CFLAGS@ @EOLIAN_CFLAGS@
19bin_eolian_cxx_eolian_cxx_CXXFLAGS = \
20 -I$(top_builddir)/src/lib/efl \
21 @EOLIAN_CFLAGS@ \
22 -I$(top_builddir)/src/lib/eo \
23 -I$(top_srcdir)/src/lib/eo \
24 -I$(top_builddir)/src/bindings/eina_cxx \
25 -I$(top_srcdir)/src/bindings/eina_cxx \
26 -I$(top_builddir)/src/lib/eolian_cxx \
27 -I$(top_srcdir)/src/lib/eolian_cxx
28 39
29bin_eolian_cxx_eolian_cxx_LDADD = \ 40bin_eolian_cxx_eolian_cxx_LDADD = @CHECK_LIBS@ @USE_EOLIAN_LIBS@
30 @USE_EOLIAN_LIBS@
31 41
32bin_eolian_cxx_eolian_cxx_DEPENDENCIES = \ 42bin_eolian_cxx_eolian_cxx_DEPENDENCIES = @USE_EOLIAN_INTERNAL_LIBS@
33 @USE_EOLIAN_INTERNAL_LIBS@
34 43
35include Makefile_Eolian_Cxx_Helper.am 44include Makefile_Eolian_Cxx_Helper.am
36 45
37CLEANFILES += $(BUILT_SOURCES)
38
39EXTRA_DIST += \
40 lib/eolian_cxx/Eolian_Cxx.hh \
41 lib/eolian_cxx/eo_generate.hh \
42 lib/eolian_cxx/eo_types.hh \
43 lib/eolian_cxx/eo_validate.hh \
44 lib/eolian_cxx/grammar/comment.hh \
45 lib/eolian_cxx/grammar/eo_class_constructors_generator.hh \
46 lib/eolian_cxx/grammar/eo_class_events.generator.hh \
47 lib/eolian_cxx/grammar/eo_class_functions_generator.hh \
48 lib/eolian_cxx/grammar/eo_class_generator.hh \
49 lib/eolian_cxx/grammar/eo_header_generator.hh \
50 lib/eolian_cxx/grammar/inheritance_base_generator.hh \
51 lib/eolian_cxx/grammar/parameters_generator.hh \
52 lib/eolian_cxx/grammar/tab.hh
diff --git a/src/Makefile_Evas_Cxx.am b/src/Makefile_Evas_Cxx.am
index 5938223a45..0ee8589ff2 100644
--- a/src/Makefile_Evas_Cxx.am
+++ b/src/Makefile_Evas_Cxx.am
@@ -29,11 +29,11 @@ lib/evas/canvas/evas_box.eo.hh
29 29
30BUILT_SOURCES += lib/evas/Evas.hh $(generated_evas_canvas_cxx_bindings) 30BUILT_SOURCES += lib/evas/Evas.hh $(generated_evas_canvas_cxx_bindings)
31 31
32installed_evascanvasmainheadersdir = $(includedir)/evas-cxx-@VMAJ@/ 32installed_evascxxmainheadersdir = $(includedir)/evas-cxx-@VMAJ@/
33dist_installed_evascanvasmainheaders_DATA = lib/evas/Evas.hh 33nodist_installed_evascxxmainheaders_DATA = lib/evas/Evas.hh
34 34
35installed_evascanvasmainheadersdir = $(includedir)/evas-cxx-@VMAJ@/canvas 35installed_evascxxcanvasheadersdir = $(includedir)/evas-cxx-@VMAJ@/canvas
36dist_installed_evascanvasmainheaders_DATA = $(generated_evas_canvas_cxx_bindings) 36nodist_installed_evascxxcanvasheaders_DATA = $(generated_evas_canvas_cxx_bindings)
37 37
38lib/evas/Evas.hh: 38lib/evas/Evas.hh:
39 @echo -e "#ifndef EFL_CXX_EVAS_HH\n#define EFL_CXX_EVAS_HH\n" > $(top_builddir)/src/lib/evas/Evas.hh 39 @echo -e "#ifndef EFL_CXX_EVAS_HH\n#define EFL_CXX_EVAS_HH\n" > $(top_builddir)/src/lib/evas/Evas.hh
@@ -49,28 +49,13 @@ check_PROGRAMS += tests/evas_cxx/cxx_compile_test
49TESTS += tests/evas_cxx/cxx_compile_test 49TESTS += tests/evas_cxx/cxx_compile_test
50 50
51tests_evas_cxx_cxx_compile_test_SOURCES = tests/evas_cxx/cxx_compile_test.cc 51tests_evas_cxx_cxx_compile_test_SOURCES = tests/evas_cxx/cxx_compile_test.cc
52tests_evas_cxx_cxx_compile_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl -I$(top_builddir)/src/lib/efl \ 52tests_evas_cxx_cxx_compile_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
53-I$(top_srcdir)/src/lib/edje \ 53 -DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/evas_cxx\" \
54-I$(top_builddir)/src/lib/edje \ 54 -DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/evas_cxx\" \
55-I$(top_srcdir)/src/lib/evas \ 55 @CHECK_CFLAGS@ @ECORE_CXX_CFLAGS@ @EINA_CXX_CFLAGS@ @EVAS_CXX_CFLAGS@ @EO_CXX_CFLAGS@ \
56-I$(top_builddir)/src/lib/evas \ 56 @ECORE_CFLAGS@ @EINA_CFLAGS@ @EVAS_CFLAGS@ @EO_CFLAGS@
57-I$(top_srcdir)/src/lib/evas/canvas \ 57tests_evas_cxx_cxx_compile_test_LDADD = @CHECK_LIBS@ @USE_EVAS_LIBS@
58-I$(top_builddir)/src/lib/evas/canvas \ 58tests_evas_cxx_cxx_compile_test_DEPENDENCIES = @USE_EVAS_INTERNAL_LIBS@
59-I$(top_srcdir)/src/lib/ecore \
60-I$(top_builddir)/src/lib/ecore \
61-I$(top_srcdir)/src/lib/eo \
62-I$(top_builddir)/src/lib/eo \
63-I$(top_srcdir)/src/bindings/eo_cxx \
64-I$(top_builddir)/src/bindings/eo_cxx \
65-I$(top_srcdir)/src/bindings/ecore_cxx \
66-I$(top_builddir)/src/bindings/ecore_cxx \
67-I$(top_srcdir)/src/bindings/eina_cxx \
68-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/evas_cxx\" \
69-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/evas_cxx\" \
70@CHECK_CFLAGS@ @ECORE_CFLAGS@ @EINA_CFLAGS@
71tests_evas_cxx_cxx_compile_test_LDADD = @CHECK_LIBS@ @USE_ECORE_LIBS@
72tests_evas_cxx_cxx_compile_test_DEPENDENCIES = @USE_ECORE_INTERNAL_LIBS@
73 59
74endif 60endif
75
76endif 61endif
diff --git a/src/bin/eolian_cxx/eolian_cxx.cc b/src/bin/eolian_cxx/eolian_cxx.cc
index c6d146205f..45b2b115b9 100644
--- a/src/bin/eolian_cxx/eolian_cxx.cc
+++ b/src/bin/eolian_cxx/eolian_cxx.cc
@@ -92,6 +92,27 @@ _guess_classname_from_sources(::options_type& opts)
92 return ""; 92 return "";
93} 93}
94 94
95std::pair<std::string, std::string> get_filename_info(std::string path)
96{
97 const size_t last = path.rfind("lib/");
98 if (last != std::string::npos)
99 {
100 path.erase(0, last+4);
101
102 std::string::iterator slash
103 = std::find(path.begin(), path.end(), '/');
104 if(slash != path.end())
105 {
106 std::string namespace_ (path.begin(), slash);
107 std::string filename (slash+1, path.end());
108 return {filename, namespace_};
109 }
110 }
111 EINA_CXX_DOM_LOG_ERR(::domain)
112 << "Couldn't find source file for class '" << path << "'";
113 return {};
114}
115
95efl::eolian::eo_generator_options 116efl::eolian::eo_generator_options
96_resolve_includes(std::string const& classname, ::options_type const& opts) 117_resolve_includes(std::string const& classname, ::options_type const& opts)
97{ 118{
@@ -101,9 +122,7 @@ _resolve_includes(std::string const& classname, ::options_type const& opts)
101 std::transform(cls_name.begin(), cls_name.end(), cls_name.begin(), ::tolower); 122 std::transform(cls_name.begin(), cls_name.end(), cls_name.begin(), ::tolower);
102 123
103 std::string eo_file = safe_str(eolian_class_file_get(classname.c_str())); 124 std::string eo_file = safe_str(eolian_class_file_get(classname.c_str()));
104 const size_t last = eo_file.rfind("/"); 125 gen_opts.c_headers.push_back(get_filename_info(eo_file).first + ".h");
105 if (last != std::string::npos) eo_file.erase(0, last+1);
106 gen_opts.c_headers.push_back(eo_file + ".h");
107 126
108 void *cur = NULL; 127 void *cur = NULL;
109 const Eina_List *itr, *inheritances = eolian_class_inherits_list_get(classname.c_str()); 128 const Eina_List *itr, *inheritances = eolian_class_inherits_list_get(classname.c_str());
@@ -113,16 +132,17 @@ _resolve_includes(std::string const& classname, ::options_type const& opts)
113 std::string eo_parent_file = safe_str(eolian_class_file_get(ext)); 132 std::string eo_parent_file = safe_str(eolian_class_file_get(ext));
114 if (!eo_parent_file.empty()) 133 if (!eo_parent_file.empty())
115 { 134 {
116 const size_t last = eo_parent_file.rfind("/"); 135 std::string filename, namespace_;
117 if (last != std::string::npos) eo_parent_file.erase(0, last+1); 136 std::tie(filename, namespace_) = get_filename_info(eo_parent_file);
118 if (eo_parent_file != "eo_base.eo") // we have our own eo_base.hh 137 // we have our own eo_base.hh
138 if (filename != "eo_base.eo" || namespace_ != "eo")
119 { 139 {
120 gen_opts.cxx_headers.push_back(eo_parent_file + ".hh"); 140 gen_opts.cxx_headers.push_back(filename + ".hh");
121 } 141 }
122 } 142 }
123 else 143 else
124 { 144 {
125 EINA_CXX_DOM_LOG_WARN(::domain) 145 EINA_CXX_DOM_LOG_ERR(::domain)
126 << "Couldn't find source file for class '" << ext << "'"; 146 << "Couldn't find source file for class '" << ext << "'";
127 } 147 }
128 } 148 }
diff --git a/src/examples/evas/.gitignore b/src/examples/evas/.gitignore
index 936dd01e5a..daed96bc0b 100644
--- a/src/examples/evas/.gitignore
+++ b/src/examples/evas/.gitignore
@@ -21,3 +21,4 @@
21/evas_3d_md2 21/evas_3d_md2
22/evas_3d_pick 22/evas_3d_pick
23/evas_3d_proxy 23/evas_3d_proxy
24/evas_cxx_rectangle
diff --git a/src/examples/evas/Makefile.am b/src/examples/evas/Makefile.am
index 48fac12eeb..e4ffbd6bc0 100644
--- a/src/examples/evas/Makefile.am
+++ b/src/examples/evas/Makefile.am
@@ -205,19 +205,16 @@ evas_aspect_hints_CPPFLAGS = $(EDJE_COMMON_CPPFLAGS)
205evas_aspect_hints_LDADD = $(EDJE_COMMON_LDADD) 205evas_aspect_hints_LDADD = $(EDJE_COMMON_LDADD)
206 206
207EXTRA_PROGRAMS += evas_cxx_rectangle 207EXTRA_PROGRAMS += evas_cxx_rectangle
208evas_cxx_rectangle_SOURCES = \ 208evas_cxx_rectangle_SOURCES = evas_cxx_rectangle.cc
209evas_cxx_rectangle.cc \
210$(top_builddir)/src/lib/evas/canvas/evas_common_interface.eo.hh \
211$(top_builddir)/src/lib/evas/canvas/evas.eo.hh \
212$(top_builddir)/src/lib/evas/canvas/evas_object.eo.hh \
213$(top_builddir)/src/lib/evas/canvas/evas_image.eo.hh
214evas_cxx_rectangle_LDADD = $(ECORE_EVAS_COMMON_LDADD) 209evas_cxx_rectangle_LDADD = $(ECORE_EVAS_COMMON_LDADD)
215evas_cxx_rectangle_CPPFLAGS = \ 210evas_cxx_rectangle_CPPFLAGS = $(ECORE_EVAS_COMMON_CPPFLAGS) \
216-I$(top_srcdir)/src/bindings/eina_cxx \ 211-I$(top_srcdir)/src/bindings/eina_cxx \
217-I$(top_builddir)/src/bindings/eina_cxx \
218-I$(top_srcdir)/src/bindings/eo_cxx \ 212-I$(top_srcdir)/src/bindings/eo_cxx \
213-I$(top_srcdir)/src/bindings/evas_cxx \
214-I$(top_builddir)/src/bindings/eina_cxx \
219-I$(top_builddir)/src/bindings/eo_cxx \ 215-I$(top_builddir)/src/bindings/eo_cxx \
220$(ECORE_EVAS_COMMON_CPPFLAGS) 216-I$(top_builddir)/src/bindings/evas_cxx \
217$(AM_CPPFLAGS) @EVAS_CFLAGS@
221 218
222EDJS = $(EDCS:%.edc=%.edj) 219EDJS = $(EDCS:%.edc=%.edj)
223 220