summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Kolesa <d.kolesa@samsung.com>2019-04-18 17:55:06 +0200
committerDaniel Kolesa <d.kolesa@samsung.com>2019-04-18 17:55:06 +0200
commite81ecf09cdf37c96530d49490377f84410b619be (patch)
treea10cad70c41a24abc5c819aa59463d1269d2269c
parentc0acf619ae5db5c5d46c41718e0dc81c21c22f48 (diff)
autotools: remove usage of eolian_gen .eo.legacy.h generation
-rw-r--r--src/Makefile_Edje.am1
-rw-r--r--src/Makefile_Elementary.am8
-rw-r--r--src/Makefile_Eolian_Files_Helper.am8
-rw-r--r--src/Makefile_Evas.am3
4 files changed, 3 insertions, 17 deletions
diff --git a/src/Makefile_Edje.am b/src/Makefile_Edje.am
index aa1cd787e0..827e7237f5 100644
--- a/src/Makefile_Edje.am
+++ b/src/Makefile_Edje.am
@@ -23,7 +23,6 @@ edje_eolian_priv_files = \
23 23
24edje_eolian_c = $(edje_eolian_files:%.eo=%.eo.c) 24edje_eolian_c = $(edje_eolian_files:%.eo=%.eo.c)
25edje_eolian_h = $(edje_eolian_files:%.eo=%.eo.h) \ 25edje_eolian_h = $(edje_eolian_files:%.eo=%.eo.h) \
26 $(edje_eolian_files:%.eo=%.eo.legacy.h) \
27 $(edje_eolian_type_files:%.eot=%.eot.h) 26 $(edje_eolian_type_files:%.eot=%.eot.h)
28 27
29edje_eolian_priv_c = $(edje_eolian_priv_files:%.eo=%.eo.c) 28edje_eolian_priv_c = $(edje_eolian_priv_files:%.eo=%.eo.c)
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index f0e2b638cf..9baaecc0ef 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -198,7 +198,6 @@ elm_eolian_type_files = \
198 198
199elm_public_eolian_c = $(elm_public_eolian_files:%.eo=%.eo.c) 199elm_public_eolian_c = $(elm_public_eolian_files:%.eo=%.eo.c)
200elm_public_eolian_h = $(elm_public_eolian_files:%.eo=%.eo.h) \ 200elm_public_eolian_h = $(elm_public_eolian_files:%.eo=%.eo.h) \
201 $(elm_public_eolian_files:%.eo=%.eo.legacy.h) \
202 $(elm_eolian_type_files:%.eot=%.eot.h) 201 $(elm_eolian_type_files:%.eot=%.eot.h)
203 202
204elm_private_eolian_c = $(elm_private_eolian_files:%.eo=%.eo.c) 203elm_private_eolian_c = $(elm_private_eolian_files:%.eo=%.eo.c)
@@ -206,7 +205,6 @@ elm_private_eolian_h = $(elm_private_eolian_files:%.eo=%.eo.h)
206 205
207elm_legacy_eolian_c = $(elm_legacy_eolian_files:%.eo=%.eo.c) 206elm_legacy_eolian_c = $(elm_legacy_eolian_files:%.eo=%.eo.c)
208elm_legacy_eolian_eo_h = $(elm_legacy_eolian_files:%.eo=%.eo.h) 207elm_legacy_eolian_eo_h = $(elm_legacy_eolian_files:%.eo=%.eo.h)
209elm_legacy_eolian_legacy_h = $(elm_legacy_eolian_files:%.eo=%.eo.legacy.h)
210 208
211BUILT_SOURCES += \ 209BUILT_SOURCES += \
212 $(elm_public_eolian_c) \ 210 $(elm_public_eolian_c) \
@@ -214,8 +212,7 @@ BUILT_SOURCES += \
214 $(elm_private_eolian_c) \ 212 $(elm_private_eolian_c) \
215 $(elm_private_eolian_h) \ 213 $(elm_private_eolian_h) \
216 $(elm_legacy_eolian_c) \ 214 $(elm_legacy_eolian_c) \
217 $(elm_legacy_eolian_eo_h) \ 215 $(elm_legacy_eolian_eo_h)
218 $(elm_legacy_eolian_legacy_h)
219 216
220if INSTALL_EO_FILES 217if INSTALL_EO_FILES
221elementaryeolianfilesdir = $(datadir)/eolian/include/elementary-@VMAJ@ 218elementaryeolianfilesdir = $(datadir)/eolian/include/elementary-@VMAJ@
@@ -773,8 +770,7 @@ includesunstable_HEADERS = \
773includesunstabledir = $(includedir)/elementary-@VMAJ@ 770includesunstabledir = $(includedir)/elementary-@VMAJ@
774 771
775nodist_includesunstable_HEADERS = \ 772nodist_includesunstable_HEADERS = \
776 $(elm_public_eolian_h) \ 773 $(elm_public_eolian_h)
777 $(elm_legacy_eolian_legacy_h)
778 774
779includesub_HEADERS = \ 775includesub_HEADERS = \
780 lib/elementary/elc_ctxpopup.h \ 776 lib/elementary/elc_ctxpopup.h \
diff --git a/src/Makefile_Eolian_Files_Helper.am b/src/Makefile_Eolian_Files_Helper.am
index 35bf1318cc..727e0ad229 100644
--- a/src/Makefile_Eolian_Files_Helper.am
+++ b/src/Makefile_Eolian_Files_Helper.am
@@ -3,14 +3,13 @@ AM_V_EOL = $(am__v_EOL_@AM_V@)
3am__v_EOL_ = $(am__v_EOL_@AM_DEFAULT_V@) 3am__v_EOL_ = $(am__v_EOL_@AM_DEFAULT_V@)
4am__v_EOL_0 = @echo " EOLIAN " $@; 4am__v_EOL_0 = @echo " EOLIAN " $@;
5 5
6SUFFIXES = .eo .eo.c .eo.h .eo.legacy.h .eot .eot.h 6SUFFIXES = .eo .eo.c .eo.h .eot .eot.h
7 7
8 8
9#disable rules for subdir builds to avoid recursive dependencies 9#disable rules for subdir builds to avoid recursive dependencies
10../%.eo.c: %.eo ${_EOLIAN_GEN_DEP} 10../%.eo.c: %.eo ${_EOLIAN_GEN_DEP}
11../%.eo.h: %.eo ${_EOLIAN_GEN_DEP} 11../%.eo.h: %.eo ${_EOLIAN_GEN_DEP}
12../%.eot.h: %.eot ${_EOLIAN_GEN_DEP} 12../%.eot.h: %.eot ${_EOLIAN_GEN_DEP}
13../%.eo.legacy.h: %.eo ${_EOLIAN_GEN_DEP}
14 13
15%.eo.c: %.eo ${_EOLIAN_GEN_DEP} 14%.eo.c: %.eo ${_EOLIAN_GEN_DEP}
16 $(AM_V_EOL) \ 15 $(AM_V_EOL) \
@@ -26,8 +25,3 @@ SUFFIXES = .eo .eo.c .eo.h .eo.legacy.h .eot .eot.h
26 $(AM_V_EOL) \ 25 $(AM_V_EOL) \
27 $(MKDIR_P) $(@D); \ 26 $(MKDIR_P) $(@D); \
28 $(EOLIAN_GEN) $(EOLIAN_FLAGS) $(EOLIAN_GEN_FLAGS) -gh -o h:$@ $< 27 $(EOLIAN_GEN) $(EOLIAN_FLAGS) $(EOLIAN_GEN_FLAGS) -gh -o h:$@ $<
29
30%.eo.legacy.h: %.eo ${_EOLIAN_GEN_DEP}
31 $(AM_V_EOL) \
32 $(MKDIR_P) $(@D); \
33 $(EOLIAN_GEN) $(EOLIAN_FLAGS) $(EOLIAN_GEN_FLAGS) -gl -o l:$@ $<
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 95d8022a2c..90ae47f6ad 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -85,12 +85,10 @@ evas_gesture_eolian_priv_h = $(evas_gesture_eolian_priv_files:%.eo=%.eo.h)
85 85
86evas_canvas_eolian_pub_c = $(evas_canvas_eolian_pub_files:%.eo=%.eo.c) 86evas_canvas_eolian_pub_c = $(evas_canvas_eolian_pub_files:%.eo=%.eo.c)
87evas_canvas_eolian_pub_h = $(evas_canvas_eolian_pub_files:%.eo=%.eo.h) \ 87evas_canvas_eolian_pub_h = $(evas_canvas_eolian_pub_files:%.eo=%.eo.h) \
88 $(evas_canvas_eolian_pub_files:%.eo=%.eo.legacy.h) \
89 $(evas_canvas_eolian_type_files:%.eot=%.eot.h) 88 $(evas_canvas_eolian_type_files:%.eot=%.eot.h)
90 89
91evas_gesture_eolian_pub_c = $(evas_gesture_eolian_pub_files:%.eo=%.eo.c) 90evas_gesture_eolian_pub_c = $(evas_gesture_eolian_pub_files:%.eo=%.eo.c)
92evas_gesture_eolian_pub_h = $(evas_gesture_eolian_pub_files:%.eo=%.eo.h) \ 91evas_gesture_eolian_pub_h = $(evas_gesture_eolian_pub_files:%.eo=%.eo.h) \
93 $(evas_gesture_eolian_pub_files:%.eo=%.eo.legacy.h) \
94 $(evas_gesture_eolian_type_files:%.eot=%.eot.h) 92 $(evas_gesture_eolian_type_files:%.eot=%.eot.h)
95 93
96evas_eolian_files = $(evas_canvas_eolian_pub_files) \ 94evas_eolian_files = $(evas_canvas_eolian_pub_files) \
@@ -976,7 +974,6 @@ $(NULL)
976 974
977evas_gl_generic_eolian_c = $(evas_gl_generic_eolian_files:%.eo=%.eo.c) 975evas_gl_generic_eolian_c = $(evas_gl_generic_eolian_files:%.eo=%.eo.c)
978evas_gl_generic_eolian_h = $(evas_gl_generic_eolian_files:%.eo=%.eo.h) \ 976evas_gl_generic_eolian_h = $(evas_gl_generic_eolian_files:%.eo=%.eo.h) \
979 $(evas_gl_generic_eolian_files:%.eo=%.eo.legacy.h) \
980 $(evas_gl_generic_eolian_type_files:%.eot=%.eot.h) 977 $(evas_gl_generic_eolian_type_files:%.eot=%.eot.h)
981 978
982BUILT_SOURCES += \ 979BUILT_SOURCES += \