summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCedric Bail <cedric@osg.samsung.com>2016-03-03 21:09:29 -0800
committerCedric Bail <cedric@osg.samsung.com>2016-03-03 21:10:00 -0800
commite26fcbb1dc588c5130e477bf832c59386b1c1951 (patch)
treeca9de3c5cbdcbf592de1b79100205d919b3894e0 /src
parent3398db2dcd975e056fe5543c7ba7403d689086ae (diff)
eina: rely on GNU make to find file at their correct location.
Diffstat (limited to 'src')
-rw-r--r--src/Makefile_Eina.am2
-rw-r--r--src/lib/eina/Makefile.am5
-rw-r--r--src/lib/eina/Makefile_File.am323
3 files changed, 166 insertions, 164 deletions
diff --git a/src/Makefile_Eina.am b/src/Makefile_Eina.am
index 31162e5..11e22c4 100644
--- a/src/Makefile_Eina.am
+++ b/src/Makefile_Eina.am
@@ -9,6 +9,8 @@ dist_installed_einamainheaders_DATA = \
9lib/eina/Eina.h \ 9lib/eina/Eina.h \
10lib/eina/eina_config.h 10lib/eina/eina_config.h
11 11
12installed_einaheadersdir = $(includedir)/eina-@VMAJ@/eina
13dist_installed_einaheaders_DATA = $(EINA_H)
12lib_eina_libeina_la_SOURCES = $(EINA_S) 14lib_eina_libeina_la_SOURCES = $(EINA_S)
13 15
14EINA_MODULE_COMMON_CFLAGS = \ 16EINA_MODULE_COMMON_CFLAGS = \
diff --git a/src/lib/eina/Makefile.am b/src/lib/eina/Makefile.am
index ee789b1..01e06ec 100644
--- a/src/lib/eina/Makefile.am
+++ b/src/lib/eina/Makefile.am
@@ -6,7 +6,10 @@ include Makefile_File.am
6 6
7lib_LTLIBRARIES = libeina.la 7lib_LTLIBRARIES = libeina.la
8 8
9libeina_la_SOURCES = $(EINA_S) 9installed_einaheadersdir = $(includedir)/eina-@VMAJ@/eina
10dist_installed_einaheaders_DATA = $(notdir $(EINA_H))
11
12libeina_la_SOURCES = $(notdir $(EINA_S))
10libeina_la_CPPFLAGS = $(EINA_FLAGS) 13libeina_la_CPPFLAGS = $(EINA_FLAGS)
11libeina_la_LIBADD = @EINA_LIBS@ @UNWIND_LIBS@ 14libeina_la_LIBADD = @EINA_LIBS@ @UNWIND_LIBS@
12libeina_la_DEPENDENCIES = @EINA_INTERNAL_LIBS@ 15libeina_la_DEPENDENCIES = @EINA_INTERNAL_LIBS@
diff --git a/src/lib/eina/Makefile_File.am b/src/lib/eina/Makefile_File.am
index b47bcbd..c89daeb 100644
--- a/src/lib/eina/Makefile_File.am
+++ b/src/lib/eina/Makefile_File.am
@@ -7,181 +7,178 @@ EINA_FLAGS = -I$(top_builddir)/src/lib/efl \
7@VALGRIND_CFLAGS@ 7@VALGRIND_CFLAGS@
8 8
9EINA_H = \ 9EINA_H = \
10$(top_srcdir)/src/lib/eina/eina_safety_checks.h \ 10lib/eina/eina_safety_checks.h \
11$(top_srcdir)/src/lib/eina/eina_error.h \ 11lib/eina/eina_error.h \
12$(top_srcdir)/src/lib/eina/eina_log.h \ 12lib/eina/eina_log.h \
13$(top_srcdir)/src/lib/eina/eina_inline_log.x \ 13lib/eina/eina_inline_log.x \
14$(top_srcdir)/src/lib/eina/eina_fp.h \ 14lib/eina/eina_fp.h \
15$(top_srcdir)/src/lib/eina/eina_inline_f32p32.x \ 15lib/eina/eina_inline_f32p32.x \
16$(top_srcdir)/src/lib/eina/eina_inline_f16p16.x \ 16lib/eina/eina_inline_f16p16.x \
17$(top_srcdir)/src/lib/eina/eina_inline_f8p24.x \ 17lib/eina/eina_inline_f8p24.x \
18$(top_srcdir)/src/lib/eina/eina_inline_fp.x \ 18lib/eina/eina_inline_fp.x \
19$(top_srcdir)/src/lib/eina/eina_hash.h \ 19lib/eina/eina_hash.h \
20$(top_srcdir)/src/lib/eina/eina_inline_hash.x \ 20lib/eina/eina_inline_hash.x \
21$(top_srcdir)/src/lib/eina/eina_lalloc.h \ 21lib/eina/eina_lalloc.h \
22$(top_srcdir)/src/lib/eina/eina_clist.h \ 22lib/eina/eina_clist.h \
23$(top_srcdir)/src/lib/eina/eina_inline_clist.x \ 23lib/eina/eina_inline_clist.x \
24$(top_srcdir)/src/lib/eina/eina_inarray.h \ 24lib/eina/eina_inarray.h \
25$(top_srcdir)/src/lib/eina/eina_inlist.h \ 25lib/eina/eina_inlist.h \
26$(top_srcdir)/src/lib/eina/eina_inline_inlist.x \ 26lib/eina/eina_inline_inlist.x \
27$(top_srcdir)/src/lib/eina/eina_list.h \ 27lib/eina/eina_list.h \
28$(top_srcdir)/src/lib/eina/eina_file.h \ 28lib/eina/eina_file.h \
29$(top_srcdir)/src/lib/eina/eina_inline_file.x \ 29lib/eina/eina_inline_file.x \
30$(top_srcdir)/src/lib/eina/eina_mempool.h \ 30lib/eina/eina_mempool.h \
31$(top_srcdir)/src/lib/eina/eina_module.h \ 31lib/eina/eina_module.h \
32$(top_srcdir)/src/lib/eina/eina_rectangle.h \ 32lib/eina/eina_rectangle.h \
33$(top_srcdir)/src/lib/eina/eina_types.h \ 33lib/eina/eina_types.h \
34$(top_srcdir)/src/lib/eina/eina_array.h \ 34lib/eina/eina_array.h \
35$(top_srcdir)/src/lib/eina/eina_counter.h \ 35lib/eina/eina_counter.h \
36$(top_srcdir)/src/lib/eina/eina_inline_array.x \ 36lib/eina/eina_inline_array.x \
37$(top_srcdir)/src/lib/eina/eina_magic.h \ 37lib/eina/eina_magic.h \
38$(top_srcdir)/src/lib/eina/eina_stringshare.h \ 38lib/eina/eina_stringshare.h \
39$(top_srcdir)/src/lib/eina/eina_binshare.h \ 39lib/eina/eina_binshare.h \
40$(top_srcdir)/src/lib/eina/eina_binbuf.h \ 40lib/eina/eina_binbuf.h \
41$(top_srcdir)/src/lib/eina/eina_ustringshare.h \ 41lib/eina/eina_ustringshare.h \
42$(top_srcdir)/src/lib/eina/eina_inline_stringshare.x \ 42lib/eina/eina_inline_stringshare.x \
43$(top_srcdir)/src/lib/eina/eina_inline_ustringshare.x \ 43lib/eina/eina_inline_ustringshare.x \
44$(top_srcdir)/src/lib/eina/eina_inline_list.x \ 44lib/eina/eina_inline_list.x \
45$(top_srcdir)/src/lib/eina/eina_accessor.h \ 45lib/eina/eina_accessor.h \
46$(top_srcdir)/src/lib/eina/eina_convert.h \ 46lib/eina/eina_convert.h \
47$(top_srcdir)/src/lib/eina/eina_rbtree.h \ 47lib/eina/eina_rbtree.h \
48$(top_srcdir)/src/lib/eina/eina_benchmark.h \ 48lib/eina/eina_benchmark.h \
49$(top_srcdir)/src/lib/eina/eina_inline_rbtree.x \ 49lib/eina/eina_inline_rbtree.x \
50$(top_srcdir)/src/lib/eina/eina_inline_mempool.x \ 50lib/eina/eina_inline_mempool.x \
51$(top_srcdir)/src/lib/eina/eina_inline_rectangle.x \ 51lib/eina/eina_inline_rectangle.x \
52$(top_srcdir)/src/lib/eina/eina_inline_trash.x \ 52lib/eina/eina_inline_trash.x \
53$(top_srcdir)/src/lib/eina/eina_thread.h \ 53lib/eina/eina_thread.h \
54$(top_srcdir)/src/lib/eina/eina_trash.h \ 54lib/eina/eina_trash.h \
55$(top_srcdir)/src/lib/eina/eina_iterator.h \ 55lib/eina/eina_iterator.h \
56$(top_srcdir)/src/lib/eina/eina_main.h \ 56lib/eina/eina_main.h \
57$(top_srcdir)/src/lib/eina/eina_cpu.h \ 57lib/eina/eina_cpu.h \
58$(top_srcdir)/src/lib/eina/eina_inline_cpu.x \ 58lib/eina/eina_inline_cpu.x \
59$(top_srcdir)/src/lib/eina/eina_sched.h \ 59lib/eina/eina_sched.h \
60$(top_srcdir)/src/lib/eina/eina_tiler.h \ 60lib/eina/eina_tiler.h \
61$(top_srcdir)/src/lib/eina/eina_hamster.h \ 61lib/eina/eina_hamster.h \
62$(top_srcdir)/src/lib/eina/eina_matrixsparse.h \ 62lib/eina/eina_matrixsparse.h \
63$(top_srcdir)/src/lib/eina/eina_inline_tiler.x \ 63lib/eina/eina_inline_tiler.x \
64$(top_srcdir)/src/lib/eina/eina_str.h \ 64lib/eina/eina_str.h \
65$(top_srcdir)/src/lib/eina/eina_inline_str.x \ 65lib/eina/eina_inline_str.x \
66$(top_srcdir)/src/lib/eina/eina_strbuf.h \ 66lib/eina/eina_strbuf.h \
67$(top_srcdir)/src/lib/eina/eina_ustrbuf.h \ 67lib/eina/eina_ustrbuf.h \
68$(top_srcdir)/src/lib/eina/eina_unicode.h \ 68lib/eina/eina_unicode.h \
69$(top_srcdir)/src/lib/eina/eina_quadtree.h \ 69lib/eina/eina_quadtree.h \
70$(top_srcdir)/src/lib/eina/eina_simple_xml_parser.h \ 70lib/eina/eina_simple_xml_parser.h \
71$(top_srcdir)/src/lib/eina/eina_lock.h \ 71lib/eina/eina_lock.h \
72$(top_srcdir)/src/lib/eina/eina_prefix.h \ 72lib/eina/eina_prefix.h \
73$(top_srcdir)/src/lib/eina/eina_refcount.h \ 73lib/eina/eina_refcount.h \
74$(top_srcdir)/src/lib/eina/eina_mmap.h \ 74lib/eina/eina_mmap.h \
75$(top_srcdir)/src/lib/eina/eina_xattr.h \ 75lib/eina/eina_xattr.h \
76$(top_srcdir)/src/lib/eina/eina_value.h \ 76lib/eina/eina_value.h \
77$(top_srcdir)/src/lib/eina/eina_inline_value.x \ 77lib/eina/eina_inline_value.x \
78$(top_srcdir)/src/lib/eina/eina_value_util.h \ 78lib/eina/eina_value_util.h \
79$(top_srcdir)/src/lib/eina/eina_inline_value_util.x \ 79lib/eina/eina_inline_value_util.x \
80$(top_srcdir)/src/lib/eina/eina_inline_lock_barrier.x \ 80lib/eina/eina_inline_lock_barrier.x \
81$(top_srcdir)/src/lib/eina/eina_inline_lock_posix.x \ 81lib/eina/eina_inline_lock_posix.x \
82$(top_srcdir)/src/lib/eina/eina_tmpstr.h \ 82lib/eina/eina_tmpstr.h \
83$(top_srcdir)/src/lib/eina/eina_alloca.h \ 83lib/eina/eina_alloca.h \
84$(top_srcdir)/src/lib/eina/eina_cow.h \ 84lib/eina/eina_cow.h \
85$(top_srcdir)/src/lib/eina/eina_inline_unicode.x \ 85lib/eina/eina_inline_unicode.x \
86$(top_srcdir)/src/lib/eina/eina_thread_queue.h \ 86lib/eina/eina_thread_queue.h \
87$(top_srcdir)/src/lib/eina/eina_matrix.h \ 87lib/eina/eina_matrix.h \
88$(top_srcdir)/src/lib/eina/eina_quad.h \ 88lib/eina/eina_quad.h \
89$(top_srcdir)/src/lib/eina/eina_crc.h \ 89lib/eina/eina_crc.h \
90$(top_srcdir)/src/lib/eina/eina_inline_crc.x \ 90lib/eina/eina_inline_crc.x \
91$(top_srcdir)/src/lib/eina/eina_evlog.h \ 91lib/eina/eina_evlog.h \
92$(top_srcdir)/src/lib/eina/eina_util.h \ 92lib/eina/eina_util.h \
93$(top_srcdir)/src/lib/eina/eina_quaternion.h \ 93lib/eina/eina_quaternion.h \
94$(top_srcdir)/src/lib/eina/eina_vector.h \ 94lib/eina/eina_vector.h \
95$(top_srcdir)/src/lib/eina/eina_inline_vector.x \ 95lib/eina/eina_inline_vector.x \
96$(top_srcdir)/src/lib/eina/eina_bezier.h 96lib/eina/eina_bezier.h
97 97
98EINA_S = \ 98EINA_S = \
99$(top_srcdir)/src/lib/eina/eina_abi.c \ 99lib/eina/eina_abi.c \
100$(top_srcdir)/src/lib/eina/eina_accessor.c \ 100lib/eina/eina_accessor.c \
101$(top_srcdir)/src/lib/eina/eina_array.c \ 101lib/eina/eina_array.c \
102$(top_srcdir)/src/lib/eina/eina_benchmark.c \ 102lib/eina/eina_benchmark.c \
103$(top_srcdir)/src/lib/eina/eina_binbuf.c \ 103lib/eina/eina_binbuf.c \
104$(top_srcdir)/src/lib/eina/eina_binshare.c \ 104lib/eina/eina_binshare.c \
105$(top_srcdir)/src/lib/eina/eina_convert.c \ 105lib/eina/eina_convert.c \
106$(top_srcdir)/src/lib/eina/eina_counter.c \ 106lib/eina/eina_counter.c \
107$(top_srcdir)/src/lib/eina/eina_cow.c \ 107lib/eina/eina_cow.c \
108$(top_srcdir)/src/lib/eina/eina_cpu.c \ 108lib/eina/eina_cpu.c \
109$(top_srcdir)/src/lib/eina/eina_crc.c \ 109lib/eina/eina_crc.c \
110$(top_srcdir)/src/lib/eina/eina_debug.c \ 110lib/eina/eina_debug.c \
111$(top_srcdir)/src/lib/eina/eina_debug_bt.c \ 111lib/eina/eina_debug_bt.c \
112$(top_srcdir)/src/lib/eina/eina_debug_bt_file.c \ 112lib/eina/eina_debug_bt_file.c \
113$(top_srcdir)/src/lib/eina/eina_debug_chunk.c \ 113lib/eina/eina_debug_chunk.c \
114$(top_srcdir)/src/lib/eina/eina_debug_monitor.c \ 114lib/eina/eina_debug_monitor.c \
115$(top_srcdir)/src/lib/eina/eina_debug_proto.c \ 115lib/eina/eina_debug_proto.c \
116$(top_srcdir)/src/lib/eina/eina_debug_thread.c \ 116lib/eina/eina_debug_thread.c \
117$(top_srcdir)/src/lib/eina/eina_error.c \ 117lib/eina/eina_error.c \
118$(top_srcdir)/src/lib/eina/eina_evlog.c \ 118lib/eina/eina_evlog.c \
119$(top_srcdir)/src/lib/eina/eina_file_common.h \ 119lib/eina/eina_file_common.h \
120$(top_srcdir)/src/lib/eina/eina_file_common.c \ 120lib/eina/eina_file_common.c \
121$(top_srcdir)/src/lib/eina/eina_fp.c \ 121lib/eina/eina_fp.c \
122$(top_srcdir)/src/lib/eina/eina_hamster.c \ 122lib/eina/eina_hamster.c \
123$(top_srcdir)/src/lib/eina/eina_hash.c \ 123lib/eina/eina_hash.c \
124$(top_srcdir)/src/lib/eina/eina_inarray.c \ 124lib/eina/eina_inarray.c \
125$(top_srcdir)/src/lib/eina/eina_inlist.c \ 125lib/eina/eina_inlist.c \
126$(top_srcdir)/src/lib/eina/eina_iterator.c \ 126lib/eina/eina_iterator.c \
127$(top_srcdir)/src/lib/eina/eina_lalloc.c \ 127lib/eina/eina_lalloc.c \
128$(top_srcdir)/src/lib/eina/eina_list.c \ 128lib/eina/eina_list.c \
129$(top_srcdir)/src/lib/eina/eina_log.c \ 129lib/eina/eina_log.c \
130$(top_srcdir)/src/lib/eina/eina_magic.c \ 130lib/eina/eina_magic.c \
131$(top_srcdir)/src/lib/eina/eina_main.c \ 131lib/eina/eina_main.c \
132$(top_srcdir)/src/lib/eina/eina_matrix.c \ 132lib/eina/eina_matrix.c \
133$(top_srcdir)/src/lib/eina/eina_matrixsparse.c \ 133lib/eina/eina_matrixsparse.c \
134$(top_srcdir)/src/lib/eina/eina_mempool.c \ 134lib/eina/eina_mempool.c \
135$(top_srcdir)/src/lib/eina/eina_mmap.c \ 135lib/eina/eina_mmap.c \
136$(top_srcdir)/src/lib/eina/eina_module.c \ 136lib/eina/eina_module.c \
137$(top_srcdir)/src/lib/eina/eina_prefix.c \ 137lib/eina/eina_prefix.c \
138$(top_srcdir)/src/lib/eina/eina_quad.c \ 138lib/eina/eina_quad.c \
139$(top_srcdir)/src/lib/eina/eina_quadtree.c \ 139lib/eina/eina_quadtree.c \
140$(top_srcdir)/src/lib/eina/eina_rbtree.c \ 140lib/eina/eina_rbtree.c \
141$(top_srcdir)/src/lib/eina/eina_rectangle.c \ 141lib/eina/eina_rectangle.c \
142$(top_srcdir)/src/lib/eina/eina_safety_checks.c \ 142lib/eina/eina_safety_checks.c \
143$(top_srcdir)/src/lib/eina/eina_sched.c \ 143lib/eina/eina_sched.c \
144$(top_srcdir)/src/lib/eina/eina_share_common.c \ 144lib/eina/eina_share_common.c \
145$(top_srcdir)/src/lib/eina/eina_simple_xml_parser.c \ 145lib/eina/eina_simple_xml_parser.c \
146$(top_srcdir)/src/lib/eina/eina_str.c \ 146lib/eina/eina_str.c \
147$(top_srcdir)/src/lib/eina/eina_strbuf.c \ 147lib/eina/eina_strbuf.c \
148$(top_srcdir)/src/lib/eina/eina_strbuf_common.c \ 148lib/eina/eina_strbuf_common.c \
149$(top_srcdir)/src/lib/eina/eina_stringshare.c \ 149lib/eina/eina_stringshare.c \
150$(top_srcdir)/src/lib/eina/eina_thread.c \ 150lib/eina/eina_thread.c \
151$(top_srcdir)/src/lib/eina/eina_thread_queue.c \ 151lib/eina/eina_thread_queue.c \
152$(top_srcdir)/src/lib/eina/eina_tiler.c \ 152lib/eina/eina_tiler.c \
153$(top_srcdir)/src/lib/eina/eina_tmpstr.c \ 153lib/eina/eina_tmpstr.c \
154$(top_srcdir)/src/lib/eina/eina_unicode.c \ 154lib/eina/eina_unicode.c \
155$(top_srcdir)/src/lib/eina/eina_ustrbuf.c \ 155lib/eina/eina_ustrbuf.c \
156$(top_srcdir)/src/lib/eina/eina_ustringshare.c \ 156lib/eina/eina_ustringshare.c \
157$(top_srcdir)/src/lib/eina/eina_util.c \ 157lib/eina/eina_util.c \
158$(top_srcdir)/src/lib/eina/eina_value.c \ 158lib/eina/eina_value.c \
159$(top_srcdir)/src/lib/eina/eina_value_util.c \ 159lib/eina/eina_value_util.c \
160$(top_srcdir)/src/lib/eina/eina_xattr.c \ 160lib/eina/eina_xattr.c \
161$(top_srcdir)/src/lib/eina/eina_debug.h \ 161lib/eina/eina_debug.h \
162$(top_srcdir)/src/lib/eina/eina_private.h \ 162lib/eina/eina_private.h \
163$(top_srcdir)/src/lib/eina/eina_share_common.h \ 163lib/eina/eina_share_common.h \
164$(top_srcdir)/src/lib/eina/eina_strbuf_common.h \ 164lib/eina/eina_strbuf_common.h \
165$(top_srcdir)/src/lib/eina/eina_quaternion.c \ 165lib/eina/eina_quaternion.c \
166$(top_srcdir)/src/lib/eina/eina_bezier.c 166lib/eina/eina_bezier.c
167 167
168if HAVE_WIN32 168if HAVE_WIN32
169EINA_S += $(top_srcdir)/src/lib/eina/eina_file_win32.c 169EINA_S += lib/eina/eina_file_win32.c
170else 170else
171EINA_S += $(top_srcdir)/src/lib/eina/eina_file.c 171EINA_S += lib/eina/eina_file.c
172endif 172endif
173 173
174if EINA_STATIC_BUILD_CHAINED_POOL 174if EINA_STATIC_BUILD_CHAINED_POOL
175EINA_S += $(top_srcdir)/src/modules/eina/mp/chained_pool/eina_chained_mempool.c 175EINA_S += modules/eina/mp/chained_pool/eina_chained_mempool.c
176endif 176endif
177 177
178if EINA_STATIC_BUILD_ONE_BIG 178if EINA_STATIC_BUILD_ONE_BIG
179EINA_S += $(top_srcdir)/src/modules/eina/mp/one_big/eina_one_big.c 179EINA_S += modules/eina/mp/one_big/eina_one_big.c
180endif 180endif
181 181
182if EINA_STATIC_BUILD_PASS_THROUGH 182if EINA_STATIC_BUILD_PASS_THROUGH
183EINA_S += $(top_srcdir)/src/modules/eina/mp/pass_through/eina_pass_through.c 183EINA_S += modules/eina/mp/pass_through/eina_pass_through.c
184endif 184endif
185
186installed_einaheadersdir = $(includedir)/eina-@VMAJ@/eina
187dist_installed_einaheaders_DATA = $(EINA_H)