summaryrefslogtreecommitdiff
path: root/src/Makefile_Evas.am
diff options
context:
space:
mode:
authorDaniel Kolesa <d.kolesa@osg.samsung.com>2017-10-19 15:59:16 +0200
committerDaniel Kolesa <d.kolesa@osg.samsung.com>2017-10-19 16:02:20 +0200
commitf334f2a5042734218d599f189fda615db47be766 (patch)
tree77873e37e8859991e5ae1a8ab9ea4130c86630ce /src/Makefile_Evas.am
parent5e96d6e37806be1fafae57476048e909a385a6db (diff)
evas build: fix installation paths for new gesture stuff
EFL-using things wouldn't build after addition of the new gesture stuff because gesture headers would get installed into the $PREFIX/evas-1/canvas instead of $PREFIX/evas-1/gesture directory and Evas_Eo.h is including headers from the gesture/ directory. This fixes the problem by installing the headers into their correct location. Spanks go to @jpeg for not reviewing things properly.
Diffstat (limited to 'src/Makefile_Evas.am')
-rw-r--r--src/Makefile_Evas.am67
1 files changed, 49 insertions, 18 deletions
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 12710d6..48603e9 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -1,7 +1,7 @@
1 1
2### Library 2### Library
3 3
4evas_eolian_pub_files = \ 4evas_canvas_eolian_pub_files = \
5 lib/evas/canvas/efl_canvas_object.eo \ 5 lib/evas/canvas/efl_canvas_object.eo \
6 lib/evas/canvas/efl_canvas_object_event_grabber.eo \ 6 lib/evas/canvas/efl_canvas_object_event_grabber.eo \
7 lib/evas/canvas/efl_canvas_polygon.eo \ 7 lib/evas/canvas/efl_canvas_polygon.eo \
@@ -60,6 +60,9 @@ evas_eolian_pub_files = \
60 lib/evas/canvas/efl_animation_object_group.eo \ 60 lib/evas/canvas/efl_animation_object_group.eo \
61 lib/evas/canvas/efl_animation_object_group_parallel.eo \ 61 lib/evas/canvas/efl_animation_object_group_parallel.eo \
62 lib/evas/canvas/efl_animation_object_group_sequential.eo \ 62 lib/evas/canvas/efl_animation_object_group_sequential.eo \
63 $(NULL)
64
65evas_gesture_eolian_pub_files = \
63 lib/evas/gesture/efl_gesture_touch.eo \ 66 lib/evas/gesture/efl_gesture_touch.eo \
64 lib/evas/gesture/efl_gesture.eo \ 67 lib/evas/gesture/efl_gesture.eo \
65 lib/evas/gesture/efl_gesture_tap.eo \ 68 lib/evas/gesture/efl_gesture_tap.eo \
@@ -78,33 +81,56 @@ evas_eolian_legacy_files = \
78 lib/evas/canvas/evas_image.eo \ 81 lib/evas/canvas/evas_image.eo \
79 $(NULL) 82 $(NULL)
80 83
81evas_eolian_priv_files = \ 84evas_canvas_eolian_priv_files = \
82 lib/evas/include/evas_ector_buffer.eo \ 85 lib/evas/include/evas_ector_buffer.eo
86
87evas_gesture_eolian_priv_files = \
83 lib/evas/gesture/efl_gesture_recognizer_tap.eo \ 88 lib/evas/gesture/efl_gesture_recognizer_tap.eo \
84 lib/evas/gesture/efl_gesture_recognizer_long_tap.eo 89 lib/evas/gesture/efl_gesture_recognizer_long_tap.eo
85 90
86evas_eolian_type_files = \ 91evas_canvas_eolian_type_files = \
87 lib/evas/canvas/evas_canvas3d_types.eot \ 92 lib/evas/canvas/evas_canvas3d_types.eot \
88 lib/evas/canvas/efl_animation_types.eot \ 93 lib/evas/canvas/efl_animation_types.eot
94
95evas_gesture_eolian_type_files = \
89 lib/evas/gesture/efl_gesture_types.eot 96 lib/evas/gesture/efl_gesture_types.eot
90 97
98evas_canvas_eolian_priv_c = $(evas_canvas_eolian_priv_files:%.eo=%.eo.c)
99evas_canvas_eolian_priv_h = $(evas_canvas_eolian_priv_files:%.eo=%.eo.h) \
100 $(evas_eolian_legacy_files:%.eo=%.eo.h)
101
102evas_gesture_eolian_priv_c = $(evas_gesture_eolian_priv_files:%.eo=%.eo.c)
103evas_gesture_eolian_priv_h = $(evas_gesture_eolian_priv_files:%.eo=%.eo.h)
91 104
92evas_eolian_priv_c = $(evas_eolian_priv_files:%.eo=%.eo.c) 105evas_canvas_eolian_pub_c = $(evas_canvas_eolian_pub_files:%.eo=%.eo.c)
93evas_eolian_priv_h = $(evas_eolian_priv_files:%.eo=%.eo.h) \ 106evas_canvas_eolian_pub_h = $(evas_canvas_eolian_pub_files:%.eo=%.eo.h) \
94 $(evas_eolian_legacy_files:%.eo=%.eo.h) 107 $(evas_canvas_eolian_pub_files:%.eo=%.eo.legacy.h) \
108 $(evas_canvas_eolian_type_files:%.eot=%.eot.h)
95 109
96evas_eolian_pub_c = $(evas_eolian_pub_files:%.eo=%.eo.c) 110evas_gesture_eolian_pub_c = $(evas_gesture_eolian_pub_files:%.eo=%.eo.c)
97evas_eolian_pub_h = $(evas_eolian_pub_files:%.eo=%.eo.h) \ 111evas_gesture_eolian_pub_h = $(evas_gesture_eolian_pub_files:%.eo=%.eo.h) \
98 $(evas_eolian_pub_files:%.eo=%.eo.legacy.h) \ 112 $(evas_gesture_eolian_pub_files:%.eo=%.eo.legacy.h) \
99 $(evas_eolian_type_files:%.eot=%.eot.h) 113 $(evas_gesture_eolian_type_files:%.eot=%.eot.h)
100 114
101evas_eolian_legacy_c = $(evas_eolian_legacy_files:%.eo=%.eo.c) 115evas_eolian_legacy_c = $(evas_eolian_legacy_files:%.eo=%.eo.c)
102evas_eolian_legacy_h = $(evas_eolian_legacy_files:%.eo=%.eo.legacy.h) 116evas_eolian_legacy_h = $(evas_eolian_legacy_files:%.eo=%.eo.legacy.h)
103 117
104evas_eolian_files = $(evas_eolian_pub_files) $(evas_eolian_type_files) 118evas_eolian_files = $(evas_canvas_eolian_pub_files) \
105evas_eolian_internal_files = $(evas_eolian_priv_files) $(evas_eolian_legacy_files) 119 $(evas_canvas_eolian_type_files) \
106evas_eolian_c = $(evas_eolian_pub_c) $(evas_eolian_priv_c) $(evas_eolian_legacy_c) 120 $(evas_gesture_eolian_pub_files) \
107evas_eolian_h = $(evas_eolian_pub_h) $(evas_eolian_priv_h) $(evas_eolian_legacy_h) 121 $(evas_gesture_eolian_type_files)
122
123evas_eolian_internal_files = $(evas_canvas_eolian_priv_files) \
124 $(evas_gesture_eolian_priv_files) \
125 $(evas_eolian_legacy_files)
126
127evas_eolian_c = $(evas_canvas_eolian_pub_c) $(evas_canvas_eolian_priv_c) \
128 $(evas_gesture_eolian_pub_c) $(evas_gesture_eolian_priv_c) \
129 $(evas_eolian_legacy_c)
130
131evas_eolian_h = $(evas_canvas_eolian_pub_h) $(evas_canvas_eolian_priv_h) \
132 $(evas_gesture_eolian_pub_h) $(evas_gesture_eolian_priv_h) \
133 $(evas_eolian_legacy_h)
108 134
109BUILT_SOURCES += \ 135BUILT_SOURCES += \
110 $(evas_eolian_c) \ 136 $(evas_eolian_c) \
@@ -115,7 +141,7 @@ evaseolianfiles_DATA = $(evas_eolian_files)
115 141
116EXTRA_DIST2 += \ 142EXTRA_DIST2 += \
117 $(evaseolianfiles_DATA) \ 143 $(evaseolianfiles_DATA) \
118 $(evas_eolian_internal_files) 144 $(evas_eolian_internal_files)
119 145
120lib_LTLIBRARIES += lib/evas/libevas.la 146lib_LTLIBRARIES += lib/evas/libevas.la
121 147
@@ -129,8 +155,13 @@ lib/evas/Evas_GL.h \
129lib/evas/Evas_Loader.h 155lib/evas/Evas_Loader.h
130 156
131installed_evascanvasheadersdir = $(includedir)/evas-@VMAJ@/canvas 157installed_evascanvasheadersdir = $(includedir)/evas-@VMAJ@/canvas
132nodist_installed_evascanvasheaders_DATA = $(evas_eolian_pub_h) $(evas_eolian_legacy_h) 158nodist_installed_evascanvasheaders_DATA = $(evas_canvas_eolian_pub_h) \
159 $(evas_eolian_legacy_h)
133dist_installed_evascanvasheaders_DATA = lib/evas/canvas/evas_textblock_legacy.h 160dist_installed_evascanvasheaders_DATA = lib/evas/canvas/evas_textblock_legacy.h
161
162installed_evasgestureheadersdir = $(includedir)/evas-@VMAJ@/gesture
163nodist_installed_evasgestureheaders_DATA = $(evas_gesture_eolian_pub_h)
164
134noinst_DATA += $(evas_eolian_priv_h) 165noinst_DATA += $(evas_eolian_priv_h)
135 166
136noinst_HEADERS += \ 167noinst_HEADERS += \