kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Daniel Kolesa 2017-10-19 15:59:16 +02:00
parent 5e96d6e378
commit f334f2a504
1 changed files with 49 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/Makefile_Evas.am
View File

@ -1,7 +1,7 @@
### Library
evas_eolian_pub_files = \
evas_canvas_eolian_pub_files = \
lib/evas/canvas/efl_canvas_object.eo \
lib/evas/canvas/efl_canvas_object_event_grabber.eo \
lib/evas/canvas/efl_canvas_polygon.eo \
@ -60,6 +60,9 @@ evas_eolian_pub_files = \
lib/evas/canvas/efl_animation_object_group.eo \
lib/evas/canvas/efl_animation_object_group_parallel.eo \
lib/evas/canvas/efl_animation_object_group_sequential.eo \
$(NULL)
evas_gesture_eolian_pub_files = \
lib/evas/gesture/efl_gesture_touch.eo \
lib/evas/gesture/efl_gesture.eo \
lib/evas/gesture/efl_gesture_tap.eo \
@ -78,33 +81,56 @@ evas_eolian_legacy_files = \
lib/evas/canvas/evas_image.eo \
$(NULL)
evas_eolian_priv_files = \
lib/evas/include/evas_ector_buffer.eo \
evas_canvas_eolian_priv_files = \
lib/evas/include/evas_ector_buffer.eo
evas_gesture_eolian_priv_files = \
lib/evas/gesture/efl_gesture_recognizer_tap.eo \
lib/evas/gesture/efl_gesture_recognizer_long_tap.eo
evas_eolian_type_files = \
evas_canvas_eolian_type_files = \
lib/evas/canvas/evas_canvas3d_types.eot \
lib/evas/canvas/efl_animation_types.eot \
lib/evas/canvas/efl_animation_types.eot
evas_gesture_eolian_type_files = \
lib/evas/gesture/efl_gesture_types.eot
evas_canvas_eolian_priv_c = $(evas_canvas_eolian_priv_files:%.eo=%.eo.c)
evas_canvas_eolian_priv_h = $(evas_canvas_eolian_priv_files:%.eo=%.eo.h) \
$(evas_eolian_legacy_files:%.eo=%.eo.h)
evas_eolian_priv_c = $(evas_eolian_priv_files:%.eo=%.eo.c)
evas_eolian_priv_h = $(evas_eolian_priv_files:%.eo=%.eo.h) \
$(evas_eolian_legacy_files:%.eo=%.eo.h)
evas_gesture_eolian_priv_c = $(evas_gesture_eolian_priv_files:%.eo=%.eo.c)
evas_gesture_eolian_priv_h = $(evas_gesture_eolian_priv_files:%.eo=%.eo.h)
evas_eolian_pub_c = $(evas_eolian_pub_files:%.eo=%.eo.c)
evas_eolian_pub_h = $(evas_eolian_pub_files:%.eo=%.eo.h) \
$(evas_eolian_pub_files:%.eo=%.eo.legacy.h) \
$(evas_eolian_type_files:%.eot=%.eot.h)
evas_canvas_eolian_pub_c = $(evas_canvas_eolian_pub_files:%.eo=%.eo.c)
evas_canvas_eolian_pub_h = $(evas_canvas_eolian_pub_files:%.eo=%.eo.h) \
$(evas_canvas_eolian_pub_files:%.eo=%.eo.legacy.h) \
$(evas_canvas_eolian_type_files:%.eot=%.eot.h)
evas_gesture_eolian_pub_c = $(evas_gesture_eolian_pub_files:%.eo=%.eo.c)
evas_gesture_eolian_pub_h = $(evas_gesture_eolian_pub_files:%.eo=%.eo.h) \
$(evas_gesture_eolian_pub_files:%.eo=%.eo.legacy.h) \
$(evas_gesture_eolian_type_files:%.eot=%.eot.h)
evas_eolian_legacy_c = $(evas_eolian_legacy_files:%.eo=%.eo.c)
evas_eolian_legacy_h = $(evas_eolian_legacy_files:%.eo=%.eo.legacy.h)
evas_eolian_files = $(evas_eolian_pub_files) $(evas_eolian_type_files)
evas_eolian_internal_files = $(evas_eolian_priv_files) $(evas_eolian_legacy_files)
evas_eolian_c = $(evas_eolian_pub_c) $(evas_eolian_priv_c) $(evas_eolian_legacy_c)
evas_eolian_h = $(evas_eolian_pub_h) $(evas_eolian_priv_h) $(evas_eolian_legacy_h)
evas_eolian_files = $(evas_canvas_eolian_pub_files) \
$(evas_canvas_eolian_type_files) \
$(evas_gesture_eolian_pub_files) \
$(evas_gesture_eolian_type_files)
evas_eolian_internal_files = $(evas_canvas_eolian_priv_files) \
$(evas_gesture_eolian_priv_files) \
$(evas_eolian_legacy_files)
evas_eolian_c = $(evas_canvas_eolian_pub_c) $(evas_canvas_eolian_priv_c) \
$(evas_gesture_eolian_pub_c) $(evas_gesture_eolian_priv_c) \
$(evas_eolian_legacy_c)
evas_eolian_h = $(evas_canvas_eolian_pub_h) $(evas_canvas_eolian_priv_h) \
$(evas_gesture_eolian_pub_h) $(evas_gesture_eolian_priv_h) \
$(evas_eolian_legacy_h)
BUILT_SOURCES += \
$(evas_eolian_c) \
@ -115,7 +141,7 @@ evaseolianfiles_DATA = $(evas_eolian_files)
EXTRA_DIST2 += \
$(evaseolianfiles_DATA) \
$(evas_eolian_internal_files)
$(evas_eolian_internal_files)
lib_LTLIBRARIES += lib/evas/libevas.la
@ -129,8 +155,13 @@ lib/evas/Evas_GL.h \
lib/evas/Evas_Loader.h
installed_evascanvasheadersdir = $(includedir)/evas-@VMAJ@/canvas
nodist_installed_evascanvasheaders_DATA = $(evas_eolian_pub_h) $(evas_eolian_legacy_h)
nodist_installed_evascanvasheaders_DATA = $(evas_canvas_eolian_pub_h) \
$(evas_eolian_legacy_h)
dist_installed_evascanvasheaders_DATA = lib/evas/canvas/evas_textblock_legacy.h
installed_evasgestureheadersdir = $(includedir)/evas-@VMAJ@/gesture
nodist_installed_evasgestureheaders_DATA = $(evas_gesture_eolian_pub_h)
noinst_DATA += $(evas_eolian_priv_h)
noinst_HEADERS += \