diff options
author | Felipe Magno de Almeida <felipe@expertisesolutions.com.br> | 2016-06-06 02:54:36 -0300 |
---|---|---|
committer | Felipe Magno de Almeida <felipe@expertisesolutions.com.br> | 2016-06-06 02:54:36 -0300 |
commit | 2a3d7860dbc11458425e162cd69ee399e9025251 (patch) | |
tree | 84c5b21b644c4cf8806a8eee07b4ed81922c92b4 /src/Makefile_Eolian_Cxx.am | |
parent | 4d1b3191d94fcc70472552b1bb554984a9cb0288 (diff) |
eolian-cxx: Rewrite to accomodate new features of the C++ binding
Diffstat (limited to '')
-rw-r--r-- | src/Makefile_Eolian_Cxx.am | 87 |
1 files changed, 49 insertions, 38 deletions
diff --git a/src/Makefile_Eolian_Cxx.am b/src/Makefile_Eolian_Cxx.am index 57dc265b97..981cca5bb2 100644 --- a/src/Makefile_Eolian_Cxx.am +++ b/src/Makefile_Eolian_Cxx.am | |||
@@ -6,40 +6,53 @@ installed_eoliancxxmainheadersdir = $(includedir)/eolian-cxx-@VMAJ@/ | |||
6 | dist_installed_eoliancxxmainheaders_DATA = \ | 6 | dist_installed_eoliancxxmainheaders_DATA = \ |
7 | lib/eolian_cxx/Eolian_Cxx.hh | 7 | lib/eolian_cxx/Eolian_Cxx.hh |
8 | 8 | ||
9 | installed_eoliancxxheadersdir = $(includedir)/eolian-cxx-@VMAJ@/ | ||
10 | dist_installed_eoliancxxheaders_DATA = \ | ||
11 | lib/eolian_cxx/eo_generate.hh \ | ||
12 | lib/eolian_cxx/eo_types.hh \ | ||
13 | lib/eolian_cxx/eo_validate.hh | ||
14 | |||
15 | installed_eoliancxxgrammarheadersdir = $(includedir)/eolian-cxx-@VMAJ@/grammar/ | 9 | installed_eoliancxxgrammarheadersdir = $(includedir)/eolian-cxx-@VMAJ@/grammar/ |
16 | dist_installed_eoliancxxgrammarheaders_DATA = \ | 10 | dist_installed_eoliancxxgrammarheaders_DATA = \ |
17 | lib/eolian_cxx/grammar/comment.hh \ | 11 | lib/eolian_cxx/grammar/address_of.hpp \ |
18 | lib/eolian_cxx/grammar/eo_class_scope_guard_generator.hh \ | 12 | lib/eolian_cxx/grammar/alternative.hpp \ |
19 | lib/eolian_cxx/grammar/eo_class_constructors_generator.hh \ | 13 | lib/eolian_cxx/grammar/attribute_conditional.hpp \ |
20 | lib/eolian_cxx/grammar/eo_class_events_generator.hh \ | 14 | lib/eolian_cxx/grammar/attribute_reorder.hpp \ |
21 | lib/eolian_cxx/grammar/eo_class_functions_generator.hh \ | 15 | lib/eolian_cxx/grammar/attribute_replace.hpp \ |
22 | lib/eolian_cxx/grammar/namespace_generator.hh \ | 16 | lib/eolian_cxx/grammar/attributes.hpp \ |
23 | lib/eolian_cxx/grammar/eo_class_generator.hh \ | 17 | lib/eolian_cxx/grammar/base_class_definition.hpp \ |
24 | lib/eolian_cxx/grammar/eo_header_generator.hh \ | 18 | lib/eolian_cxx/grammar/case.hpp \ |
25 | lib/eolian_cxx/grammar/inheritance_base_generator.hh \ | 19 | lib/eolian_cxx/grammar/class_declaration.hpp \ |
26 | lib/eolian_cxx/grammar/parameters_generator.hh \ | 20 | lib/eolian_cxx/grammar/class_definition.hpp \ |
27 | lib/eolian_cxx/grammar/type_generator.hh \ | 21 | lib/eolian_cxx/grammar/class_implementation.hpp \ |
28 | lib/eolian_cxx/grammar/tab.hh | 22 | lib/eolian_cxx/grammar/container.hpp \ |
23 | lib/eolian_cxx/grammar/context.hpp \ | ||
24 | lib/eolian_cxx/grammar/converting_argument.hpp \ | ||
25 | lib/eolian_cxx/grammar/c_type.hpp \ | ||
26 | lib/eolian_cxx/grammar/eps.hpp \ | ||
27 | lib/eolian_cxx/grammar/function_declaration.hpp \ | ||
28 | lib/eolian_cxx/grammar/function_definition.hpp \ | ||
29 | lib/eolian_cxx/grammar/generator.hpp \ | ||
30 | lib/eolian_cxx/grammar/header_guards.hpp \ | ||
31 | lib/eolian_cxx/grammar/header.hpp \ | ||
32 | lib/eolian_cxx/grammar/header_include_directive.hpp \ | ||
33 | lib/eolian_cxx/grammar/implementation_include_directive.hpp \ | ||
34 | lib/eolian_cxx/grammar/impl_header.hpp \ | ||
35 | lib/eolian_cxx/grammar/indentation.hpp \ | ||
36 | lib/eolian_cxx/grammar/keyword.hpp \ | ||
37 | lib/eolian_cxx/grammar/klass_def.hpp \ | ||
38 | lib/eolian_cxx/grammar/kleene.hpp \ | ||
39 | lib/eolian_cxx/grammar/list.hpp \ | ||
40 | lib/eolian_cxx/grammar/meta.hpp \ | ||
41 | lib/eolian_cxx/grammar/namespace.hpp \ | ||
42 | lib/eolian_cxx/grammar/parameter.hpp \ | ||
43 | lib/eolian_cxx/grammar/qualifier_def.hpp \ | ||
44 | lib/eolian_cxx/grammar/sequence.hpp \ | ||
45 | lib/eolian_cxx/grammar/string.hpp \ | ||
46 | lib/eolian_cxx/grammar/type.hpp \ | ||
47 | lib/eolian_cxx/grammar/type_impl.hpp \ | ||
48 | lib/eolian_cxx/grammar/type_traits.hpp \ | ||
49 | lib/eolian_cxx/grammar/variant.hpp | ||
29 | 50 | ||
30 | ### Binary | 51 | ### Binary |
31 | 52 | ||
32 | bin_PROGRAMS += bin/eolian_cxx/eolian_cxx | 53 | bin_PROGRAMS += bin/eolian_cxx/eolian_cxx |
33 | 54 | ||
34 | bin_eolian_cxx_eolian_cxx_SOURCES = \ | 55 | bin_eolian_cxx_eolian_cxx_SOURCES = \ |
35 | bin/eolian_cxx/convert_comments.cc \ | ||
36 | bin/eolian_cxx/convert_comments.hh \ | ||
37 | bin/eolian_cxx/convert.cc \ | ||
38 | bin/eolian_cxx/convert.hh \ | ||
39 | bin/eolian_cxx/eolian_wrappers.hh \ | ||
40 | bin/eolian_cxx/safe_strings.hh \ | ||
41 | bin/eolian_cxx/type_lookup.hh \ | ||
42 | bin/eolian_cxx/type_lookup_table.cc \ | ||
43 | bin/eolian_cxx/eolian_cxx.cc | 56 | bin/eolian_cxx/eolian_cxx.cc |
44 | 57 | ||
45 | bin_eolian_cxx_eolian_cxx_CXXFLAGS = -I$(top_builddir)/src/lib/efl \ | 58 | bin_eolian_cxx_eolian_cxx_CXXFLAGS = -I$(top_builddir)/src/lib/efl \ |
@@ -63,32 +76,29 @@ TESTS += tests/eolian_cxx/eolian_cxx_suite | |||
63 | tests_eolian_cxx_eolian_cxx_suite_SOURCES = \ | 76 | tests_eolian_cxx_eolian_cxx_suite_SOURCES = \ |
64 | tests/eolian_cxx/eolian_cxx_suite.cc \ | 77 | tests/eolian_cxx/eolian_cxx_suite.cc \ |
65 | tests/eolian_cxx/eolian_cxx_test_parse.cc \ | 78 | tests/eolian_cxx/eolian_cxx_test_parse.cc \ |
66 | tests/eolian_cxx/callback.c \ | ||
67 | tests/eolian_cxx/a.c \ | 79 | tests/eolian_cxx/a.c \ |
68 | tests/eolian_cxx/b.c \ | 80 | tests/eolian_cxx/b.c \ |
69 | tests/eolian_cxx/c.c \ | 81 | tests/eolian_cxx/c.c \ |
70 | tests/eolian_cxx/d.c \ | 82 | tests/eolian_cxx/d.c \ |
71 | tests/eolian_cxx/eolian_cxx_test_binding.cc \ | 83 | tests/eolian_cxx/eolian_cxx_test_binding.cc \ |
72 | tests/eolian_cxx/eolian_cxx_test_callback.cc \ | ||
73 | tests/eolian_cxx/eolian_cxx_test_address_of.cc \ | 84 | tests/eolian_cxx/eolian_cxx_test_address_of.cc \ |
74 | tests/eolian_cxx/eolian_cxx_test_wrapper.cc \ | 85 | tests/eolian_cxx/eolian_cxx_test_wrapper.cc \ |
75 | tests/eolian_cxx/simple.c \ | 86 | tests/eolian_cxx/simple.c \ |
76 | tests/eolian_cxx/name_name.c \ | 87 | tests/eolian_cxx/name_name.c \ |
77 | tests/eolian_cxx/name_name_cxx.cc \ | 88 | tests/eolian_cxx/name_name_cxx.cc \ |
78 | tests/eolian_cxx/generic.c \ | 89 | tests/eolian_cxx/generic.c \ |
90 | tests/eolian_cxx/name1_name2_type_generation.c \ | ||
79 | tests/eolian_cxx/eolian_cxx_test_inheritance.cc \ | 91 | tests/eolian_cxx/eolian_cxx_test_inheritance.cc \ |
80 | tests/eolian_cxx/eolian_cxx_test_generate.cc \ | 92 | tests/eolian_cxx/eolian_cxx_test_generate.cc \ |
81 | tests/eolian_cxx/complex.c \ | 93 | tests/eolian_cxx/complex.c \ |
82 | tests/eolian_cxx/complex_cxx.cc \ | 94 | tests/eolian_cxx/complex_cxx.cc \ |
83 | tests/eolian_cxx/eolian_cxx_suite.h | 95 | tests/eolian_cxx/eolian_cxx_suite.h |
84 | 96 | ||
85 | tests/eolian_cxx/tests_eolian_cxx_eolian_cxx_suite-eolian_cxx_test_wrapper.$(OBJEXT): tests/eolian_cxx/callback.eo.hh tests/eolian_cxx/callback.eo.h | 97 | tests/eolian_cxx/name1_name2_type_generation.$(OBJEXT): tests/eolian_cxx/name1_name2_type_generation.eo.h tests/eolian_cxx/name1_name2_type_generation.eo.c |
86 | tests/eolian_cxx/tests_eolian_cxx_eolian_cxx_suite-eolian_cxx_test_callback.$(OBJEXT): tests/eolian_cxx/callback.eo.hh tests/eolian_cxx/callback.eo.h | ||
87 | tests/eolian_cxx/tests_eolian_cxx_eolian_cxx_suite-eolian_cxx_test_inheritance.$(OBJEXT): tests/eolian_cxx/simple.eo.hh tests/eolian_cxx/simple.eo.h | 98 | tests/eolian_cxx/tests_eolian_cxx_eolian_cxx_suite-eolian_cxx_test_inheritance.$(OBJEXT): tests/eolian_cxx/simple.eo.hh tests/eolian_cxx/simple.eo.h |
88 | tests/eolian_cxx/tests_eolian_cxx_eolian_cxx_suite-eolian_cxx_test_binding.$(OBJEXT): tests/eolian_cxx/generic.eo.hh tests/eolian_cxx/generic.eo.h | 99 | tests/eolian_cxx/tests_eolian_cxx_eolian_cxx_suite-eolian_cxx_test_binding.$(OBJEXT): tests/eolian_cxx/generic.eo.hh tests/eolian_cxx/generic.eo.h tests/eolian_cxx/name1_name2_type_generation.eo.hh tests/eolian_cxx/name1_name2_type_generation.eo.h tests/eolian_cxx/name1_name2_type_generation.eo.c |
89 | tests/eolian_cxx/tests_eolian_cxx_eolian_cxx_suite-eolian_cxx_test_address_of.$(OBJEXT): tests/eolian_cxx/a.eo.hh tests/eolian_cxx/b.eo.hh tests/eolian_cxx/c.eo.hh tests/eolian_cxx/d.eo.hh tests/eolian_cxx/a.eo.h tests/eolian_cxx/b.eo.h tests/eolian_cxx/c.eo.h tests/eolian_cxx/d.eo.h | 100 | tests/eolian_cxx/tests_eolian_cxx_eolian_cxx_suite-eolian_cxx_test_address_of.$(OBJEXT): tests/eolian_cxx/a.eo.hh tests/eolian_cxx/b.eo.hh tests/eolian_cxx/c.eo.hh tests/eolian_cxx/d.eo.hh tests/eolian_cxx/a.eo.h tests/eolian_cxx/b.eo.h tests/eolian_cxx/c.eo.h tests/eolian_cxx/d.eo.h |
90 | 101 | ||
91 | tests/eolian_cxx/tests_eolian_cxx_eolian_cxx_suite-callback.$(OBJEXT): tests/eolian_cxx/callback.eo.c tests/eolian_cxx/callback.eo.h | ||
92 | tests/eolian_cxx/tests_eolian_cxx_eolian_cxx_suite-simple.$(OBJEXT): tests/eolian_cxx/simple.eo.c tests/eolian_cxx/simple.eo.h | 102 | tests/eolian_cxx/tests_eolian_cxx_eolian_cxx_suite-simple.$(OBJEXT): tests/eolian_cxx/simple.eo.c tests/eolian_cxx/simple.eo.h |
93 | tests/eolian_cxx/tests_eolian_cxx_eolian_cxx_suite-generic.$(OBJEXT): tests/eolian_cxx/generic.eo.c tests/eolian_cxx/generic.eo.h | 103 | tests/eolian_cxx/tests_eolian_cxx_eolian_cxx_suite-generic.$(OBJEXT): tests/eolian_cxx/generic.eo.c tests/eolian_cxx/generic.eo.h |
94 | tests/eolian_cxx/tests_eolian_cxx_eolian_cxx_suite-a.$(OBJEXT): tests/eolian_cxx/a.eo.c tests/eolian_cxx/a.eo.h | 104 | tests/eolian_cxx/tests_eolian_cxx_eolian_cxx_suite-a.$(OBJEXT): tests/eolian_cxx/a.eo.c tests/eolian_cxx/a.eo.h |
@@ -103,10 +113,6 @@ tests/eolian_cxx/tests_eolian_cxx_eolian_cxx_suite-complex.$(OBJEXT): tests/eoli | |||
103 | tests/eolian_cxx/tests_eolian_cxx_eolian_cxx_suite-complex_cxx.$(OBJEXT): tests/eolian_cxx/complex.eo.h tests/eolian_cxx/complex.eo.hh | 113 | tests/eolian_cxx/tests_eolian_cxx_eolian_cxx_suite-complex_cxx.$(OBJEXT): tests/eolian_cxx/complex.eo.h tests/eolian_cxx/complex.eo.hh |
104 | 114 | ||
105 | CLEANFILES += \ | 115 | CLEANFILES += \ |
106 | tests/eolian_cxx/callback.eo.hh \ | ||
107 | tests/eolian_cxx/callback.eo.c \ | ||
108 | tests/eolian_cxx/callback.eo.h \ | ||
109 | tests/eolian_cxx/callback.eo.impl.hh \ | ||
110 | tests/eolian_cxx/simple.eo.c \ | 116 | tests/eolian_cxx/simple.eo.c \ |
111 | tests/eolian_cxx/simple.eo.h \ | 117 | tests/eolian_cxx/simple.eo.h \ |
112 | tests/eolian_cxx/simple.eo.hh \ | 118 | tests/eolian_cxx/simple.eo.hh \ |
@@ -134,7 +140,11 @@ tests/eolian_cxx/ns_name_other.eo.impl.hh \ | |||
134 | tests/eolian_cxx/complex.eo.hh \ | 140 | tests/eolian_cxx/complex.eo.hh \ |
135 | tests/eolian_cxx/complex.eo.c \ | 141 | tests/eolian_cxx/complex.eo.c \ |
136 | tests/eolian_cxx/complex.eo.h \ | 142 | tests/eolian_cxx/complex.eo.h \ |
137 | tests/eolian_cxx/complex.eo.impl.hh | 143 | tests/eolian_cxx/complex.eo.impl.hh \ |
144 | tests/eolian_cxx/name1_name2_type_generation.eo.hh \ | ||
145 | tests/eolian_cxx/name1_name2_type_generation.eo.impl.hh \ | ||
146 | tests/eolian_cxx/name1_name2_type_generation.eo.h \ | ||
147 | tests/eolian_cxx/name1_name2_type_generation.eo.c | ||
138 | 148 | ||
139 | 149 | ||
140 | tests_eolian_cxx_eolian_cxx_suite_CXXFLAGS = \ | 150 | tests_eolian_cxx_eolian_cxx_suite_CXXFLAGS = \ |
@@ -159,7 +169,7 @@ tests_eolian_cxx_eolian_cxx_suite_DEPENDENCIES = @USE_EOLIAN_INTERNAL_LIBS@ | |||
159 | 169 | ||
160 | endif | 170 | endif |
161 | 171 | ||
162 | EXTRA_DIST += tests/eolian_cxx/callback.eo \ | 172 | EXTRA_DIST += \ |
163 | tests/eolian_cxx/simple.eo \ | 173 | tests/eolian_cxx/simple.eo \ |
164 | tests/eolian_cxx/generic.eo \ | 174 | tests/eolian_cxx/generic.eo \ |
165 | tests/eolian_cxx/a.eo \ | 175 | tests/eolian_cxx/a.eo \ |
@@ -169,6 +179,7 @@ tests/eolian_cxx/d.eo \ | |||
169 | tests/eolian_cxx/name_name.eo \ | 179 | tests/eolian_cxx/name_name.eo \ |
170 | tests/eolian_cxx/ns_name.eo \ | 180 | tests/eolian_cxx/ns_name.eo \ |
171 | tests/eolian_cxx/ns_name_other.eo \ | 181 | tests/eolian_cxx/ns_name_other.eo \ |
182 | tests/eolian_cxx/name1_name2_type_generation.eo \ | ||
172 | tests/eolian_cxx/complex.eo | 183 | tests/eolian_cxx/complex.eo |
173 | 184 | ||
174 | include Makefile_Eolian_Cxx_Helper.am | 185 | include Makefile_Eolian_Cxx_Helper.am |