diff options
| author | Jean-Philippe Andre <jp.andre@samsung.com> | 2017-05-31 11:33:33 +0900 |
|---|---|---|
| committer | Jean-Philippe Andre <jp.andre@samsung.com> | 2017-05-31 15:41:20 +0900 |
| commit | 6e5431579e70cd1fd21b8cabe3e0b7ba457766af (patch) | |
| tree | 8da879516cbce62308599ef94b392e494572930d | |
| parent | 8f7fc307f241c9b449873ceaa31d4de1dd904f45 (diff) | |
| download | efl-6e5431579e70cd1fd21b8cabe3e0b7ba457766af.tar.gz | |
edje: Revert build fix and make "internal" eo public
Those classes are simply badly named, and I've come to realize since
that part class definitions are not internal, but instead they are
part of the public API. They are required for documentation, casting,
etc... I will rename them to "part" instead of "internal" later.
Since the headers are included in Edje_Eo.h not installing them
broke the build of any external app. Sorry for the mess!
This reverts 665856027d85802a29ede6f005674a8294df60fe
Ref T5306
| -rw-r--r-- | src/Makefile_Edje.am | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am index d691162a6c..ff8c41ac69 100644 --- a/src/Makefile_Edje.am +++ b/src/Makefile_Edje.am @@ -3,17 +3,17 @@ edje_eolian_files = \ lib/edje/edje_object.eo \ + lib/edje/efl_canvas_layout_internal.eo \ + lib/edje/efl_canvas_layout_internal_box.eo \ + lib/edje/efl_canvas_layout_internal_table.eo \ + lib/edje/efl_canvas_layout_internal_swallow.eo \ + lib/edje/efl_canvas_layout_external.eo \ lib/edje/edje_edit.eo edje_eolian_type_files = \ lib/edje/edje_types.eot edje_eolian_priv_files = \ - lib/edje/efl_canvas_layout_internal.eo \ - lib/edje/efl_canvas_layout_internal_box.eo \ - lib/edje/efl_canvas_layout_internal_table.eo \ - lib/edje/efl_canvas_layout_internal_swallow.eo \ - lib/edje/efl_canvas_layout_external.eo \ $(NULL) edje_eolian_c = $(edje_eolian_files:%.eo=%.eo.c) @@ -33,10 +33,9 @@ BUILT_SOURCES += \ edjeeolianfilesdir = $(datadir)/eolian/include/edje-@VMAJ@ edjeeolianfiles_DATA = \ $(edje_eolian_files) \ - $(edje_eolian_type_files) \ - $(edje_eolian_priv_files) + $(edje_eolian_type_files) -noinst_DATA += $(edje_eolian_priv_c) # $(edje_eolian_priv_h) +noinst_DATA += $(edje_eolian_priv_c) $(edje_eolian_priv_h) EXTRA_DIST2 += ${edjeeolianfiles_DATA} \ $(edje_eolian_priv_files) @@ -65,7 +64,7 @@ lib/edje/Edje_Edit.h nodist_installed_edjemainheaders_DATA = \ $(edje_eolian_h) \ - $(edje_eolian_priv_h) + $(NULL) lib_edje_libedje_la_SOURCES = \ lib/edje/edje_private.h \ |