Merge lp:~logan/ubuntu/trusty/mtdev/1.1.3-1ubuntu1 into lp:ubuntu/trusty/mtdev
- Trusty (14.04)
- 1.1.3-1ubuntu1
- Merge into trusty
Proposed by
Logan Rosen
Status: | Merged |
---|---|
Merged at revision: | 13 |
Proposed branch: | lp:~logan/ubuntu/trusty/mtdev/1.1.3-1ubuntu1 |
Merge into: | lp:ubuntu/trusty/mtdev |
Diff against target: |
2992 lines (+1503/-500) 17 files modified
ChangeLog (+90/-0) Makefile.am (+1/-1) Makefile.in (+154/-116) aclocal.m4 (+310/-143) config-aux/compile (+347/-0) configure (+262/-47) configure.ac (+2/-2) debian/changelog (+13/-0) src/Makefile.am (+1/-1) src/Makefile.in (+144/-86) src/caps.c (+6/-6) src/common.h (+10/-2) src/match_four.c (+1/-0) src/state.h (+2/-2) test/Makefile.am (+1/-1) test/Makefile.in (+158/-93) test/mtdev-kernel.c (+1/-0) |
To merge this branch: | bzr merge lp:~logan/ubuntu/trusty/mtdev/1.1.3-1ubuntu1 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel Holbach (community) | Approve | ||
Review via email: mp+192796@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'ChangeLog' |
2 | --- ChangeLog 2012-09-05 01:22:39 +0000 |
3 | +++ ChangeLog 2013-10-26 22:20:55 +0000 |
4 | @@ -1,3 +1,93 @@ |
5 | +commit 25070dda4b1aaaf402db621d10fc901b82d78377 |
6 | +Author: Henrik Rydberg <rydberg@euromail.se> |
7 | +Date: Sat Aug 3 22:01:06 2013 +0200 |
8 | + |
9 | + Release mtdev-1.1.4 |
10 | + |
11 | + Signed-off-by: Henrik Rydberg <rydberg@euromail.se> |
12 | + |
13 | +commit 72bbb5f42fe8e47d6314eb92a0ada6554644305c |
14 | +Merge: b5d8e8e a9ea316 |
15 | +Author: Henrik Rydberg <rydberg@euromail.se> |
16 | +Date: Wed Jul 31 19:25:50 2013 +0200 |
17 | + |
18 | + Merge more build fixes from Peter Hutterer, along with a more explicit |
19 | + declaration of the backwards compatibility constraints on the API. |
20 | + |
21 | + Signed-off-by: Henrik Rydberg <rydberg@euromail.se> |
22 | + |
23 | +commit a9ea3168615056360cdb21d6f1576d66be2a43fe |
24 | +Author: Peter Hutterer <peter.hutterer@who-t.net> |
25 | +Date: Wed Jul 24 14:24:43 2013 +1000 |
26 | + |
27 | + Enable silent rules by default |
28 | + |
29 | + silent rules make it easier to spot compiler errors |
30 | + |
31 | + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> |
32 | + |
33 | +commit 0bccf8c5268826bdb0835dd9b7964bcc95bae35f |
34 | +Author: Peter Hutterer <peter.hutterer@who-t.net> |
35 | +Date: Wed Jul 24 14:23:25 2013 +1000 |
36 | + |
37 | + test: silence compiler warning - implicit declaration of function ‘atoi’ |
38 | + |
39 | + mtdev-kernel.c:130:2: warning: implicit declaration of function ‘atoi’ |
40 | + [-Wimplicit-function-declaration] |
41 | + eslot = atoi(argv[1]) + 1; |
42 | + |
43 | + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> |
44 | + |
45 | +commit 1ddaf0af41098d0a01eac162c6fe4d38f2fbbbad |
46 | +Author: Peter Hutterer <peter.hutterer@who-t.net> |
47 | +Date: Wed Jul 24 13:00:32 2013 +1000 |
48 | + |
49 | + Fix compiler warning - implicit declaration of function 'abs' |
50 | + |
51 | + match_four.c:80:4: warning: implicit declaration of function 'abs' |
52 | + [-Wimplicit-function-declaration] |
53 | + *dist++ = abs(q->x - p->x) + abs(q->y - p->y); |
54 | + |
55 | + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> |
56 | + |
57 | +commit 6f7c5c558006bb69fdf0af73103097c012ccfed5 |
58 | +Author: Peter Hutterer <peter.hutterer@who-t.net> |
59 | +Date: Thu Jul 25 13:21:09 2013 +1000 |
60 | + |
61 | + Replace hardcoded 11 with a define |
62 | + |
63 | + The 11 comes from the legacy API that we need to be binary compatible with. |
64 | + Make this clear with a define and a comment. |
65 | + |
66 | + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> |
67 | + |
68 | +commit b5d8e8e26c0116e4b6e556a0f6da8777bc55c590 |
69 | +Merge: e5eb274 f4fe569 |
70 | +Author: Henrik Rydberg <rydberg@euromail.se> |
71 | +Date: Thu Jul 25 10:05:20 2013 +0200 |
72 | + |
73 | + Merge build fixes from Peter Hutterer. |
74 | + |
75 | + Signed-off-by: Henrik Rydberg <rydberg@euromail.se> |
76 | + |
77 | +commit f4fe56973a29265e22f049ceed1e299573f90ec4 |
78 | +Author: Peter Hutterer <peter.hutterer@who-t.net> |
79 | +Date: Wed Jul 3 15:49:21 2013 +1000 |
80 | + |
81 | + Rename INCLUDES to AM_CPPFLAGS |
82 | + |
83 | + src/Makefile.am:22: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') |
84 | + |
85 | + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> |
86 | + |
87 | +commit e79f2b211830dec2bae35595c6dfd1d06f75d903 |
88 | +Author: Peter Hutterer <peter.hutterer@who-t.net> |
89 | +Date: Wed Jul 3 15:45:12 2013 +1000 |
90 | + |
91 | + Drop maintainer mode - enable by default |
92 | + |
93 | + Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> |
94 | + |
95 | commit e5eb27494cd237e60645db4d7be5b4acf41cb5e0 |
96 | Author: Henrik Rydberg <rydberg@euromail.se> |
97 | Date: Wed Aug 22 22:20:16 2012 +0200 |
98 | |
99 | === modified file 'Makefile.am' |
100 | --- Makefile.am 2010-08-04 13:09:48 +0000 |
101 | +++ Makefile.am 2013-10-26 22:20:55 +0000 |
102 | @@ -3,7 +3,7 @@ |
103 | pkgconfigdir = $(libdir)/pkgconfig |
104 | pkgconfig_DATA = mtdev.pc |
105 | |
106 | -INCLUDES = $(top_srcdir)/include/ |
107 | +AM_CPPFLAGS = $(top_srcdir)/include/ |
108 | |
109 | .PHONY: ChangeLog INSTALL |
110 | INSTALL: |
111 | |
112 | === modified file 'Makefile.in' |
113 | --- Makefile.in 2012-09-05 01:22:39 +0000 |
114 | +++ Makefile.in 2013-10-26 22:20:55 +0000 |
115 | @@ -1,7 +1,7 @@ |
116 | -# Makefile.in generated by automake 1.12.3 from Makefile.am. |
117 | +# Makefile.in generated by automake 1.14 from Makefile.am. |
118 | # @configure_input@ |
119 | |
120 | -# Copyright (C) 1994-2012 Free Software Foundation, Inc. |
121 | +# Copyright (C) 1994-2013 Free Software Foundation, Inc. |
122 | |
123 | # This Makefile.in is free software; the Free Software Foundation |
124 | # gives unlimited permission to copy and/or distribute it, |
125 | @@ -15,23 +15,51 @@ |
126 | @SET_MAKE@ |
127 | |
128 | VPATH = @srcdir@ |
129 | -am__make_dryrun = \ |
130 | - { \ |
131 | - am__dry=no; \ |
132 | +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' |
133 | +am__make_running_with_option = \ |
134 | + case $${target_option-} in \ |
135 | + ?) ;; \ |
136 | + *) echo "am__make_running_with_option: internal error: invalid" \ |
137 | + "target option '$${target_option-}' specified" >&2; \ |
138 | + exit 1;; \ |
139 | + esac; \ |
140 | + has_opt=no; \ |
141 | + sane_makeflags=$$MAKEFLAGS; \ |
142 | + if $(am__is_gnu_make); then \ |
143 | + sane_makeflags=$$MFLAGS; \ |
144 | + else \ |
145 | case $$MAKEFLAGS in \ |
146 | *\\[\ \ ]*) \ |
147 | - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
148 | - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
149 | - *) \ |
150 | - for am__flg in $$MAKEFLAGS; do \ |
151 | - case $$am__flg in \ |
152 | - *=*|--*) ;; \ |
153 | - *n*) am__dry=yes; break;; \ |
154 | - esac; \ |
155 | - done;; \ |
156 | - esac; \ |
157 | - test $$am__dry = yes; \ |
158 | - } |
159 | + bs=\\; \ |
160 | + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ |
161 | + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ |
162 | + esac; \ |
163 | + fi; \ |
164 | + skip_next=no; \ |
165 | + strip_trailopt () \ |
166 | + { \ |
167 | + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ |
168 | + }; \ |
169 | + for flg in $$sane_makeflags; do \ |
170 | + test $$skip_next = yes && { skip_next=no; continue; }; \ |
171 | + case $$flg in \ |
172 | + *=*|--*) continue;; \ |
173 | + -*I) strip_trailopt 'I'; skip_next=yes;; \ |
174 | + -*I?*) strip_trailopt 'I';; \ |
175 | + -*O) strip_trailopt 'O'; skip_next=yes;; \ |
176 | + -*O?*) strip_trailopt 'O';; \ |
177 | + -*l) strip_trailopt 'l'; skip_next=yes;; \ |
178 | + -*l?*) strip_trailopt 'l';; \ |
179 | + -[dEDm]) skip_next=yes;; \ |
180 | + -[JT]) skip_next=yes;; \ |
181 | + esac; \ |
182 | + case $$flg in \ |
183 | + *$$target_option*) has_opt=yes; break;; \ |
184 | + esac; \ |
185 | + done; \ |
186 | + test $$has_opt = yes |
187 | +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) |
188 | +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) |
189 | pkgdatadir = $(datadir)/@PACKAGE@ |
190 | pkgincludedir = $(includedir)/@PACKAGE@ |
191 | pkglibdir = $(libdir)/@PACKAGE@ |
192 | @@ -51,16 +79,18 @@ |
193 | build_triplet = @build@ |
194 | host_triplet = @host@ |
195 | subdir = . |
196 | -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ |
197 | - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ |
198 | - $(srcdir)/mtdev.pc.in $(top_srcdir)/config-aux/config.guess \ |
199 | +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ |
200 | + $(top_srcdir)/configure $(am__configure_deps) \ |
201 | + $(srcdir)/config.h.in $(srcdir)/mtdev.pc.in COPYING ChangeLog \ |
202 | + INSTALL README config-aux/compile config-aux/config.guess \ |
203 | + config-aux/config.sub config-aux/depcomp config-aux/install-sh \ |
204 | + config-aux/missing config-aux/ltmain.sh \ |
205 | + $(top_srcdir)/config-aux/compile \ |
206 | + $(top_srcdir)/config-aux/config.guess \ |
207 | $(top_srcdir)/config-aux/config.sub \ |
208 | $(top_srcdir)/config-aux/install-sh \ |
209 | $(top_srcdir)/config-aux/ltmain.sh \ |
210 | - $(top_srcdir)/config-aux/missing $(top_srcdir)/configure \ |
211 | - COPYING ChangeLog INSTALL config-aux/config.guess \ |
212 | - config-aux/config.sub config-aux/depcomp config-aux/install-sh \ |
213 | - config-aux/ltmain.sh config-aux/missing |
214 | + $(top_srcdir)/config-aux/missing |
215 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
216 | am__aclocal_m4_deps = $(top_srcdir)/configure.ac |
217 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
218 | @@ -71,15 +101,28 @@ |
219 | CONFIG_HEADER = config.h |
220 | CONFIG_CLEAN_FILES = mtdev.pc |
221 | CONFIG_CLEAN_VPATH_FILES = |
222 | +AM_V_P = $(am__v_P_@AM_V@) |
223 | +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) |
224 | +am__v_P_0 = false |
225 | +am__v_P_1 = : |
226 | +AM_V_GEN = $(am__v_GEN_@AM_V@) |
227 | +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) |
228 | +am__v_GEN_0 = @echo " GEN " $@; |
229 | +am__v_GEN_1 = |
230 | +AM_V_at = $(am__v_at_@AM_V@) |
231 | +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) |
232 | +am__v_at_0 = @ |
233 | +am__v_at_1 = |
234 | SOURCES = |
235 | DIST_SOURCES = |
236 | -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ |
237 | - html-recursive info-recursive install-data-recursive \ |
238 | - install-dvi-recursive install-exec-recursive \ |
239 | - install-html-recursive install-info-recursive \ |
240 | - install-pdf-recursive install-ps-recursive install-recursive \ |
241 | - installcheck-recursive installdirs-recursive pdf-recursive \ |
242 | - ps-recursive uninstall-recursive |
243 | +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ |
244 | + ctags-recursive dvi-recursive html-recursive info-recursive \ |
245 | + install-data-recursive install-dvi-recursive \ |
246 | + install-exec-recursive install-html-recursive \ |
247 | + install-info-recursive install-pdf-recursive \ |
248 | + install-ps-recursive install-recursive installcheck-recursive \ |
249 | + installdirs-recursive pdf-recursive ps-recursive \ |
250 | + tags-recursive uninstall-recursive |
251 | am__can_run_installinfo = \ |
252 | case $$AM_UPDATE_INFO_DIR in \ |
253 | n|no|NO) false;; \ |
254 | @@ -116,9 +159,30 @@ |
255 | DATA = $(pkgconfig_DATA) |
256 | RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ |
257 | distclean-recursive maintainer-clean-recursive |
258 | -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ |
259 | - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ |
260 | +am__recursive_targets = \ |
261 | + $(RECURSIVE_TARGETS) \ |
262 | + $(RECURSIVE_CLEAN_TARGETS) \ |
263 | + $(am__extra_recursive_targets) |
264 | +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ |
265 | cscope distdir dist dist-all distcheck |
266 | +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ |
267 | + $(LISP)config.h.in |
268 | +# Read a list of newline-separated strings from the standard input, |
269 | +# and print each of them once, without duplicates. Input order is |
270 | +# *not* preserved. |
271 | +am__uniquify_input = $(AWK) '\ |
272 | + BEGIN { nonempty = 0; } \ |
273 | + { items[$$0] = 1; nonempty = 1; } \ |
274 | + END { if (nonempty) { for (i in items) print i; }; } \ |
275 | +' |
276 | +# Make sure the list of sources is unique. This is necessary because, |
277 | +# e.g., the same source file might be shared among _SOURCES variables |
278 | +# for different programs/libraries. |
279 | +am__define_uniq_tagged_files = \ |
280 | + list='$(am__tagged_files)'; \ |
281 | + unique=`for i in $$list; do \ |
282 | + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
283 | + done | $(am__uniquify_input)` |
284 | ETAGS = etags |
285 | CTAGS = ctags |
286 | CSCOPE = cscope |
287 | @@ -167,6 +231,7 @@ |
288 | distcleancheck_listfiles = find . -type f -print |
289 | ACLOCAL = @ACLOCAL@ |
290 | AMTAR = @AMTAR@ |
291 | +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ |
292 | AR = @AR@ |
293 | AUTOCONF = @AUTOCONF@ |
294 | AUTOHEADER = @AUTOHEADER@ |
295 | @@ -204,7 +269,6 @@ |
296 | LIPO = @LIPO@ |
297 | LN_S = @LN_S@ |
298 | LTLIBOBJS = @LTLIBOBJS@ |
299 | -MAINT = @MAINT@ |
300 | MAKEINFO = @MAKEINFO@ |
301 | MANIFEST_TOOL = @MANIFEST_TOOL@ |
302 | MKDIR_P = @MKDIR_P@ |
303 | @@ -283,14 +347,14 @@ |
304 | SUBDIRS = src test |
305 | pkgconfigdir = $(libdir)/pkgconfig |
306 | pkgconfig_DATA = mtdev.pc |
307 | -INCLUDES = $(top_srcdir)/include/ |
308 | +AM_CPPFLAGS = $(top_srcdir)/include/ |
309 | all: config.h |
310 | $(MAKE) $(AM_MAKEFLAGS) all-recursive |
311 | |
312 | .SUFFIXES: |
313 | am--refresh: Makefile |
314 | @: |
315 | -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) |
316 | +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) |
317 | @for dep in $?; do \ |
318 | case '$(am__configure_deps)' in \ |
319 | *$$dep*) \ |
320 | @@ -317,20 +381,20 @@ |
321 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) |
322 | $(SHELL) ./config.status --recheck |
323 | |
324 | -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) |
325 | +$(top_srcdir)/configure: $(am__configure_deps) |
326 | $(am__cd) $(srcdir) && $(AUTOCONF) |
327 | -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) |
328 | +$(ACLOCAL_M4): $(am__aclocal_m4_deps) |
329 | $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) |
330 | $(am__aclocal_m4_deps): |
331 | |
332 | config.h: stamp-h1 |
333 | - @if test ! -f $@; then rm -f stamp-h1; else :; fi |
334 | - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi |
335 | + @test -f $@ || rm -f stamp-h1 |
336 | + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 |
337 | |
338 | stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status |
339 | @rm -f stamp-h1 |
340 | cd $(top_builddir) && $(SHELL) ./config.status config.h |
341 | -$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) |
342 | +$(srcdir)/config.h.in: $(am__configure_deps) |
343 | ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) |
344 | rm -f stamp-h1 |
345 | touch $@ |
346 | @@ -376,14 +440,13 @@ |
347 | # (1) if the variable is set in 'config.status', edit 'config.status' |
348 | # (which will cause the Makefiles to be regenerated when you run 'make'); |
349 | # (2) otherwise, pass the desired values on the 'make' command line. |
350 | -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): |
351 | - @fail= failcom='exit 1'; \ |
352 | - for f in x $$MAKEFLAGS; do \ |
353 | - case $$f in \ |
354 | - *=* | --[!k]*);; \ |
355 | - *k*) failcom='fail=yes';; \ |
356 | - esac; \ |
357 | - done; \ |
358 | +$(am__recursive_targets): |
359 | + @fail=; \ |
360 | + if $(am__make_keepgoing); then \ |
361 | + failcom='fail=yes'; \ |
362 | + else \ |
363 | + failcom='exit 1'; \ |
364 | + fi; \ |
365 | dot_seen=no; \ |
366 | target=`echo $@ | sed s/-recursive//`; \ |
367 | case "$@" in \ |
368 | @@ -404,31 +467,13 @@ |
369 | if test "$$dot_seen" = "no"; then \ |
370 | $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ |
371 | fi; test -z "$$fail" |
372 | -tags-recursive: |
373 | - list='$(SUBDIRS)'; for subdir in $$list; do \ |
374 | - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ |
375 | - done |
376 | -ctags-recursive: |
377 | - list='$(SUBDIRS)'; for subdir in $$list; do \ |
378 | - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ |
379 | - done |
380 | -cscopelist-recursive: |
381 | - list='$(SUBDIRS)'; for subdir in $$list; do \ |
382 | - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ |
383 | - done |
384 | - |
385 | -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) |
386 | - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
387 | - unique=`for i in $$list; do \ |
388 | - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
389 | - done | \ |
390 | - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
391 | - END { if (nonempty) { for (i in files) print i; }; }'`; \ |
392 | - mkid -fID $$unique |
393 | -tags: TAGS |
394 | - |
395 | -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ |
396 | - $(TAGS_FILES) $(LISP) |
397 | + |
398 | +ID: $(am__tagged_files) |
399 | + $(am__define_uniq_tagged_files); mkid -fID $$unique |
400 | +tags: tags-recursive |
401 | +TAGS: tags |
402 | + |
403 | +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) |
404 | set x; \ |
405 | here=`pwd`; \ |
406 | if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ |
407 | @@ -444,12 +489,7 @@ |
408 | set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ |
409 | fi; \ |
410 | done; \ |
411 | - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ |
412 | - unique=`for i in $$list; do \ |
413 | - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
414 | - done | \ |
415 | - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
416 | - END { if (nonempty) { for (i in files) print i; }; }'`; \ |
417 | + $(am__define_uniq_tagged_files); \ |
418 | shift; \ |
419 | if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ |
420 | test -n "$$unique" || unique=$$empty_fix; \ |
421 | @@ -461,15 +501,11 @@ |
422 | $$unique; \ |
423 | fi; \ |
424 | fi |
425 | -ctags: CTAGS |
426 | -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ |
427 | - $(TAGS_FILES) $(LISP) |
428 | - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ |
429 | - unique=`for i in $$list; do \ |
430 | - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
431 | - done | \ |
432 | - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
433 | - END { if (nonempty) { for (i in files) print i; }; }'`; \ |
434 | +ctags: ctags-recursive |
435 | + |
436 | +CTAGS: ctags |
437 | +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) |
438 | + $(am__define_uniq_tagged_files); \ |
439 | test -z "$(CTAGS_ARGS)$$unique" \ |
440 | || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ |
441 | $$unique |
442 | @@ -478,18 +514,16 @@ |
443 | here=`$(am__cd) $(top_builddir) && pwd` \ |
444 | && $(am__cd) $(top_srcdir) \ |
445 | && gtags -i $(GTAGS_ARGS) "$$here" |
446 | - |
447 | cscope: cscope.files |
448 | test ! -s cscope.files \ |
449 | || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) |
450 | - |
451 | clean-cscope: |
452 | -rm -f cscope.files |
453 | - |
454 | -cscope.files: clean-cscope cscopelist-recursive cscopelist |
455 | - |
456 | -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) |
457 | - list='$(SOURCES) $(HEADERS) $(LISP)'; \ |
458 | +cscope.files: clean-cscope cscopelist |
459 | +cscopelist: cscopelist-recursive |
460 | + |
461 | +cscopelist-am: $(am__tagged_files) |
462 | + list='$(am__tagged_files)'; \ |
463 | case "$(srcdir)" in \ |
464 | [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ |
465 | *) sdir=$(subdir)/$(srcdir) ;; \ |
466 | @@ -589,10 +623,16 @@ |
467 | $(am__post_remove_distdir) |
468 | |
469 | dist-tarZ: distdir |
470 | + @echo WARNING: "Support for shar distribution archives is" \ |
471 | + "deprecated." >&2 |
472 | + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 |
473 | tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z |
474 | $(am__post_remove_distdir) |
475 | |
476 | dist-shar: distdir |
477 | + @echo WARNING: "Support for distribution archives compressed with" \ |
478 | + "legacy program 'compress' is deprecated." >&2 |
479 | + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 |
480 | shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz |
481 | $(am__post_remove_distdir) |
482 | |
483 | @@ -797,27 +837,25 @@ |
484 | |
485 | uninstall-am: uninstall-pkgconfigDATA |
486 | |
487 | -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ |
488 | - cscopelist-recursive ctags-recursive install-am install-strip \ |
489 | - tags-recursive |
490 | +.MAKE: $(am__recursive_targets) all install-am install-strip |
491 | |
492 | -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ |
493 | - all all-am am--refresh check check-am clean clean-cscope \ |
494 | - clean-generic clean-libtool cscope cscopelist \ |
495 | - cscopelist-recursive ctags ctags-recursive dist dist-all \ |
496 | - dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar dist-tarZ \ |
497 | - dist-xz dist-zip distcheck distclean distclean-generic \ |
498 | - distclean-hdr distclean-libtool distclean-tags distcleancheck \ |
499 | - distdir distuninstallcheck dvi dvi-am html html-am info \ |
500 | - info-am install install-am install-data install-data-am \ |
501 | - install-dvi install-dvi-am install-exec install-exec-am \ |
502 | - install-html install-html-am install-info install-info-am \ |
503 | - install-man install-pdf install-pdf-am install-pkgconfigDATA \ |
504 | - install-ps install-ps-am install-strip installcheck \ |
505 | - installcheck-am installdirs installdirs-am maintainer-clean \ |
506 | - maintainer-clean-generic mostlyclean mostlyclean-generic \ |
507 | - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ |
508 | - uninstall uninstall-am uninstall-pkgconfigDATA |
509 | +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ |
510 | + am--refresh check check-am clean clean-cscope clean-generic \ |
511 | + clean-libtool cscope cscopelist-am ctags ctags-am dist \ |
512 | + dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \ |
513 | + dist-tarZ dist-xz dist-zip distcheck distclean \ |
514 | + distclean-generic distclean-hdr distclean-libtool \ |
515 | + distclean-tags distcleancheck distdir distuninstallcheck dvi \ |
516 | + dvi-am html html-am info info-am install install-am \ |
517 | + install-data install-data-am install-dvi install-dvi-am \ |
518 | + install-exec install-exec-am install-html install-html-am \ |
519 | + install-info install-info-am install-man install-pdf \ |
520 | + install-pdf-am install-pkgconfigDATA install-ps install-ps-am \ |
521 | + install-strip installcheck installcheck-am installdirs \ |
522 | + installdirs-am maintainer-clean maintainer-clean-generic \ |
523 | + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ |
524 | + ps ps-am tags tags-am uninstall uninstall-am \ |
525 | + uninstall-pkgconfigDATA |
526 | |
527 | |
528 | .PHONY: ChangeLog INSTALL |
529 | |
530 | === modified file 'aclocal.m4' |
531 | --- aclocal.m4 2012-09-05 01:22:39 +0000 |
532 | +++ aclocal.m4 2013-10-26 22:20:55 +0000 |
533 | @@ -1,6 +1,6 @@ |
534 | -# generated automatically by aclocal 1.12.3 -*- Autoconf -*- |
535 | +# generated automatically by aclocal 1.14 -*- Autoconf -*- |
536 | |
537 | -# Copyright (C) 1996-2012 Free Software Foundation, Inc. |
538 | +# Copyright (C) 1996-2013 Free Software Foundation, Inc. |
539 | |
540 | # This file is free software; the Free Software Foundation |
541 | # gives unlimited permission to copy and/or distribute it, |
542 | @@ -11,6 +11,7 @@ |
543 | # even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
544 | # PARTICULAR PURPOSE. |
545 | |
546 | +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) |
547 | m4_ifndef([AC_AUTOCONF_VERSION], |
548 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
549 | m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, |
550 | @@ -8606,7 +8607,7 @@ |
551 | m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) |
552 | m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) |
553 | |
554 | -# Copyright (C) 2002-2012 Free Software Foundation, Inc. |
555 | +# Copyright (C) 2002-2013 Free Software Foundation, Inc. |
556 | # |
557 | # This file is free software; the Free Software Foundation |
558 | # gives unlimited permission to copy and/or distribute it, |
559 | @@ -8618,10 +8619,10 @@ |
560 | # generated from the m4 files accompanying Automake X.Y. |
561 | # (This private macro should not be called outside this file.) |
562 | AC_DEFUN([AM_AUTOMAKE_VERSION], |
563 | -[am__api_version='1.12' |
564 | +[am__api_version='1.14' |
565 | dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to |
566 | dnl require some minimum version. Point them to the right macro. |
567 | -m4_if([$1], [1.12.3], [], |
568 | +m4_if([$1], [1.14], [], |
569 | [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl |
570 | ]) |
571 | |
572 | @@ -8637,14 +8638,14 @@ |
573 | # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. |
574 | # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. |
575 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], |
576 | -[AM_AUTOMAKE_VERSION([1.12.3])dnl |
577 | +[AM_AUTOMAKE_VERSION([1.14])dnl |
578 | m4_ifndef([AC_AUTOCONF_VERSION], |
579 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
580 | _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) |
581 | |
582 | # AM_AUX_DIR_EXPAND -*- Autoconf -*- |
583 | |
584 | -# Copyright (C) 2001-2012 Free Software Foundation, Inc. |
585 | +# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
586 | # |
587 | # This file is free software; the Free Software Foundation |
588 | # gives unlimited permission to copy and/or distribute it, |
589 | @@ -8697,7 +8698,7 @@ |
590 | |
591 | # AM_CONDITIONAL -*- Autoconf -*- |
592 | |
593 | -# Copyright (C) 1997-2012 Free Software Foundation, Inc. |
594 | +# Copyright (C) 1997-2013 Free Software Foundation, Inc. |
595 | # |
596 | # This file is free software; the Free Software Foundation |
597 | # gives unlimited permission to copy and/or distribute it, |
598 | @@ -8728,7 +8729,7 @@ |
599 | Usually this means the macro was only invoked conditionally.]]) |
600 | fi])]) |
601 | |
602 | -# Copyright (C) 1999-2012 Free Software Foundation, Inc. |
603 | +# Copyright (C) 1999-2013 Free Software Foundation, Inc. |
604 | # |
605 | # This file is free software; the Free Software Foundation |
606 | # gives unlimited permission to copy and/or distribute it, |
607 | @@ -8919,7 +8920,7 @@ |
608 | |
609 | # Generate code to set up dependency tracking. -*- Autoconf -*- |
610 | |
611 | -# Copyright (C) 1999-2012 Free Software Foundation, Inc. |
612 | +# Copyright (C) 1999-2013 Free Software Foundation, Inc. |
613 | # |
614 | # This file is free software; the Free Software Foundation |
615 | # gives unlimited permission to copy and/or distribute it, |
616 | @@ -8930,7 +8931,7 @@ |
617 | # ------------------------------ |
618 | AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], |
619 | [{ |
620 | - # Autoconf 2.62 quotes --file arguments for eval, but not when files |
621 | + # Older Autoconf quotes --file arguments for eval, but not when files |
622 | # are listed without --file. Let's play safe and only enable the eval |
623 | # if we detect the quoting. |
624 | case $CONFIG_FILES in |
625 | @@ -8959,7 +8960,7 @@ |
626 | DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` |
627 | test -z "$DEPDIR" && continue |
628 | am__include=`sed -n 's/^am__include = //p' < "$mf"` |
629 | - test -z "am__include" && continue |
630 | + test -z "$am__include" && continue |
631 | am__quote=`sed -n 's/^am__quote = //p' < "$mf"` |
632 | # Find all dependency output files, they are included files with |
633 | # $(DEPDIR) in their names. We invoke sed twice because it is the |
634 | @@ -8995,7 +8996,7 @@ |
635 | |
636 | # Do all the work for Automake. -*- Autoconf -*- |
637 | |
638 | -# Copyright (C) 1996-2012 Free Software Foundation, Inc. |
639 | +# Copyright (C) 1996-2013 Free Software Foundation, Inc. |
640 | # |
641 | # This file is free software; the Free Software Foundation |
642 | # gives unlimited permission to copy and/or distribute it, |
643 | @@ -9004,6 +9005,12 @@ |
644 | # This macro actually does too much. Some checks are only needed if |
645 | # your package does certain things. But this isn't really a big deal. |
646 | |
647 | +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. |
648 | +m4_define([AC_PROG_CC], |
649 | +m4_defn([AC_PROG_CC]) |
650 | +[_AM_PROG_CC_C_O |
651 | +]) |
652 | + |
653 | # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) |
654 | # AM_INIT_AUTOMAKE([OPTIONS]) |
655 | # ----------------------------------------------- |
656 | @@ -9016,7 +9023,7 @@ |
657 | # arguments mandatory, and then we can depend on a new Autoconf |
658 | # release and drop the old call support. |
659 | AC_DEFUN([AM_INIT_AUTOMAKE], |
660 | -[AC_PREREQ([2.62])dnl |
661 | +[AC_PREREQ([2.65])dnl |
662 | dnl Autoconf wants to disallow AM_ names. We explicitly allow |
663 | dnl the ones we care about. |
664 | m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl |
665 | @@ -9046,8 +9053,7 @@ |
666 | dnl Distinguish between old-style and new-style calls. |
667 | m4_ifval([$2], |
668 | [AC_DIAGNOSE([obsolete], |
669 | -[$0: two- and three-arguments forms are deprecated. For more info, see: |
670 | -http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_INIT_AUTOMAKE-invocation]) |
671 | + [$0: two- and three-arguments forms are deprecated.]) |
672 | m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl |
673 | AC_SUBST([PACKAGE], [$1])dnl |
674 | AC_SUBST([VERSION], [$2])], |
675 | @@ -9101,22 +9107,60 @@ |
676 | [_AM_DEPENDENCIES([OBJC])], |
677 | [m4_define([AC_PROG_OBJC], |
678 | m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl |
679 | -dnl Support for Objective C++ was only introduced in Autoconf 2.65, |
680 | -dnl but we still cater to Autoconf 2.62. |
681 | -m4_ifdef([AC_PROG_OBJCXX], |
682 | -[AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], |
683 | +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], |
684 | [_AM_DEPENDENCIES([OBJCXX])], |
685 | [m4_define([AC_PROG_OBJCXX], |
686 | - m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])])dnl |
687 | + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl |
688 | ]) |
689 | -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl |
690 | -dnl The 'parallel-tests' driver may need to know about EXEEXT, so add the |
691 | -dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro |
692 | -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. |
693 | +AC_REQUIRE([AM_SILENT_RULES])dnl |
694 | +dnl The testsuite driver may need to know about EXEEXT, so add the |
695 | +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This |
696 | +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. |
697 | AC_CONFIG_COMMANDS_PRE(dnl |
698 | [m4_provide_if([_AM_COMPILER_EXEEXT], |
699 | [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl |
700 | -]) |
701 | + |
702 | +# POSIX will say in a future version that running "rm -f" with no argument |
703 | +# is OK; and we want to be able to make that assumption in our Makefile |
704 | +# recipes. So use an aggressive probe to check that the usage we want is |
705 | +# actually supported "in the wild" to an acceptable degree. |
706 | +# See automake bug#10828. |
707 | +# To make any issue more visible, cause the running configure to be aborted |
708 | +# by default if the 'rm' program in use doesn't match our expectations; the |
709 | +# user can still override this though. |
710 | +if rm -f && rm -fr && rm -rf; then : OK; else |
711 | + cat >&2 <<'END' |
712 | +Oops! |
713 | + |
714 | +Your 'rm' program seems unable to run without file operands specified |
715 | +on the command line, even when the '-f' option is present. This is contrary |
716 | +to the behaviour of most rm programs out there, and not conforming with |
717 | +the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542> |
718 | + |
719 | +Please tell bug-automake@gnu.org about your system, including the value |
720 | +of your $PATH and any error possibly output before this message. This |
721 | +can help us improve future automake versions. |
722 | + |
723 | +END |
724 | + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then |
725 | + echo 'Configuration will proceed anyway, since you have set the' >&2 |
726 | + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 |
727 | + echo >&2 |
728 | + else |
729 | + cat >&2 <<'END' |
730 | +Aborting the configuration process, to ensure you take notice of the issue. |
731 | + |
732 | +You can download and install GNU coreutils to get an 'rm' implementation |
733 | +that behaves properly: <http://www.gnu.org/software/coreutils/>. |
734 | + |
735 | +If you want to complete the configuration process using your problematic |
736 | +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM |
737 | +to "yes", and re-run configure. |
738 | + |
739 | +END |
740 | + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) |
741 | + fi |
742 | +fi]) |
743 | |
744 | dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not |
745 | dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further |
746 | @@ -9124,7 +9168,6 @@ |
747 | m4_define([_AC_COMPILER_EXEEXT], |
748 | m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) |
749 | |
750 | - |
751 | # When config.status generates a header, we must update the stamp-h file. |
752 | # This file resides in the same directory as the config header |
753 | # that is generated. The stamp files are numbered to have different names. |
754 | @@ -9146,7 +9189,7 @@ |
755 | done |
756 | echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) |
757 | |
758 | -# Copyright (C) 2001-2012 Free Software Foundation, Inc. |
759 | +# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
760 | # |
761 | # This file is free software; the Free Software Foundation |
762 | # gives unlimited permission to copy and/or distribute it, |
763 | @@ -9167,7 +9210,7 @@ |
764 | fi |
765 | AC_SUBST([install_sh])]) |
766 | |
767 | -# Copyright (C) 2003-2012 Free Software Foundation, Inc. |
768 | +# Copyright (C) 2003-2013 Free Software Foundation, Inc. |
769 | # |
770 | # This file is free software; the Free Software Foundation |
771 | # gives unlimited permission to copy and/or distribute it, |
772 | @@ -9186,47 +9229,9 @@ |
773 | rmdir .tst 2>/dev/null |
774 | AC_SUBST([am__leading_dot])]) |
775 | |
776 | -# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- |
777 | -# From Jim Meyering |
778 | - |
779 | -# Copyright (C) 1996-2012 Free Software Foundation, Inc. |
780 | -# |
781 | -# This file is free software; the Free Software Foundation |
782 | -# gives unlimited permission to copy and/or distribute it, |
783 | -# with or without modifications, as long as this notice is preserved. |
784 | - |
785 | -# AM_MAINTAINER_MODE([DEFAULT-MODE]) |
786 | -# ---------------------------------- |
787 | -# Control maintainer-specific portions of Makefiles. |
788 | -# Default is to disable them, unless 'enable' is passed literally. |
789 | -# For symmetry, 'disable' may be passed as well. Anyway, the user |
790 | -# can override the default with the --enable/--disable switch. |
791 | -AC_DEFUN([AM_MAINTAINER_MODE], |
792 | -[m4_case(m4_default([$1], [disable]), |
793 | - [enable], [m4_define([am_maintainer_other], [disable])], |
794 | - [disable], [m4_define([am_maintainer_other], [enable])], |
795 | - [m4_define([am_maintainer_other], [enable]) |
796 | - m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) |
797 | -AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) |
798 | - dnl maintainer-mode's default is 'disable' unless 'enable' is passed |
799 | - AC_ARG_ENABLE([maintainer-mode], |
800 | - [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode], |
801 | - am_maintainer_other[ make rules and dependencies not useful |
802 | - (and sometimes confusing) to the casual installer])], |
803 | - [USE_MAINTAINER_MODE=$enableval], |
804 | - [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) |
805 | - AC_MSG_RESULT([$USE_MAINTAINER_MODE]) |
806 | - AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) |
807 | - MAINT=$MAINTAINER_MODE_TRUE |
808 | - AC_SUBST([MAINT])dnl |
809 | -] |
810 | -) |
811 | - |
812 | -AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) |
813 | - |
814 | # Check to see how 'make' treats includes. -*- Autoconf -*- |
815 | |
816 | -# Copyright (C) 2001-2012 Free Software Foundation, Inc. |
817 | +# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
818 | # |
819 | # This file is free software; the Free Software Foundation |
820 | # gives unlimited permission to copy and/or distribute it, |
821 | @@ -9276,7 +9281,7 @@ |
822 | |
823 | # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- |
824 | |
825 | -# Copyright (C) 1997-2012 Free Software Foundation, Inc. |
826 | +# Copyright (C) 1997-2013 Free Software Foundation, Inc. |
827 | # |
828 | # This file is free software; the Free Software Foundation |
829 | # gives unlimited permission to copy and/or distribute it, |
830 | @@ -9291,8 +9296,8 @@ |
831 | |
832 | # AM_MISSING_HAS_RUN |
833 | # ------------------ |
834 | -# Define MISSING if not defined so far and test if it supports --run. |
835 | -# If it does, set am_missing_run to use it, otherwise, to nothing. |
836 | +# Define MISSING if not defined so far and test if it is modern enough. |
837 | +# If it is, set am_missing_run to use it, otherwise, to nothing. |
838 | AC_DEFUN([AM_MISSING_HAS_RUN], |
839 | [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl |
840 | AC_REQUIRE_AUX_FILE([missing])dnl |
841 | @@ -9305,8 +9310,8 @@ |
842 | esac |
843 | fi |
844 | # Use eval to expand $SHELL |
845 | -if eval "$MISSING --run true"; then |
846 | - am_missing_run="$MISSING --run " |
847 | +if eval "$MISSING --is-lightweight"; then |
848 | + am_missing_run="$MISSING " |
849 | else |
850 | am_missing_run= |
851 | AC_MSG_WARN(['missing' script is too old or missing]) |
852 | @@ -9315,7 +9320,7 @@ |
853 | |
854 | # Helper functions for option handling. -*- Autoconf -*- |
855 | |
856 | -# Copyright (C) 2001-2012 Free Software Foundation, Inc. |
857 | +# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
858 | # |
859 | # This file is free software; the Free Software Foundation |
860 | # gives unlimited permission to copy and/or distribute it, |
861 | @@ -9344,9 +9349,73 @@ |
862 | AC_DEFUN([_AM_IF_OPTION], |
863 | [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) |
864 | |
865 | +# Copyright (C) 1999-2013 Free Software Foundation, Inc. |
866 | +# |
867 | +# This file is free software; the Free Software Foundation |
868 | +# gives unlimited permission to copy and/or distribute it, |
869 | +# with or without modifications, as long as this notice is preserved. |
870 | + |
871 | +# _AM_PROG_CC_C_O |
872 | +# --------------- |
873 | +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC |
874 | +# to automatically call this. |
875 | +AC_DEFUN([_AM_PROG_CC_C_O], |
876 | +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl |
877 | +AC_REQUIRE_AUX_FILE([compile])dnl |
878 | +AC_LANG_PUSH([C])dnl |
879 | +AC_CACHE_CHECK( |
880 | + [whether $CC understands -c and -o together], |
881 | + [am_cv_prog_cc_c_o], |
882 | + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) |
883 | + # Make sure it works both with $CC and with simple cc. |
884 | + # Following AC_PROG_CC_C_O, we do the test twice because some |
885 | + # compilers refuse to overwrite an existing .o file with -o, |
886 | + # though they will create one. |
887 | + am_cv_prog_cc_c_o=yes |
888 | + for am_i in 1 2; do |
889 | + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ |
890 | + && test -f conftest2.$ac_objext; then |
891 | + : OK |
892 | + else |
893 | + am_cv_prog_cc_c_o=no |
894 | + break |
895 | + fi |
896 | + done |
897 | + rm -f core conftest* |
898 | + unset am_i]) |
899 | +if test "$am_cv_prog_cc_c_o" != yes; then |
900 | + # Losing compiler, so override with the script. |
901 | + # FIXME: It is wrong to rewrite CC. |
902 | + # But if we don't then we get into trouble of one sort or another. |
903 | + # A longer-term fix would be to have automake use am__CC in this case, |
904 | + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" |
905 | + CC="$am_aux_dir/compile $CC" |
906 | +fi |
907 | +AC_LANG_POP([C])]) |
908 | + |
909 | +# For backward compatibility. |
910 | +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) |
911 | + |
912 | +# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
913 | +# |
914 | +# This file is free software; the Free Software Foundation |
915 | +# gives unlimited permission to copy and/or distribute it, |
916 | +# with or without modifications, as long as this notice is preserved. |
917 | + |
918 | +# AM_RUN_LOG(COMMAND) |
919 | +# ------------------- |
920 | +# Run COMMAND, save the exit status in ac_status, and log it. |
921 | +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) |
922 | +AC_DEFUN([AM_RUN_LOG], |
923 | +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD |
924 | + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD |
925 | + ac_status=$? |
926 | + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD |
927 | + (exit $ac_status); }]) |
928 | + |
929 | # Check to make sure that the build environment is sane. -*- Autoconf -*- |
930 | |
931 | -# Copyright (C) 1996-2012 Free Software Foundation, Inc. |
932 | +# Copyright (C) 1996-2013 Free Software Foundation, Inc. |
933 | # |
934 | # This file is free software; the Free Software Foundation |
935 | # gives unlimited permission to copy and/or distribute it, |
936 | @@ -9427,7 +9496,67 @@ |
937 | rm -f conftest.file |
938 | ]) |
939 | |
940 | -# Copyright (C) 2001-2012 Free Software Foundation, Inc. |
941 | +# Copyright (C) 2009-2013 Free Software Foundation, Inc. |
942 | +# |
943 | +# This file is free software; the Free Software Foundation |
944 | +# gives unlimited permission to copy and/or distribute it, |
945 | +# with or without modifications, as long as this notice is preserved. |
946 | + |
947 | +# AM_SILENT_RULES([DEFAULT]) |
948 | +# -------------------------- |
949 | +# Enable less verbose build rules; with the default set to DEFAULT |
950 | +# ("yes" being less verbose, "no" or empty being verbose). |
951 | +AC_DEFUN([AM_SILENT_RULES], |
952 | +[AC_ARG_ENABLE([silent-rules], [dnl |
953 | +AS_HELP_STRING( |
954 | + [--enable-silent-rules], |
955 | + [less verbose build output (undo: "make V=1")]) |
956 | +AS_HELP_STRING( |
957 | + [--disable-silent-rules], |
958 | + [verbose build output (undo: "make V=0")])dnl |
959 | +]) |
960 | +case $enable_silent_rules in @%:@ ((( |
961 | + yes) AM_DEFAULT_VERBOSITY=0;; |
962 | + no) AM_DEFAULT_VERBOSITY=1;; |
963 | + *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; |
964 | +esac |
965 | +dnl |
966 | +dnl A few 'make' implementations (e.g., NonStop OS and NextStep) |
967 | +dnl do not support nested variable expansions. |
968 | +dnl See automake bug#9928 and bug#10237. |
969 | +am_make=${MAKE-make} |
970 | +AC_CACHE_CHECK([whether $am_make supports nested variables], |
971 | + [am_cv_make_support_nested_variables], |
972 | + [if AS_ECHO([['TRUE=$(BAR$(V)) |
973 | +BAR0=false |
974 | +BAR1=true |
975 | +V=1 |
976 | +am__doit: |
977 | + @$(TRUE) |
978 | +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then |
979 | + am_cv_make_support_nested_variables=yes |
980 | +else |
981 | + am_cv_make_support_nested_variables=no |
982 | +fi]) |
983 | +if test $am_cv_make_support_nested_variables = yes; then |
984 | + dnl Using '$V' instead of '$(V)' breaks IRIX make. |
985 | + AM_V='$(V)' |
986 | + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' |
987 | +else |
988 | + AM_V=$AM_DEFAULT_VERBOSITY |
989 | + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY |
990 | +fi |
991 | +AC_SUBST([AM_V])dnl |
992 | +AM_SUBST_NOTMAKE([AM_V])dnl |
993 | +AC_SUBST([AM_DEFAULT_V])dnl |
994 | +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl |
995 | +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl |
996 | +AM_BACKSLASH='\' |
997 | +AC_SUBST([AM_BACKSLASH])dnl |
998 | +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl |
999 | +]) |
1000 | + |
1001 | +# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
1002 | # |
1003 | # This file is free software; the Free Software Foundation |
1004 | # gives unlimited permission to copy and/or distribute it, |
1005 | @@ -9455,7 +9584,7 @@ |
1006 | INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" |
1007 | AC_SUBST([INSTALL_STRIP_PROGRAM])]) |
1008 | |
1009 | -# Copyright (C) 2006-2012 Free Software Foundation, Inc. |
1010 | +# Copyright (C) 2006-2013 Free Software Foundation, Inc. |
1011 | # |
1012 | # This file is free software; the Free Software Foundation |
1013 | # gives unlimited permission to copy and/or distribute it, |
1014 | @@ -9474,7 +9603,7 @@ |
1015 | |
1016 | # Check how to create a tarball. -*- Autoconf -*- |
1017 | |
1018 | -# Copyright (C) 2004-2012 Free Software Foundation, Inc. |
1019 | +# Copyright (C) 2004-2013 Free Software Foundation, Inc. |
1020 | # |
1021 | # This file is free software; the Free Software Foundation |
1022 | # gives unlimited permission to copy and/or distribute it, |
1023 | @@ -9493,76 +9622,114 @@ |
1024 | # Substitute a variable $(am__untar) that extract such |
1025 | # a tarball read from stdin. |
1026 | # $(am__untar) < result.tar |
1027 | +# |
1028 | AC_DEFUN([_AM_PROG_TAR], |
1029 | [# Always define AMTAR for backward compatibility. Yes, it's still used |
1030 | # in the wild :-( We should find a proper way to deprecate it ... |
1031 | AC_SUBST([AMTAR], ['$${TAR-tar}']) |
1032 | + |
1033 | +# We'll loop over all known methods to create a tar archive until one works. |
1034 | +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' |
1035 | + |
1036 | m4_if([$1], [v7], |
1037 | - [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], |
1038 | - [m4_case([$1], [ustar],, [pax],, |
1039 | - [m4_fatal([Unknown tar format])]) |
1040 | -AC_MSG_CHECKING([how to create a $1 tar archive]) |
1041 | -# Loop over all known methods to create a tar archive until one works. |
1042 | -_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' |
1043 | -_am_tools=${am_cv_prog_tar_$1-$_am_tools} |
1044 | -# Do not fold the above two line into one, because Tru64 sh and |
1045 | -# Solaris sh will not grok spaces in the rhs of '-'. |
1046 | -for _am_tool in $_am_tools |
1047 | -do |
1048 | - case $_am_tool in |
1049 | - gnutar) |
1050 | - for _am_tar in tar gnutar gtar; |
1051 | - do |
1052 | - AM_RUN_LOG([$_am_tar --version]) && break |
1053 | - done |
1054 | - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' |
1055 | - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' |
1056 | - am__untar="$_am_tar -xf -" |
1057 | - ;; |
1058 | - plaintar) |
1059 | - # Must skip GNU tar: if it does not support --format= it doesn't create |
1060 | - # ustar tarball either. |
1061 | - (tar --version) >/dev/null 2>&1 && continue |
1062 | - am__tar='tar chf - "$$tardir"' |
1063 | - am__tar_='tar chf - "$tardir"' |
1064 | - am__untar='tar xf -' |
1065 | - ;; |
1066 | - pax) |
1067 | - am__tar='pax -L -x $1 -w "$$tardir"' |
1068 | - am__tar_='pax -L -x $1 -w "$tardir"' |
1069 | - am__untar='pax -r' |
1070 | - ;; |
1071 | - cpio) |
1072 | - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' |
1073 | - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' |
1074 | - am__untar='cpio -i -H $1 -d' |
1075 | - ;; |
1076 | - none) |
1077 | - am__tar=false |
1078 | - am__tar_=false |
1079 | - am__untar=false |
1080 | - ;; |
1081 | - esac |
1082 | - |
1083 | - # If the value was cached, stop now. We just wanted to have am__tar |
1084 | - # and am__untar set. |
1085 | - test -n "${am_cv_prog_tar_$1}" && break |
1086 | - |
1087 | - # tar/untar a dummy directory, and stop if the command works |
1088 | - rm -rf conftest.dir |
1089 | - mkdir conftest.dir |
1090 | - echo GrepMe > conftest.dir/file |
1091 | - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) |
1092 | - rm -rf conftest.dir |
1093 | - if test -s conftest.tar; then |
1094 | - AM_RUN_LOG([$am__untar <conftest.tar]) |
1095 | - grep GrepMe conftest.dir/file >/dev/null 2>&1 && break |
1096 | - fi |
1097 | -done |
1098 | -rm -rf conftest.dir |
1099 | - |
1100 | -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) |
1101 | -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) |
1102 | + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], |
1103 | + |
1104 | + [m4_case([$1], |
1105 | + [ustar], |
1106 | + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. |
1107 | + # There is notably a 21 bits limit for the UID and the GID. In fact, |
1108 | + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 |
1109 | + # and bug#13588). |
1110 | + am_max_uid=2097151 # 2^21 - 1 |
1111 | + am_max_gid=$am_max_uid |
1112 | + # The $UID and $GID variables are not portable, so we need to resort |
1113 | + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls |
1114 | + # below are definitely unexpected, so allow the users to see them |
1115 | + # (that is, avoid stderr redirection). |
1116 | + am_uid=`id -u || echo unknown` |
1117 | + am_gid=`id -g || echo unknown` |
1118 | + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) |
1119 | + if test $am_uid -le $am_max_uid; then |
1120 | + AC_MSG_RESULT([yes]) |
1121 | + else |
1122 | + AC_MSG_RESULT([no]) |
1123 | + _am_tools=none |
1124 | + fi |
1125 | + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) |
1126 | + if test $am_gid -le $am_max_gid; then |
1127 | + AC_MSG_RESULT([yes]) |
1128 | + else |
1129 | + AC_MSG_RESULT([no]) |
1130 | + _am_tools=none |
1131 | + fi], |
1132 | + |
1133 | + [pax], |
1134 | + [], |
1135 | + |
1136 | + [m4_fatal([Unknown tar format])]) |
1137 | + |
1138 | + AC_MSG_CHECKING([how to create a $1 tar archive]) |
1139 | + |
1140 | + # Go ahead even if we have the value already cached. We do so because we |
1141 | + # need to set the values for the 'am__tar' and 'am__untar' variables. |
1142 | + _am_tools=${am_cv_prog_tar_$1-$_am_tools} |
1143 | + |
1144 | + for _am_tool in $_am_tools; do |
1145 | + case $_am_tool in |
1146 | + gnutar) |
1147 | + for _am_tar in tar gnutar gtar; do |
1148 | + AM_RUN_LOG([$_am_tar --version]) && break |
1149 | + done |
1150 | + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' |
1151 | + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' |
1152 | + am__untar="$_am_tar -xf -" |
1153 | + ;; |
1154 | + plaintar) |
1155 | + # Must skip GNU tar: if it does not support --format= it doesn't create |
1156 | + # ustar tarball either. |
1157 | + (tar --version) >/dev/null 2>&1 && continue |
1158 | + am__tar='tar chf - "$$tardir"' |
1159 | + am__tar_='tar chf - "$tardir"' |
1160 | + am__untar='tar xf -' |
1161 | + ;; |
1162 | + pax) |
1163 | + am__tar='pax -L -x $1 -w "$$tardir"' |
1164 | + am__tar_='pax -L -x $1 -w "$tardir"' |
1165 | + am__untar='pax -r' |
1166 | + ;; |
1167 | + cpio) |
1168 | + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' |
1169 | + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' |
1170 | + am__untar='cpio -i -H $1 -d' |
1171 | + ;; |
1172 | + none) |
1173 | + am__tar=false |
1174 | + am__tar_=false |
1175 | + am__untar=false |
1176 | + ;; |
1177 | + esac |
1178 | + |
1179 | + # If the value was cached, stop now. We just wanted to have am__tar |
1180 | + # and am__untar set. |
1181 | + test -n "${am_cv_prog_tar_$1}" && break |
1182 | + |
1183 | + # tar/untar a dummy directory, and stop if the command works. |
1184 | + rm -rf conftest.dir |
1185 | + mkdir conftest.dir |
1186 | + echo GrepMe > conftest.dir/file |
1187 | + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) |
1188 | + rm -rf conftest.dir |
1189 | + if test -s conftest.tar; then |
1190 | + AM_RUN_LOG([$am__untar <conftest.tar]) |
1191 | + AM_RUN_LOG([cat conftest.dir/file]) |
1192 | + grep GrepMe conftest.dir/file >/dev/null 2>&1 && break |
1193 | + fi |
1194 | + done |
1195 | + rm -rf conftest.dir |
1196 | + |
1197 | + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) |
1198 | + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) |
1199 | + |
1200 | AC_SUBST([am__tar]) |
1201 | AC_SUBST([am__untar]) |
1202 | ]) # _AM_PROG_TAR |
1203 | |
1204 | === added file 'config-aux/compile' |
1205 | --- config-aux/compile 1970-01-01 00:00:00 +0000 |
1206 | +++ config-aux/compile 2013-10-26 22:20:55 +0000 |
1207 | @@ -0,0 +1,347 @@ |
1208 | +#! /bin/sh |
1209 | +# Wrapper for compilers which do not understand '-c -o'. |
1210 | + |
1211 | +scriptversion=2012-10-14.11; # UTC |
1212 | + |
1213 | +# Copyright (C) 1999-2013 Free Software Foundation, Inc. |
1214 | +# Written by Tom Tromey <tromey@cygnus.com>. |
1215 | +# |
1216 | +# This program is free software; you can redistribute it and/or modify |
1217 | +# it under the terms of the GNU General Public License as published by |
1218 | +# the Free Software Foundation; either version 2, or (at your option) |
1219 | +# any later version. |
1220 | +# |
1221 | +# This program is distributed in the hope that it will be useful, |
1222 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
1223 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
1224 | +# GNU General Public License for more details. |
1225 | +# |
1226 | +# You should have received a copy of the GNU General Public License |
1227 | +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
1228 | + |
1229 | +# As a special exception to the GNU General Public License, if you |
1230 | +# distribute this file as part of a program that contains a |
1231 | +# configuration script generated by Autoconf, you may include it under |
1232 | +# the same distribution terms that you use for the rest of that program. |
1233 | + |
1234 | +# This file is maintained in Automake, please report |
1235 | +# bugs to <bug-automake@gnu.org> or send patches to |
1236 | +# <automake-patches@gnu.org>. |
1237 | + |
1238 | +nl=' |
1239 | +' |
1240 | + |
1241 | +# We need space, tab and new line, in precisely that order. Quoting is |
1242 | +# there to prevent tools from complaining about whitespace usage. |
1243 | +IFS=" "" $nl" |
1244 | + |
1245 | +file_conv= |
1246 | + |
1247 | +# func_file_conv build_file lazy |
1248 | +# Convert a $build file to $host form and store it in $file |
1249 | +# Currently only supports Windows hosts. If the determined conversion |
1250 | +# type is listed in (the comma separated) LAZY, no conversion will |
1251 | +# take place. |
1252 | +func_file_conv () |
1253 | +{ |
1254 | + file=$1 |
1255 | + case $file in |
1256 | + / | /[!/]*) # absolute file, and not a UNC file |
1257 | + if test -z "$file_conv"; then |
1258 | + # lazily determine how to convert abs files |
1259 | + case `uname -s` in |
1260 | + MINGW*) |
1261 | + file_conv=mingw |
1262 | + ;; |
1263 | + CYGWIN*) |
1264 | + file_conv=cygwin |
1265 | + ;; |
1266 | + *) |
1267 | + file_conv=wine |
1268 | + ;; |
1269 | + esac |
1270 | + fi |
1271 | + case $file_conv/,$2, in |
1272 | + *,$file_conv,*) |
1273 | + ;; |
1274 | + mingw/*) |
1275 | + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` |
1276 | + ;; |
1277 | + cygwin/*) |
1278 | + file=`cygpath -m "$file" || echo "$file"` |
1279 | + ;; |
1280 | + wine/*) |
1281 | + file=`winepath -w "$file" || echo "$file"` |
1282 | + ;; |
1283 | + esac |
1284 | + ;; |
1285 | + esac |
1286 | +} |
1287 | + |
1288 | +# func_cl_dashL linkdir |
1289 | +# Make cl look for libraries in LINKDIR |
1290 | +func_cl_dashL () |
1291 | +{ |
1292 | + func_file_conv "$1" |
1293 | + if test -z "$lib_path"; then |
1294 | + lib_path=$file |
1295 | + else |
1296 | + lib_path="$lib_path;$file" |
1297 | + fi |
1298 | + linker_opts="$linker_opts -LIBPATH:$file" |
1299 | +} |
1300 | + |
1301 | +# func_cl_dashl library |
1302 | +# Do a library search-path lookup for cl |
1303 | +func_cl_dashl () |
1304 | +{ |
1305 | + lib=$1 |
1306 | + found=no |
1307 | + save_IFS=$IFS |
1308 | + IFS=';' |
1309 | + for dir in $lib_path $LIB |
1310 | + do |
1311 | + IFS=$save_IFS |
1312 | + if $shared && test -f "$dir/$lib.dll.lib"; then |
1313 | + found=yes |
1314 | + lib=$dir/$lib.dll.lib |
1315 | + break |
1316 | + fi |
1317 | + if test -f "$dir/$lib.lib"; then |
1318 | + found=yes |
1319 | + lib=$dir/$lib.lib |
1320 | + break |
1321 | + fi |
1322 | + if test -f "$dir/lib$lib.a"; then |
1323 | + found=yes |
1324 | + lib=$dir/lib$lib.a |
1325 | + break |
1326 | + fi |
1327 | + done |
1328 | + IFS=$save_IFS |
1329 | + |
1330 | + if test "$found" != yes; then |
1331 | + lib=$lib.lib |
1332 | + fi |
1333 | +} |
1334 | + |
1335 | +# func_cl_wrapper cl arg... |
1336 | +# Adjust compile command to suit cl |
1337 | +func_cl_wrapper () |
1338 | +{ |
1339 | + # Assume a capable shell |
1340 | + lib_path= |
1341 | + shared=: |
1342 | + linker_opts= |
1343 | + for arg |
1344 | + do |
1345 | + if test -n "$eat"; then |
1346 | + eat= |
1347 | + else |
1348 | + case $1 in |
1349 | + -o) |
1350 | + # configure might choose to run compile as 'compile cc -o foo foo.c'. |
1351 | + eat=1 |
1352 | + case $2 in |
1353 | + *.o | *.[oO][bB][jJ]) |
1354 | + func_file_conv "$2" |
1355 | + set x "$@" -Fo"$file" |
1356 | + shift |
1357 | + ;; |
1358 | + *) |
1359 | + func_file_conv "$2" |
1360 | + set x "$@" -Fe"$file" |
1361 | + shift |
1362 | + ;; |
1363 | + esac |
1364 | + ;; |
1365 | + -I) |
1366 | + eat=1 |
1367 | + func_file_conv "$2" mingw |
1368 | + set x "$@" -I"$file" |
1369 | + shift |
1370 | + ;; |
1371 | + -I*) |
1372 | + func_file_conv "${1#-I}" mingw |
1373 | + set x "$@" -I"$file" |
1374 | + shift |
1375 | + ;; |
1376 | + -l) |
1377 | + eat=1 |
1378 | + func_cl_dashl "$2" |
1379 | + set x "$@" "$lib" |
1380 | + shift |
1381 | + ;; |
1382 | + -l*) |
1383 | + func_cl_dashl "${1#-l}" |
1384 | + set x "$@" "$lib" |
1385 | + shift |
1386 | + ;; |
1387 | + -L) |
1388 | + eat=1 |
1389 | + func_cl_dashL "$2" |
1390 | + ;; |
1391 | + -L*) |
1392 | + func_cl_dashL "${1#-L}" |
1393 | + ;; |
1394 | + -static) |
1395 | + shared=false |
1396 | + ;; |
1397 | + -Wl,*) |
1398 | + arg=${1#-Wl,} |
1399 | + save_ifs="$IFS"; IFS=',' |
1400 | + for flag in $arg; do |
1401 | + IFS="$save_ifs" |
1402 | + linker_opts="$linker_opts $flag" |
1403 | + done |
1404 | + IFS="$save_ifs" |
1405 | + ;; |
1406 | + -Xlinker) |
1407 | + eat=1 |
1408 | + linker_opts="$linker_opts $2" |
1409 | + ;; |
1410 | + -*) |
1411 | + set x "$@" "$1" |
1412 | + shift |
1413 | + ;; |
1414 | + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) |
1415 | + func_file_conv "$1" |
1416 | + set x "$@" -Tp"$file" |
1417 | + shift |
1418 | + ;; |
1419 | + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) |
1420 | + func_file_conv "$1" mingw |
1421 | + set x "$@" "$file" |
1422 | + shift |
1423 | + ;; |
1424 | + *) |
1425 | + set x "$@" "$1" |
1426 | + shift |
1427 | + ;; |
1428 | + esac |
1429 | + fi |
1430 | + shift |
1431 | + done |
1432 | + if test -n "$linker_opts"; then |
1433 | + linker_opts="-link$linker_opts" |
1434 | + fi |
1435 | + exec "$@" $linker_opts |
1436 | + exit 1 |
1437 | +} |
1438 | + |
1439 | +eat= |
1440 | + |
1441 | +case $1 in |
1442 | + '') |
1443 | + echo "$0: No command. Try '$0 --help' for more information." 1>&2 |
1444 | + exit 1; |
1445 | + ;; |
1446 | + -h | --h*) |
1447 | + cat <<\EOF |
1448 | +Usage: compile [--help] [--version] PROGRAM [ARGS] |
1449 | + |
1450 | +Wrapper for compilers which do not understand '-c -o'. |
1451 | +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining |
1452 | +arguments, and rename the output as expected. |
1453 | + |
1454 | +If you are trying to build a whole package this is not the |
1455 | +right script to run: please start by reading the file 'INSTALL'. |
1456 | + |
1457 | +Report bugs to <bug-automake@gnu.org>. |
1458 | +EOF |
1459 | + exit $? |
1460 | + ;; |
1461 | + -v | --v*) |
1462 | + echo "compile $scriptversion" |
1463 | + exit $? |
1464 | + ;; |
1465 | + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) |
1466 | + func_cl_wrapper "$@" # Doesn't return... |
1467 | + ;; |
1468 | +esac |
1469 | + |
1470 | +ofile= |
1471 | +cfile= |
1472 | + |
1473 | +for arg |
1474 | +do |
1475 | + if test -n "$eat"; then |
1476 | + eat= |
1477 | + else |
1478 | + case $1 in |
1479 | + -o) |
1480 | + # configure might choose to run compile as 'compile cc -o foo foo.c'. |
1481 | + # So we strip '-o arg' only if arg is an object. |
1482 | + eat=1 |
1483 | + case $2 in |
1484 | + *.o | *.obj) |
1485 | + ofile=$2 |
1486 | + ;; |
1487 | + *) |
1488 | + set x "$@" -o "$2" |
1489 | + shift |
1490 | + ;; |
1491 | + esac |
1492 | + ;; |
1493 | + *.c) |
1494 | + cfile=$1 |
1495 | + set x "$@" "$1" |
1496 | + shift |
1497 | + ;; |
1498 | + *) |
1499 | + set x "$@" "$1" |
1500 | + shift |
1501 | + ;; |
1502 | + esac |
1503 | + fi |
1504 | + shift |
1505 | +done |
1506 | + |
1507 | +if test -z "$ofile" || test -z "$cfile"; then |
1508 | + # If no '-o' option was seen then we might have been invoked from a |
1509 | + # pattern rule where we don't need one. That is ok -- this is a |
1510 | + # normal compilation that the losing compiler can handle. If no |
1511 | + # '.c' file was seen then we are probably linking. That is also |
1512 | + # ok. |
1513 | + exec "$@" |
1514 | +fi |
1515 | + |
1516 | +# Name of file we expect compiler to create. |
1517 | +cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` |
1518 | + |
1519 | +# Create the lock directory. |
1520 | +# Note: use '[/\\:.-]' here to ensure that we don't use the same name |
1521 | +# that we are using for the .o file. Also, base the name on the expected |
1522 | +# object file name, since that is what matters with a parallel build. |
1523 | +lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d |
1524 | +while true; do |
1525 | + if mkdir "$lockdir" >/dev/null 2>&1; then |
1526 | + break |
1527 | + fi |
1528 | + sleep 1 |
1529 | +done |
1530 | +# FIXME: race condition here if user kills between mkdir and trap. |
1531 | +trap "rmdir '$lockdir'; exit 1" 1 2 15 |
1532 | + |
1533 | +# Run the compile. |
1534 | +"$@" |
1535 | +ret=$? |
1536 | + |
1537 | +if test -f "$cofile"; then |
1538 | + test "$cofile" = "$ofile" || mv "$cofile" "$ofile" |
1539 | +elif test -f "${cofile}bj"; then |
1540 | + test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" |
1541 | +fi |
1542 | + |
1543 | +rmdir "$lockdir" |
1544 | +exit $ret |
1545 | + |
1546 | +# Local Variables: |
1547 | +# mode: shell-script |
1548 | +# sh-indentation: 2 |
1549 | +# eval: (add-hook 'write-file-hooks 'time-stamp) |
1550 | +# time-stamp-start: "scriptversion=" |
1551 | +# time-stamp-format: "%:y-%02m-%02d.%02H" |
1552 | +# time-stamp-time-zone: "UTC" |
1553 | +# time-stamp-end: "; # UTC" |
1554 | +# End: |
1555 | |
1556 | === modified file 'configure' |
1557 | --- configure 2012-09-05 01:22:39 +0000 |
1558 | +++ configure 2013-10-26 22:20:55 +0000 |
1559 | @@ -1,6 +1,6 @@ |
1560 | #! /bin/sh |
1561 | # Guess values for system-dependent variables and create Makefiles. |
1562 | -# Generated by GNU Autoconf 2.69 for Multitouch Protocol Translation Library 1.1.3. |
1563 | +# Generated by GNU Autoconf 2.69 for Multitouch Protocol Translation Library 1.1.4. |
1564 | # |
1565 | # |
1566 | # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. |
1567 | @@ -587,8 +587,8 @@ |
1568 | # Identity of this package. |
1569 | PACKAGE_NAME='Multitouch Protocol Translation Library' |
1570 | PACKAGE_TARNAME='mtdev' |
1571 | -PACKAGE_VERSION='1.1.3' |
1572 | -PACKAGE_STRING='Multitouch Protocol Translation Library 1.1.3' |
1573 | +PACKAGE_VERSION='1.1.4' |
1574 | +PACKAGE_STRING='Multitouch Protocol Translation Library 1.1.4' |
1575 | PACKAGE_BUGREPORT='' |
1576 | PACKAGE_URL='' |
1577 | |
1578 | @@ -681,9 +681,10 @@ |
1579 | build |
1580 | LIBTOOL |
1581 | LIB_VERSION |
1582 | -MAINT |
1583 | -MAINTAINER_MODE_FALSE |
1584 | -MAINTAINER_MODE_TRUE |
1585 | +AM_BACKSLASH |
1586 | +AM_DEFAULT_VERBOSITY |
1587 | +AM_DEFAULT_V |
1588 | +AM_V |
1589 | am__untar |
1590 | am__tar |
1591 | AMTAR |
1592 | @@ -748,7 +749,7 @@ |
1593 | ac_subst_files='' |
1594 | ac_user_opts=' |
1595 | enable_option_checking |
1596 | -enable_maintainer_mode |
1597 | +enable_silent_rules |
1598 | enable_shared |
1599 | enable_static |
1600 | with_pic |
1601 | @@ -1307,7 +1308,7 @@ |
1602 | # Omit some internal or obsolete options to make the list less imposing. |
1603 | # This message is too long to be a string in the A/UX 3.1 sh. |
1604 | cat <<_ACEOF |
1605 | -\`configure' configures Multitouch Protocol Translation Library 1.1.3 to adapt to many kinds of systems. |
1606 | +\`configure' configures Multitouch Protocol Translation Library 1.1.4 to adapt to many kinds of systems. |
1607 | |
1608 | Usage: $0 [OPTION]... [VAR=VALUE]... |
1609 | |
1610 | @@ -1377,7 +1378,7 @@ |
1611 | |
1612 | if test -n "$ac_init_help"; then |
1613 | case $ac_init_help in |
1614 | - short | recursive ) echo "Configuration of Multitouch Protocol Translation Library 1.1.3:";; |
1615 | + short | recursive ) echo "Configuration of Multitouch Protocol Translation Library 1.1.4:";; |
1616 | esac |
1617 | cat <<\_ACEOF |
1618 | |
1619 | @@ -1385,9 +1386,8 @@ |
1620 | --disable-option-checking ignore unrecognized --enable/--with options |
1621 | --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) |
1622 | --enable-FEATURE[=ARG] include FEATURE [ARG=yes] |
1623 | - --enable-maintainer-mode |
1624 | - enable make rules and dependencies not useful (and |
1625 | - sometimes confusing) to the casual installer |
1626 | + --enable-silent-rules less verbose build output (undo: "make V=1") |
1627 | + --disable-silent-rules verbose build output (undo: "make V=0") |
1628 | --enable-shared[=PKGS] build shared libraries [default=yes] |
1629 | --enable-static[=PKGS] build static libraries [default=yes] |
1630 | --enable-fast-install[=PKGS] |
1631 | @@ -1483,7 +1483,7 @@ |
1632 | test -n "$ac_init_help" && exit $ac_status |
1633 | if $ac_init_version; then |
1634 | cat <<\_ACEOF |
1635 | -Multitouch Protocol Translation Library configure 1.1.3 |
1636 | +Multitouch Protocol Translation Library configure 1.1.4 |
1637 | generated by GNU Autoconf 2.69 |
1638 | |
1639 | Copyright (C) 2012 Free Software Foundation, Inc. |
1640 | @@ -1761,7 +1761,7 @@ |
1641 | This file contains any messages produced by compilers while |
1642 | running configure, to aid debugging if configure makes a mistake. |
1643 | |
1644 | -It was created by Multitouch Protocol Translation Library $as_me 1.1.3, which was |
1645 | +It was created by Multitouch Protocol Translation Library $as_me 1.1.4, which was |
1646 | generated by GNU Autoconf 2.69. Invocation command line was |
1647 | |
1648 | $ $0 $@ |
1649 | @@ -2143,7 +2143,7 @@ |
1650 | |
1651 | |
1652 | # Initialize Automake |
1653 | -am__api_version='1.12' |
1654 | +am__api_version='1.14' |
1655 | |
1656 | # Find a good install program. We prefer a C program (faster), |
1657 | # so one script is as good as another. But avoid the broken or |
1658 | @@ -2327,8 +2327,8 @@ |
1659 | esac |
1660 | fi |
1661 | # Use eval to expand $SHELL |
1662 | -if eval "$MISSING --run true"; then |
1663 | - am_missing_run="$MISSING --run " |
1664 | +if eval "$MISSING --is-lightweight"; then |
1665 | + am_missing_run="$MISSING " |
1666 | else |
1667 | am_missing_run= |
1668 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 |
1669 | @@ -2568,6 +2568,45 @@ |
1670 | fi |
1671 | rmdir .tst 2>/dev/null |
1672 | |
1673 | +# Check whether --enable-silent-rules was given. |
1674 | +if test "${enable_silent_rules+set}" = set; then : |
1675 | + enableval=$enable_silent_rules; |
1676 | +fi |
1677 | + |
1678 | +case $enable_silent_rules in # ((( |
1679 | + yes) AM_DEFAULT_VERBOSITY=0;; |
1680 | + no) AM_DEFAULT_VERBOSITY=1;; |
1681 | + *) AM_DEFAULT_VERBOSITY=1;; |
1682 | +esac |
1683 | +am_make=${MAKE-make} |
1684 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 |
1685 | +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } |
1686 | +if ${am_cv_make_support_nested_variables+:} false; then : |
1687 | + $as_echo_n "(cached) " >&6 |
1688 | +else |
1689 | + if $as_echo 'TRUE=$(BAR$(V)) |
1690 | +BAR0=false |
1691 | +BAR1=true |
1692 | +V=1 |
1693 | +am__doit: |
1694 | + @$(TRUE) |
1695 | +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then |
1696 | + am_cv_make_support_nested_variables=yes |
1697 | +else |
1698 | + am_cv_make_support_nested_variables=no |
1699 | +fi |
1700 | +fi |
1701 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 |
1702 | +$as_echo "$am_cv_make_support_nested_variables" >&6; } |
1703 | +if test $am_cv_make_support_nested_variables = yes; then |
1704 | + AM_V='$(V)' |
1705 | + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' |
1706 | +else |
1707 | + AM_V=$AM_DEFAULT_VERBOSITY |
1708 | + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY |
1709 | +fi |
1710 | +AM_BACKSLASH='\' |
1711 | + |
1712 | if test "`cd $srcdir && pwd`" != "`pwd`"; then |
1713 | # Use -I$(srcdir) only when $(srcdir) != ., so that make's output |
1714 | # is not polluted with repeated "-I." |
1715 | @@ -2590,7 +2629,7 @@ |
1716 | |
1717 | # Define the identity of the package. |
1718 | PACKAGE='mtdev' |
1719 | - VERSION='1.1.3' |
1720 | + VERSION='1.1.4' |
1721 | |
1722 | |
1723 | cat >>confdefs.h <<_ACEOF |
1724 | @@ -2630,6 +2669,10 @@ |
1725 | # in the wild :-( We should find a proper way to deprecate it ... |
1726 | AMTAR='$${TAR-tar}' |
1727 | |
1728 | + |
1729 | +# We'll loop over all known methods to create a tar archive until one works. |
1730 | +_am_tools='gnutar pax cpio none' |
1731 | + |
1732 | am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' |
1733 | |
1734 | |
1735 | @@ -2637,27 +2680,85 @@ |
1736 | |
1737 | |
1738 | |
1739 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 |
1740 | -$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } |
1741 | - # Check whether --enable-maintainer-mode was given. |
1742 | -if test "${enable_maintainer_mode+set}" = set; then : |
1743 | - enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval |
1744 | -else |
1745 | - USE_MAINTAINER_MODE=no |
1746 | -fi |
1747 | - |
1748 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 |
1749 | -$as_echo "$USE_MAINTAINER_MODE" >&6; } |
1750 | - if test $USE_MAINTAINER_MODE = yes; then |
1751 | - MAINTAINER_MODE_TRUE= |
1752 | - MAINTAINER_MODE_FALSE='#' |
1753 | -else |
1754 | - MAINTAINER_MODE_TRUE='#' |
1755 | - MAINTAINER_MODE_FALSE= |
1756 | -fi |
1757 | - |
1758 | - MAINT=$MAINTAINER_MODE_TRUE |
1759 | - |
1760 | +# POSIX will say in a future version that running "rm -f" with no argument |
1761 | +# is OK; and we want to be able to make that assumption in our Makefile |
1762 | +# recipes. So use an aggressive probe to check that the usage we want is |
1763 | +# actually supported "in the wild" to an acceptable degree. |
1764 | +# See automake bug#10828. |
1765 | +# To make any issue more visible, cause the running configure to be aborted |
1766 | +# by default if the 'rm' program in use doesn't match our expectations; the |
1767 | +# user can still override this though. |
1768 | +if rm -f && rm -fr && rm -rf; then : OK; else |
1769 | + cat >&2 <<'END' |
1770 | +Oops! |
1771 | + |
1772 | +Your 'rm' program seems unable to run without file operands specified |
1773 | +on the command line, even when the '-f' option is present. This is contrary |
1774 | +to the behaviour of most rm programs out there, and not conforming with |
1775 | +the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542> |
1776 | + |
1777 | +Please tell bug-automake@gnu.org about your system, including the value |
1778 | +of your $PATH and any error possibly output before this message. This |
1779 | +can help us improve future automake versions. |
1780 | + |
1781 | +END |
1782 | + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then |
1783 | + echo 'Configuration will proceed anyway, since you have set the' >&2 |
1784 | + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 |
1785 | + echo >&2 |
1786 | + else |
1787 | + cat >&2 <<'END' |
1788 | +Aborting the configuration process, to ensure you take notice of the issue. |
1789 | + |
1790 | +You can download and install GNU coreutils to get an 'rm' implementation |
1791 | +that behaves properly: <http://www.gnu.org/software/coreutils/>. |
1792 | + |
1793 | +If you want to complete the configuration process using your problematic |
1794 | +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM |
1795 | +to "yes", and re-run configure. |
1796 | + |
1797 | +END |
1798 | + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 |
1799 | + fi |
1800 | +fi |
1801 | +# Check whether --enable-silent-rules was given. |
1802 | +if test "${enable_silent_rules+set}" = set; then : |
1803 | + enableval=$enable_silent_rules; |
1804 | +fi |
1805 | + |
1806 | +case $enable_silent_rules in # ((( |
1807 | + yes) AM_DEFAULT_VERBOSITY=0;; |
1808 | + no) AM_DEFAULT_VERBOSITY=1;; |
1809 | + *) AM_DEFAULT_VERBOSITY=0;; |
1810 | +esac |
1811 | +am_make=${MAKE-make} |
1812 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 |
1813 | +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } |
1814 | +if ${am_cv_make_support_nested_variables+:} false; then : |
1815 | + $as_echo_n "(cached) " >&6 |
1816 | +else |
1817 | + if $as_echo 'TRUE=$(BAR$(V)) |
1818 | +BAR0=false |
1819 | +BAR1=true |
1820 | +V=1 |
1821 | +am__doit: |
1822 | + @$(TRUE) |
1823 | +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then |
1824 | + am_cv_make_support_nested_variables=yes |
1825 | +else |
1826 | + am_cv_make_support_nested_variables=no |
1827 | +fi |
1828 | +fi |
1829 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 |
1830 | +$as_echo "$am_cv_make_support_nested_variables" >&6; } |
1831 | +if test $am_cv_make_support_nested_variables = yes; then |
1832 | + AM_V='$(V)' |
1833 | + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' |
1834 | +else |
1835 | + AM_V=$AM_DEFAULT_VERBOSITY |
1836 | + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY |
1837 | +fi |
1838 | +AM_BACKSLASH='\' |
1839 | |
1840 | |
1841 | LIB_VERSION=1:0:0 |
1842 | @@ -3681,6 +3782,65 @@ |
1843 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
1844 | ac_compiler_gnu=$ac_cv_c_compiler_gnu |
1845 | |
1846 | +ac_ext=c |
1847 | +ac_cpp='$CPP $CPPFLAGS' |
1848 | +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
1849 | +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
1850 | +ac_compiler_gnu=$ac_cv_c_compiler_gnu |
1851 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 |
1852 | +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } |
1853 | +if ${am_cv_prog_cc_c_o+:} false; then : |
1854 | + $as_echo_n "(cached) " >&6 |
1855 | +else |
1856 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
1857 | +/* end confdefs.h. */ |
1858 | + |
1859 | +int |
1860 | +main () |
1861 | +{ |
1862 | + |
1863 | + ; |
1864 | + return 0; |
1865 | +} |
1866 | +_ACEOF |
1867 | + # Make sure it works both with $CC and with simple cc. |
1868 | + # Following AC_PROG_CC_C_O, we do the test twice because some |
1869 | + # compilers refuse to overwrite an existing .o file with -o, |
1870 | + # though they will create one. |
1871 | + am_cv_prog_cc_c_o=yes |
1872 | + for am_i in 1 2; do |
1873 | + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 |
1874 | + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 |
1875 | + ac_status=$? |
1876 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
1877 | + (exit $ac_status); } \ |
1878 | + && test -f conftest2.$ac_objext; then |
1879 | + : OK |
1880 | + else |
1881 | + am_cv_prog_cc_c_o=no |
1882 | + break |
1883 | + fi |
1884 | + done |
1885 | + rm -f core conftest* |
1886 | + unset am_i |
1887 | +fi |
1888 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 |
1889 | +$as_echo "$am_cv_prog_cc_c_o" >&6; } |
1890 | +if test "$am_cv_prog_cc_c_o" != yes; then |
1891 | + # Losing compiler, so override with the script. |
1892 | + # FIXME: It is wrong to rewrite CC. |
1893 | + # But if we don't then we get into trouble of one sort or another. |
1894 | + # A longer-term fix would be to have automake use am__CC in this case, |
1895 | + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" |
1896 | + CC="$am_aux_dir/compile $CC" |
1897 | +fi |
1898 | +ac_ext=c |
1899 | +ac_cpp='$CPP $CPPFLAGS' |
1900 | +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
1901 | +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
1902 | +ac_compiler_gnu=$ac_cv_c_compiler_gnu |
1903 | + |
1904 | + |
1905 | depcc="$CC" am_compiler_list= |
1906 | |
1907 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 |
1908 | @@ -11763,6 +11923,65 @@ |
1909 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
1910 | ac_compiler_gnu=$ac_cv_c_compiler_gnu |
1911 | |
1912 | +ac_ext=c |
1913 | +ac_cpp='$CPP $CPPFLAGS' |
1914 | +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
1915 | +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
1916 | +ac_compiler_gnu=$ac_cv_c_compiler_gnu |
1917 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 |
1918 | +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } |
1919 | +if ${am_cv_prog_cc_c_o+:} false; then : |
1920 | + $as_echo_n "(cached) " >&6 |
1921 | +else |
1922 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
1923 | +/* end confdefs.h. */ |
1924 | + |
1925 | +int |
1926 | +main () |
1927 | +{ |
1928 | + |
1929 | + ; |
1930 | + return 0; |
1931 | +} |
1932 | +_ACEOF |
1933 | + # Make sure it works both with $CC and with simple cc. |
1934 | + # Following AC_PROG_CC_C_O, we do the test twice because some |
1935 | + # compilers refuse to overwrite an existing .o file with -o, |
1936 | + # though they will create one. |
1937 | + am_cv_prog_cc_c_o=yes |
1938 | + for am_i in 1 2; do |
1939 | + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 |
1940 | + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 |
1941 | + ac_status=$? |
1942 | + echo "$as_me:$LINENO: \$? = $ac_status" >&5 |
1943 | + (exit $ac_status); } \ |
1944 | + && test -f conftest2.$ac_objext; then |
1945 | + : OK |
1946 | + else |
1947 | + am_cv_prog_cc_c_o=no |
1948 | + break |
1949 | + fi |
1950 | + done |
1951 | + rm -f core conftest* |
1952 | + unset am_i |
1953 | +fi |
1954 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 |
1955 | +$as_echo "$am_cv_prog_cc_c_o" >&6; } |
1956 | +if test "$am_cv_prog_cc_c_o" != yes; then |
1957 | + # Losing compiler, so override with the script. |
1958 | + # FIXME: It is wrong to rewrite CC. |
1959 | + # But if we don't then we get into trouble of one sort or another. |
1960 | + # A longer-term fix would be to have automake use am__CC in this case, |
1961 | + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" |
1962 | + CC="$am_aux_dir/compile $CC" |
1963 | +fi |
1964 | +ac_ext=c |
1965 | +ac_cpp='$CPP $CPPFLAGS' |
1966 | +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' |
1967 | +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
1968 | +ac_compiler_gnu=$ac_cv_c_compiler_gnu |
1969 | + |
1970 | + |
1971 | depcc="$CC" am_compiler_list= |
1972 | |
1973 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 |
1974 | @@ -12020,10 +12239,6 @@ |
1975 | am__EXEEXT_FALSE= |
1976 | fi |
1977 | |
1978 | -if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then |
1979 | - as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. |
1980 | -Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
1981 | -fi |
1982 | if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then |
1983 | as_fn_error $? "conditional \"AMDEP\" was never defined. |
1984 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
1985 | @@ -12433,7 +12648,7 @@ |
1986 | # report actual input values of CONFIG_FILES etc. instead of their |
1987 | # values after options handling. |
1988 | ac_log=" |
1989 | -This file was extended by Multitouch Protocol Translation Library $as_me 1.1.3, which was |
1990 | +This file was extended by Multitouch Protocol Translation Library $as_me 1.1.4, which was |
1991 | generated by GNU Autoconf 2.69. Invocation command line was |
1992 | |
1993 | CONFIG_FILES = $CONFIG_FILES |
1994 | @@ -12499,7 +12714,7 @@ |
1995 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
1996 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
1997 | ac_cs_version="\\ |
1998 | -Multitouch Protocol Translation Library config.status 1.1.3 |
1999 | +Multitouch Protocol Translation Library config.status 1.1.4 |
2000 | configured by $0, generated by GNU Autoconf 2.69, |
2001 | with options \\"\$ac_cs_config\\" |
2002 | |
2003 | @@ -13508,7 +13723,7 @@ |
2004 | |
2005 | case $ac_file$ac_mode in |
2006 | "depfiles":C) test x"$AMDEP_TRUE" != x"" || { |
2007 | - # Autoconf 2.62 quotes --file arguments for eval, but not when files |
2008 | + # Older Autoconf quotes --file arguments for eval, but not when files |
2009 | # are listed without --file. Let's play safe and only enable the eval |
2010 | # if we detect the quoting. |
2011 | case $CONFIG_FILES in |
2012 | @@ -13559,7 +13774,7 @@ |
2013 | DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` |
2014 | test -z "$DEPDIR" && continue |
2015 | am__include=`sed -n 's/^am__include = //p' < "$mf"` |
2016 | - test -z "am__include" && continue |
2017 | + test -z "$am__include" && continue |
2018 | am__quote=`sed -n 's/^am__quote = //p' < "$mf"` |
2019 | # Find all dependency output files, they are included files with |
2020 | # $(DEPDIR) in their names. We invoke sed twice because it is the |
2021 | |
2022 | === modified file 'configure.ac' |
2023 | --- configure.ac 2012-09-05 01:22:39 +0000 |
2024 | +++ configure.ac 2013-10-26 22:20:55 +0000 |
2025 | @@ -1,7 +1,7 @@ |
2026 | # Initialize Autoconf |
2027 | AC_PREREQ([2.60]) |
2028 | AC_INIT([Multitouch Protocol Translation Library], |
2029 | - [1.1.3], |
2030 | + [1.1.4], |
2031 | [], |
2032 | [mtdev]) |
2033 | AC_CONFIG_SRCDIR([Makefile.am]) |
2034 | @@ -10,7 +10,7 @@ |
2035 | |
2036 | # Initialize Automake |
2037 | AM_INIT_AUTOMAKE([foreign dist-bzip2]) |
2038 | -AM_MAINTAINER_MODE |
2039 | +AM_SILENT_RULES([yes]) |
2040 | |
2041 | LIB_VERSION=1:0:0 |
2042 | AC_SUBST([LIB_VERSION]) |
2043 | |
2044 | === modified file 'debian/changelog' |
2045 | --- debian/changelog 2013-05-20 21:16:05 +0000 |
2046 | +++ debian/changelog 2013-10-26 22:20:55 +0000 |
2047 | @@ -1,3 +1,16 @@ |
2048 | +mtdev (1.1.4-1ubuntu1) trusty; urgency=low |
2049 | + |
2050 | + * Merge from Debian unstable. Remaining changes: |
2051 | + - debian/libmtdev1.links: Install apport hook links. |
2052 | + |
2053 | + -- Logan Rosen <logan@ubuntu.com> Sat, 26 Oct 2013 18:16:52 -0400 |
2054 | + |
2055 | +mtdev (1.1.4-1) unstable; urgency=low |
2056 | + |
2057 | + * New upstream release. |
2058 | + |
2059 | + -- Nobuhiro Iwamatsu <iwamatsu@debian.org> Tue, 24 Sep 2013 08:25:26 +0900 |
2060 | + |
2061 | mtdev (1.1.3-1ubuntu1) saucy; urgency=low |
2062 | |
2063 | * Merge from Debian unstable. Remaining changes: |
2064 | |
2065 | === modified file 'src/Makefile.am' |
2066 | --- src/Makefile.am 2011-01-31 12:02:10 +0000 |
2067 | +++ src/Makefile.am 2013-10-26 22:20:55 +0000 |
2068 | @@ -18,7 +18,7 @@ |
2069 | |
2070 | AM_CFLAGS = $(CWARNFLAGS) #-DMTDEV_NO_LEGACY_ABI |
2071 | |
2072 | -INCLUDES = -I$(top_srcdir)/include/ |
2073 | +AM_CPPFLAGS = -I$(top_srcdir)/include/ |
2074 | |
2075 | libmtdevincludedir = $(includedir) |
2076 | libmtdevinclude_HEADERS = \ |
2077 | |
2078 | === modified file 'src/Makefile.in' |
2079 | --- src/Makefile.in 2012-09-05 01:22:39 +0000 |
2080 | +++ src/Makefile.in 2013-10-26 22:20:55 +0000 |
2081 | @@ -1,7 +1,7 @@ |
2082 | -# Makefile.in generated by automake 1.12.3 from Makefile.am. |
2083 | +# Makefile.in generated by automake 1.14 from Makefile.am. |
2084 | # @configure_input@ |
2085 | |
2086 | -# Copyright (C) 1994-2012 Free Software Foundation, Inc. |
2087 | +# Copyright (C) 1994-2013 Free Software Foundation, Inc. |
2088 | |
2089 | # This Makefile.in is free software; the Free Software Foundation |
2090 | # gives unlimited permission to copy and/or distribute it, |
2091 | @@ -16,23 +16,51 @@ |
2092 | |
2093 | |
2094 | VPATH = @srcdir@ |
2095 | -am__make_dryrun = \ |
2096 | - { \ |
2097 | - am__dry=no; \ |
2098 | +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' |
2099 | +am__make_running_with_option = \ |
2100 | + case $${target_option-} in \ |
2101 | + ?) ;; \ |
2102 | + *) echo "am__make_running_with_option: internal error: invalid" \ |
2103 | + "target option '$${target_option-}' specified" >&2; \ |
2104 | + exit 1;; \ |
2105 | + esac; \ |
2106 | + has_opt=no; \ |
2107 | + sane_makeflags=$$MAKEFLAGS; \ |
2108 | + if $(am__is_gnu_make); then \ |
2109 | + sane_makeflags=$$MFLAGS; \ |
2110 | + else \ |
2111 | case $$MAKEFLAGS in \ |
2112 | *\\[\ \ ]*) \ |
2113 | - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
2114 | - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
2115 | - *) \ |
2116 | - for am__flg in $$MAKEFLAGS; do \ |
2117 | - case $$am__flg in \ |
2118 | - *=*|--*) ;; \ |
2119 | - *n*) am__dry=yes; break;; \ |
2120 | - esac; \ |
2121 | - done;; \ |
2122 | - esac; \ |
2123 | - test $$am__dry = yes; \ |
2124 | - } |
2125 | + bs=\\; \ |
2126 | + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ |
2127 | + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ |
2128 | + esac; \ |
2129 | + fi; \ |
2130 | + skip_next=no; \ |
2131 | + strip_trailopt () \ |
2132 | + { \ |
2133 | + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ |
2134 | + }; \ |
2135 | + for flg in $$sane_makeflags; do \ |
2136 | + test $$skip_next = yes && { skip_next=no; continue; }; \ |
2137 | + case $$flg in \ |
2138 | + *=*|--*) continue;; \ |
2139 | + -*I) strip_trailopt 'I'; skip_next=yes;; \ |
2140 | + -*I?*) strip_trailopt 'I';; \ |
2141 | + -*O) strip_trailopt 'O'; skip_next=yes;; \ |
2142 | + -*O?*) strip_trailopt 'O';; \ |
2143 | + -*l) strip_trailopt 'l'; skip_next=yes;; \ |
2144 | + -*l?*) strip_trailopt 'l';; \ |
2145 | + -[dEDm]) skip_next=yes;; \ |
2146 | + -[JT]) skip_next=yes;; \ |
2147 | + esac; \ |
2148 | + case $$flg in \ |
2149 | + *$$target_option*) has_opt=yes; break;; \ |
2150 | + esac; \ |
2151 | + done; \ |
2152 | + test $$has_opt = yes |
2153 | +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) |
2154 | +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) |
2155 | pkgdatadir = $(datadir)/@PACKAGE@ |
2156 | pkgincludedir = $(includedir)/@PACKAGE@ |
2157 | pkglibdir = $(libdir)/@PACKAGE@ |
2158 | @@ -52,8 +80,8 @@ |
2159 | build_triplet = @build@ |
2160 | host_triplet = @host@ |
2161 | subdir = src |
2162 | -DIST_COMMON = $(libmtdevinclude_HEADERS) $(srcdir)/Makefile.am \ |
2163 | - $(srcdir)/Makefile.in $(top_srcdir)/config-aux/depcomp |
2164 | +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ |
2165 | + $(top_srcdir)/config-aux/depcomp $(libmtdevinclude_HEADERS) |
2166 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
2167 | am__aclocal_m4_deps = $(top_srcdir)/configure.ac |
2168 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
2169 | @@ -96,22 +124,47 @@ |
2170 | am_libmtdev_la_OBJECTS = caps.lo core.lo iobuf.lo match.lo \ |
2171 | match_four.lo |
2172 | libmtdev_la_OBJECTS = $(am_libmtdev_la_OBJECTS) |
2173 | -libmtdev_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ |
2174 | +AM_V_lt = $(am__v_lt_@AM_V@) |
2175 | +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) |
2176 | +am__v_lt_0 = --silent |
2177 | +am__v_lt_1 = |
2178 | +libmtdev_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ |
2179 | $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ |
2180 | $(libmtdev_la_LDFLAGS) $(LDFLAGS) -o $@ |
2181 | +AM_V_P = $(am__v_P_@AM_V@) |
2182 | +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) |
2183 | +am__v_P_0 = false |
2184 | +am__v_P_1 = : |
2185 | +AM_V_GEN = $(am__v_GEN_@AM_V@) |
2186 | +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) |
2187 | +am__v_GEN_0 = @echo " GEN " $@; |
2188 | +am__v_GEN_1 = |
2189 | +AM_V_at = $(am__v_at_@AM_V@) |
2190 | +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) |
2191 | +am__v_at_0 = @ |
2192 | +am__v_at_1 = |
2193 | DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) |
2194 | depcomp = $(SHELL) $(top_srcdir)/config-aux/depcomp |
2195 | am__depfiles_maybe = depfiles |
2196 | am__mv = mv -f |
2197 | COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ |
2198 | $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) |
2199 | -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ |
2200 | - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ |
2201 | - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) |
2202 | +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ |
2203 | + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ |
2204 | + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ |
2205 | + $(AM_CFLAGS) $(CFLAGS) |
2206 | +AM_V_CC = $(am__v_CC_@AM_V@) |
2207 | +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) |
2208 | +am__v_CC_0 = @echo " CC " $@; |
2209 | +am__v_CC_1 = |
2210 | CCLD = $(CC) |
2211 | -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ |
2212 | - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ |
2213 | - $(LDFLAGS) -o $@ |
2214 | +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ |
2215 | + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ |
2216 | + $(AM_LDFLAGS) $(LDFLAGS) -o $@ |
2217 | +AM_V_CCLD = $(am__v_CCLD_@AM_V@) |
2218 | +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) |
2219 | +am__v_CCLD_0 = @echo " CCLD " $@; |
2220 | +am__v_CCLD_1 = |
2221 | SOURCES = $(libmtdev_la_SOURCES) |
2222 | DIST_SOURCES = $(libmtdev_la_SOURCES) |
2223 | am__can_run_installinfo = \ |
2224 | @@ -120,11 +173,29 @@ |
2225 | *) (install-info --version) >/dev/null 2>&1;; \ |
2226 | esac |
2227 | HEADERS = $(libmtdevinclude_HEADERS) |
2228 | +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) |
2229 | +# Read a list of newline-separated strings from the standard input, |
2230 | +# and print each of them once, without duplicates. Input order is |
2231 | +# *not* preserved. |
2232 | +am__uniquify_input = $(AWK) '\ |
2233 | + BEGIN { nonempty = 0; } \ |
2234 | + { items[$$0] = 1; nonempty = 1; } \ |
2235 | + END { if (nonempty) { for (i in items) print i; }; } \ |
2236 | +' |
2237 | +# Make sure the list of sources is unique. This is necessary because, |
2238 | +# e.g., the same source file might be shared among _SOURCES variables |
2239 | +# for different programs/libraries. |
2240 | +am__define_uniq_tagged_files = \ |
2241 | + list='$(am__tagged_files)'; \ |
2242 | + unique=`for i in $$list; do \ |
2243 | + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
2244 | + done | $(am__uniquify_input)` |
2245 | ETAGS = etags |
2246 | CTAGS = ctags |
2247 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
2248 | ACLOCAL = @ACLOCAL@ |
2249 | AMTAR = @AMTAR@ |
2250 | +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ |
2251 | AR = @AR@ |
2252 | AUTOCONF = @AUTOCONF@ |
2253 | AUTOHEADER = @AUTOHEADER@ |
2254 | @@ -162,7 +233,6 @@ |
2255 | LIPO = @LIPO@ |
2256 | LN_S = @LN_S@ |
2257 | LTLIBOBJS = @LTLIBOBJS@ |
2258 | -MAINT = @MAINT@ |
2259 | MAKEINFO = @MAKEINFO@ |
2260 | MANIFEST_TOOL = @MANIFEST_TOOL@ |
2261 | MKDIR_P = @MKDIR_P@ |
2262 | @@ -255,7 +325,7 @@ |
2263 | match_four.c |
2264 | |
2265 | AM_CFLAGS = $(CWARNFLAGS) #-DMTDEV_NO_LEGACY_ABI |
2266 | -INCLUDES = -I$(top_srcdir)/include/ |
2267 | +AM_CPPFLAGS = -I$(top_srcdir)/include/ |
2268 | libmtdevincludedir = $(includedir) |
2269 | libmtdevinclude_HEADERS = \ |
2270 | $(top_srcdir)/include/mtdev-mapping.h \ |
2271 | @@ -266,7 +336,7 @@ |
2272 | |
2273 | .SUFFIXES: |
2274 | .SUFFIXES: .c .lo .o .obj |
2275 | -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) |
2276 | +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) |
2277 | @for dep in $?; do \ |
2278 | case '$(am__configure_deps)' in \ |
2279 | *$$dep*) \ |
2280 | @@ -291,11 +361,12 @@ |
2281 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) |
2282 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
2283 | |
2284 | -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) |
2285 | +$(top_srcdir)/configure: $(am__configure_deps) |
2286 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
2287 | -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) |
2288 | +$(ACLOCAL_M4): $(am__aclocal_m4_deps) |
2289 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
2290 | $(am__aclocal_m4_deps): |
2291 | + |
2292 | install-libLTLIBRARIES: $(lib_LTLIBRARIES) |
2293 | @$(NORMAL_INSTALL) |
2294 | @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ |
2295 | @@ -330,8 +401,9 @@ |
2296 | echo rm -f $${locs}; \ |
2297 | rm -f $${locs}; \ |
2298 | } |
2299 | + |
2300 | libmtdev.la: $(libmtdev_la_OBJECTS) $(libmtdev_la_DEPENDENCIES) $(EXTRA_libmtdev_la_DEPENDENCIES) |
2301 | - $(libmtdev_la_LINK) -rpath $(libdir) $(libmtdev_la_OBJECTS) $(libmtdev_la_LIBADD) $(LIBS) |
2302 | + $(AM_V_CCLD)$(libmtdev_la_LINK) -rpath $(libdir) $(libmtdev_la_OBJECTS) $(libmtdev_la_LIBADD) $(LIBS) |
2303 | |
2304 | mostlyclean-compile: |
2305 | -rm -f *.$(OBJEXT) |
2306 | @@ -346,25 +418,25 @@ |
2307 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/match_four.Plo@am__quote@ |
2308 | |
2309 | .c.o: |
2310 | -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< |
2311 | -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po |
2312 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ |
2313 | +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< |
2314 | +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po |
2315 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ |
2316 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
2317 | -@am__fastdepCC_FALSE@ $(COMPILE) -c $< |
2318 | +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< |
2319 | |
2320 | .c.obj: |
2321 | -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` |
2322 | -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po |
2323 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ |
2324 | +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` |
2325 | +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po |
2326 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ |
2327 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
2328 | -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` |
2329 | +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` |
2330 | |
2331 | .c.lo: |
2332 | -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< |
2333 | -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo |
2334 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ |
2335 | +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< |
2336 | +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo |
2337 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ |
2338 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
2339 | -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< |
2340 | +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< |
2341 | |
2342 | mostlyclean-libtool: |
2343 | -rm -f *.lo |
2344 | @@ -393,26 +465,15 @@ |
2345 | files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
2346 | dir='$(DESTDIR)$(libmtdevincludedir)'; $(am__uninstall_files_from_dir) |
2347 | |
2348 | -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) |
2349 | - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
2350 | - unique=`for i in $$list; do \ |
2351 | - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
2352 | - done | \ |
2353 | - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
2354 | - END { if (nonempty) { for (i in files) print i; }; }'`; \ |
2355 | - mkid -fID $$unique |
2356 | -tags: TAGS |
2357 | +ID: $(am__tagged_files) |
2358 | + $(am__define_uniq_tagged_files); mkid -fID $$unique |
2359 | +tags: tags-am |
2360 | +TAGS: tags |
2361 | |
2362 | -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ |
2363 | - $(TAGS_FILES) $(LISP) |
2364 | +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) |
2365 | set x; \ |
2366 | here=`pwd`; \ |
2367 | - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
2368 | - unique=`for i in $$list; do \ |
2369 | - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
2370 | - done | \ |
2371 | - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
2372 | - END { if (nonempty) { for (i in files) print i; }; }'`; \ |
2373 | + $(am__define_uniq_tagged_files); \ |
2374 | shift; \ |
2375 | if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ |
2376 | test -n "$$unique" || unique=$$empty_fix; \ |
2377 | @@ -424,15 +485,11 @@ |
2378 | $$unique; \ |
2379 | fi; \ |
2380 | fi |
2381 | -ctags: CTAGS |
2382 | -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ |
2383 | - $(TAGS_FILES) $(LISP) |
2384 | - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
2385 | - unique=`for i in $$list; do \ |
2386 | - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
2387 | - done | \ |
2388 | - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
2389 | - END { if (nonempty) { for (i in files) print i; }; }'`; \ |
2390 | +ctags: ctags-am |
2391 | + |
2392 | +CTAGS: ctags |
2393 | +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) |
2394 | + $(am__define_uniq_tagged_files); \ |
2395 | test -z "$(CTAGS_ARGS)$$unique" \ |
2396 | || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ |
2397 | $$unique |
2398 | @@ -441,9 +498,10 @@ |
2399 | here=`$(am__cd) $(top_builddir) && pwd` \ |
2400 | && $(am__cd) $(top_srcdir) \ |
2401 | && gtags -i $(GTAGS_ARGS) "$$here" |
2402 | +cscopelist: cscopelist-am |
2403 | |
2404 | -cscopelist: $(HEADERS) $(SOURCES) $(LISP) |
2405 | - list='$(SOURCES) $(HEADERS) $(LISP)'; \ |
2406 | +cscopelist-am: $(am__tagged_files) |
2407 | + list='$(am__tagged_files)'; \ |
2408 | case "$(srcdir)" in \ |
2409 | [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ |
2410 | *) sdir=$(subdir)/$(srcdir) ;; \ |
2411 | @@ -600,20 +658,20 @@ |
2412 | |
2413 | .MAKE: install-am install-strip |
2414 | |
2415 | -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ |
2416 | - clean-libLTLIBRARIES clean-libtool cscopelist ctags distclean \ |
2417 | - distclean-compile distclean-generic distclean-libtool \ |
2418 | - distclean-tags distdir dvi dvi-am html html-am info info-am \ |
2419 | - install install-am install-data install-data-am install-dvi \ |
2420 | - install-dvi-am install-exec install-exec-am install-html \ |
2421 | - install-html-am install-info install-info-am \ |
2422 | - install-libLTLIBRARIES install-libmtdevincludeHEADERS \ |
2423 | - install-man install-pdf install-pdf-am install-ps \ |
2424 | - install-ps-am install-strip installcheck installcheck-am \ |
2425 | - installdirs maintainer-clean maintainer-clean-generic \ |
2426 | - mostlyclean mostlyclean-compile mostlyclean-generic \ |
2427 | - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ |
2428 | - uninstall-am uninstall-libLTLIBRARIES \ |
2429 | +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ |
2430 | + clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \ |
2431 | + ctags-am distclean distclean-compile distclean-generic \ |
2432 | + distclean-libtool distclean-tags distdir dvi dvi-am html \ |
2433 | + html-am info info-am install install-am install-data \ |
2434 | + install-data-am install-dvi install-dvi-am install-exec \ |
2435 | + install-exec-am install-html install-html-am install-info \ |
2436 | + install-info-am install-libLTLIBRARIES \ |
2437 | + install-libmtdevincludeHEADERS install-man install-pdf \ |
2438 | + install-pdf-am install-ps install-ps-am install-strip \ |
2439 | + installcheck installcheck-am installdirs maintainer-clean \ |
2440 | + maintainer-clean-generic mostlyclean mostlyclean-compile \ |
2441 | + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ |
2442 | + tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES \ |
2443 | uninstall-libmtdevincludeHEADERS |
2444 | |
2445 | |
2446 | |
2447 | === modified file 'src/caps.c' |
2448 | --- src/caps.c 2012-03-02 15:29:50 +0000 |
2449 | +++ src/caps.c 2013-10-26 22:20:55 +0000 |
2450 | @@ -61,10 +61,10 @@ |
2451 | return NULL; |
2452 | |
2453 | ix = mtdev_abs2mt(code); |
2454 | - if (ix < 11) |
2455 | + if (ix < LEGACY_API_NUM_MT_AXES) |
2456 | return &dev->abs[ix]; |
2457 | else |
2458 | - return &dev->state->ext_abs[ix - 11]; |
2459 | + return &dev->state->ext_abs[ix - LEGACY_API_NUM_MT_AXES]; |
2460 | } |
2461 | |
2462 | static void set_info(struct mtdev *dev, int code, |
2463 | @@ -156,10 +156,10 @@ |
2464 | return 0; |
2465 | |
2466 | ix = mtdev_abs2mt(code); |
2467 | - if (ix < 11) |
2468 | + if (ix < LEGACY_API_NUM_MT_AXES) |
2469 | return dev->has_abs[ix]; |
2470 | else |
2471 | - return dev->state->has_ext_abs[ix - 11]; |
2472 | + return dev->state->has_ext_abs[ix - LEGACY_API_NUM_MT_AXES]; |
2473 | } |
2474 | |
2475 | int mtdev_get_abs_minimum(const struct mtdev *dev, int code) |
2476 | @@ -203,10 +203,10 @@ |
2477 | return; |
2478 | |
2479 | ix = mtdev_abs2mt(code); |
2480 | - if (ix < 11) |
2481 | + if (ix < LEGACY_API_NUM_MT_AXES) |
2482 | dev->has_abs[ix] = value; |
2483 | else |
2484 | - dev->state->has_ext_abs[ix - 11] = value; |
2485 | + dev->state->has_ext_abs[ix - LEGACY_API_NUM_MT_AXES] = value; |
2486 | } |
2487 | |
2488 | void mtdev_set_abs_maximum(struct mtdev *dev, int code, int value) |
2489 | |
2490 | === modified file 'src/common.h' |
2491 | --- src/common.h 2011-01-31 12:02:10 +0000 |
2492 | +++ src/common.h 2013-10-26 22:20:55 +0000 |
2493 | @@ -87,6 +87,14 @@ |
2494 | /* robust system ioctl calls */ |
2495 | #define SYSCALL(call) while (((call) == -1) && (errno == EINTR)) |
2496 | |
2497 | +/* To be compatible to the original, non-opaque mtdev API, we can only use 11 |
2498 | + * axes in the basic struct. Everything else is hidden in the state, see the |
2499 | + * use of dev->abs[idx] vs dev->state->ext_abs[idx] |
2500 | + * |
2501 | + * See MT_ABS_SIZE in include/mtdev.h |
2502 | + */ |
2503 | +#define LEGACY_API_NUM_MT_AXES 11 |
2504 | + |
2505 | /** |
2506 | * struct mtdev - represents an input MT device |
2507 | * @has_mtdata: true if the device has MT capabilities |
2508 | @@ -105,9 +113,9 @@ |
2509 | struct mtdev { |
2510 | int has_mtdata; |
2511 | int has_slot; |
2512 | - int has_abs[11]; |
2513 | + int has_abs[LEGACY_API_NUM_MT_AXES]; |
2514 | struct input_absinfo slot; |
2515 | - struct input_absinfo abs[11]; |
2516 | + struct input_absinfo abs[LEGACY_API_NUM_MT_AXES]; |
2517 | struct mtdev_state *state; |
2518 | }; |
2519 | |
2520 | |
2521 | === modified file 'src/match_four.c' |
2522 | --- src/match_four.c 2010-11-15 02:48:21 +0000 |
2523 | +++ src/match_four.c 2013-10-26 22:20:55 +0000 |
2524 | @@ -1,5 +1,6 @@ |
2525 | #include "match.h" |
2526 | #include <limits.h> |
2527 | +#include <stdlib.h> |
2528 | |
2529 | typedef unsigned char u8; |
2530 | typedef unsigned int u32; |
2531 | |
2532 | === modified file 'src/state.h' |
2533 | --- src/state.h 2012-03-02 15:29:50 +0000 |
2534 | +++ src/state.h 2013-10-26 22:20:55 +0000 |
2535 | @@ -72,8 +72,8 @@ |
2536 | */ |
2537 | struct mtdev_state { |
2538 | |
2539 | - int has_ext_abs[MT_ABS_SIZE - 11]; |
2540 | - struct input_absinfo ext_abs[MT_ABS_SIZE - 11]; |
2541 | + int has_ext_abs[MT_ABS_SIZE - LEGACY_API_NUM_MT_AXES]; |
2542 | + struct input_absinfo ext_abs[MT_ABS_SIZE - LEGACY_API_NUM_MT_AXES]; |
2543 | |
2544 | struct mtdev_iobuf iobuf; |
2545 | struct mtdev_evbuf inbuf; |
2546 | |
2547 | === modified file 'test/Makefile.am' |
2548 | --- test/Makefile.am 2010-11-15 02:48:21 +0000 |
2549 | +++ test/Makefile.am 2013-10-26 22:20:55 +0000 |
2550 | @@ -1,7 +1,7 @@ |
2551 | noinst_PROGRAMS = mtdev-mapgen mtdev-matching mtdev-kernel |
2552 | bin_PROGRAMS = mtdev-test |
2553 | |
2554 | -INCLUDES=-I$(top_srcdir)/include/ |
2555 | +AM_CPPFLAGS=-I$(top_srcdir)/include/ |
2556 | |
2557 | mtdev_mapgen_SOURCES = mtdev-mapgen.c |
2558 | |
2559 | |
2560 | === modified file 'test/Makefile.in' |
2561 | --- test/Makefile.in 2012-09-05 01:22:39 +0000 |
2562 | +++ test/Makefile.in 2013-10-26 22:20:55 +0000 |
2563 | @@ -1,7 +1,7 @@ |
2564 | -# Makefile.in generated by automake 1.12.3 from Makefile.am. |
2565 | +# Makefile.in generated by automake 1.14 from Makefile.am. |
2566 | # @configure_input@ |
2567 | |
2568 | -# Copyright (C) 1994-2012 Free Software Foundation, Inc. |
2569 | +# Copyright (C) 1994-2013 Free Software Foundation, Inc. |
2570 | |
2571 | # This Makefile.in is free software; the Free Software Foundation |
2572 | # gives unlimited permission to copy and/or distribute it, |
2573 | @@ -15,23 +15,51 @@ |
2574 | @SET_MAKE@ |
2575 | |
2576 | VPATH = @srcdir@ |
2577 | -am__make_dryrun = \ |
2578 | - { \ |
2579 | - am__dry=no; \ |
2580 | +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' |
2581 | +am__make_running_with_option = \ |
2582 | + case $${target_option-} in \ |
2583 | + ?) ;; \ |
2584 | + *) echo "am__make_running_with_option: internal error: invalid" \ |
2585 | + "target option '$${target_option-}' specified" >&2; \ |
2586 | + exit 1;; \ |
2587 | + esac; \ |
2588 | + has_opt=no; \ |
2589 | + sane_makeflags=$$MAKEFLAGS; \ |
2590 | + if $(am__is_gnu_make); then \ |
2591 | + sane_makeflags=$$MFLAGS; \ |
2592 | + else \ |
2593 | case $$MAKEFLAGS in \ |
2594 | *\\[\ \ ]*) \ |
2595 | - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
2596 | - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
2597 | - *) \ |
2598 | - for am__flg in $$MAKEFLAGS; do \ |
2599 | - case $$am__flg in \ |
2600 | - *=*|--*) ;; \ |
2601 | - *n*) am__dry=yes; break;; \ |
2602 | - esac; \ |
2603 | - done;; \ |
2604 | - esac; \ |
2605 | - test $$am__dry = yes; \ |
2606 | - } |
2607 | + bs=\\; \ |
2608 | + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ |
2609 | + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ |
2610 | + esac; \ |
2611 | + fi; \ |
2612 | + skip_next=no; \ |
2613 | + strip_trailopt () \ |
2614 | + { \ |
2615 | + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ |
2616 | + }; \ |
2617 | + for flg in $$sane_makeflags; do \ |
2618 | + test $$skip_next = yes && { skip_next=no; continue; }; \ |
2619 | + case $$flg in \ |
2620 | + *=*|--*) continue;; \ |
2621 | + -*I) strip_trailopt 'I'; skip_next=yes;; \ |
2622 | + -*I?*) strip_trailopt 'I';; \ |
2623 | + -*O) strip_trailopt 'O'; skip_next=yes;; \ |
2624 | + -*O?*) strip_trailopt 'O';; \ |
2625 | + -*l) strip_trailopt 'l'; skip_next=yes;; \ |
2626 | + -*l?*) strip_trailopt 'l';; \ |
2627 | + -[dEDm]) skip_next=yes;; \ |
2628 | + -[JT]) skip_next=yes;; \ |
2629 | + esac; \ |
2630 | + case $$flg in \ |
2631 | + *$$target_option*) has_opt=yes; break;; \ |
2632 | + esac; \ |
2633 | + done; \ |
2634 | + test $$has_opt = yes |
2635 | +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) |
2636 | +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) |
2637 | pkgdatadir = $(datadir)/@PACKAGE@ |
2638 | pkgincludedir = $(includedir)/@PACKAGE@ |
2639 | pkglibdir = $(libdir)/@PACKAGE@ |
2640 | @@ -54,7 +82,7 @@ |
2641 | mtdev-kernel$(EXEEXT) |
2642 | bin_PROGRAMS = mtdev-test$(EXEEXT) |
2643 | subdir = test |
2644 | -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ |
2645 | +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ |
2646 | $(top_srcdir)/config-aux/depcomp |
2647 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
2648 | am__aclocal_m4_deps = $(top_srcdir)/configure.ac |
2649 | @@ -69,7 +97,11 @@ |
2650 | am_mtdev_kernel_OBJECTS = mtdev-kernel.$(OBJEXT) |
2651 | mtdev_kernel_OBJECTS = $(am_mtdev_kernel_OBJECTS) |
2652 | mtdev_kernel_LDADD = $(LDADD) |
2653 | -mtdev_kernel_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ |
2654 | +AM_V_lt = $(am__v_lt_@AM_V@) |
2655 | +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) |
2656 | +am__v_lt_0 = --silent |
2657 | +am__v_lt_1 = |
2658 | +mtdev_kernel_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ |
2659 | $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ |
2660 | $(mtdev_kernel_LDFLAGS) $(LDFLAGS) -o $@ |
2661 | am_mtdev_mapgen_OBJECTS = mtdev-mapgen.$(OBJEXT) |
2662 | @@ -78,28 +110,50 @@ |
2663 | am_mtdev_matching_OBJECTS = mtdev-matching.$(OBJEXT) |
2664 | mtdev_matching_OBJECTS = $(am_mtdev_matching_OBJECTS) |
2665 | mtdev_matching_LDADD = $(LDADD) |
2666 | -mtdev_matching_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ |
2667 | - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ |
2668 | - $(mtdev_matching_LDFLAGS) $(LDFLAGS) -o $@ |
2669 | +mtdev_matching_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ |
2670 | + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ |
2671 | + $(AM_CFLAGS) $(CFLAGS) $(mtdev_matching_LDFLAGS) $(LDFLAGS) -o \ |
2672 | + $@ |
2673 | am_mtdev_test_OBJECTS = mtdev-test.$(OBJEXT) |
2674 | mtdev_test_OBJECTS = $(am_mtdev_test_OBJECTS) |
2675 | mtdev_test_LDADD = $(LDADD) |
2676 | -mtdev_test_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ |
2677 | +mtdev_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ |
2678 | $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ |
2679 | $(mtdev_test_LDFLAGS) $(LDFLAGS) -o $@ |
2680 | +AM_V_P = $(am__v_P_@AM_V@) |
2681 | +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) |
2682 | +am__v_P_0 = false |
2683 | +am__v_P_1 = : |
2684 | +AM_V_GEN = $(am__v_GEN_@AM_V@) |
2685 | +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) |
2686 | +am__v_GEN_0 = @echo " GEN " $@; |
2687 | +am__v_GEN_1 = |
2688 | +AM_V_at = $(am__v_at_@AM_V@) |
2689 | +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) |
2690 | +am__v_at_0 = @ |
2691 | +am__v_at_1 = |
2692 | DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) |
2693 | depcomp = $(SHELL) $(top_srcdir)/config-aux/depcomp |
2694 | am__depfiles_maybe = depfiles |
2695 | am__mv = mv -f |
2696 | COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ |
2697 | $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) |
2698 | -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ |
2699 | - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ |
2700 | - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) |
2701 | +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ |
2702 | + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ |
2703 | + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ |
2704 | + $(AM_CFLAGS) $(CFLAGS) |
2705 | +AM_V_CC = $(am__v_CC_@AM_V@) |
2706 | +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) |
2707 | +am__v_CC_0 = @echo " CC " $@; |
2708 | +am__v_CC_1 = |
2709 | CCLD = $(CC) |
2710 | -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ |
2711 | - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ |
2712 | - $(LDFLAGS) -o $@ |
2713 | +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ |
2714 | + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ |
2715 | + $(AM_LDFLAGS) $(LDFLAGS) -o $@ |
2716 | +AM_V_CCLD = $(am__v_CCLD_@AM_V@) |
2717 | +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) |
2718 | +am__v_CCLD_0 = @echo " CCLD " $@; |
2719 | +am__v_CCLD_1 = |
2720 | SOURCES = $(mtdev_kernel_SOURCES) $(mtdev_mapgen_SOURCES) \ |
2721 | $(mtdev_matching_SOURCES) $(mtdev_test_SOURCES) |
2722 | DIST_SOURCES = $(mtdev_kernel_SOURCES) $(mtdev_mapgen_SOURCES) \ |
2723 | @@ -109,11 +163,29 @@ |
2724 | n|no|NO) false;; \ |
2725 | *) (install-info --version) >/dev/null 2>&1;; \ |
2726 | esac |
2727 | +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) |
2728 | +# Read a list of newline-separated strings from the standard input, |
2729 | +# and print each of them once, without duplicates. Input order is |
2730 | +# *not* preserved. |
2731 | +am__uniquify_input = $(AWK) '\ |
2732 | + BEGIN { nonempty = 0; } \ |
2733 | + { items[$$0] = 1; nonempty = 1; } \ |
2734 | + END { if (nonempty) { for (i in items) print i; }; } \ |
2735 | +' |
2736 | +# Make sure the list of sources is unique. This is necessary because, |
2737 | +# e.g., the same source file might be shared among _SOURCES variables |
2738 | +# for different programs/libraries. |
2739 | +am__define_uniq_tagged_files = \ |
2740 | + list='$(am__tagged_files)'; \ |
2741 | + unique=`for i in $$list; do \ |
2742 | + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
2743 | + done | $(am__uniquify_input)` |
2744 | ETAGS = etags |
2745 | CTAGS = ctags |
2746 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
2747 | ACLOCAL = @ACLOCAL@ |
2748 | AMTAR = @AMTAR@ |
2749 | +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ |
2750 | AR = @AR@ |
2751 | AUTOCONF = @AUTOCONF@ |
2752 | AUTOHEADER = @AUTOHEADER@ |
2753 | @@ -151,7 +223,6 @@ |
2754 | LIPO = @LIPO@ |
2755 | LN_S = @LN_S@ |
2756 | LTLIBOBJS = @LTLIBOBJS@ |
2757 | -MAINT = @MAINT@ |
2758 | MAKEINFO = @MAKEINFO@ |
2759 | MANIFEST_TOOL = @MANIFEST_TOOL@ |
2760 | MKDIR_P = @MKDIR_P@ |
2761 | @@ -227,7 +298,7 @@ |
2762 | top_build_prefix = @top_build_prefix@ |
2763 | top_builddir = @top_builddir@ |
2764 | top_srcdir = @top_srcdir@ |
2765 | -INCLUDES = -I$(top_srcdir)/include/ |
2766 | +AM_CPPFLAGS = -I$(top_srcdir)/include/ |
2767 | mtdev_mapgen_SOURCES = mtdev-mapgen.c |
2768 | mtdev_matching_SOURCES = mtdev-matching.c |
2769 | mtdev_matching_LDFLAGS = -L$(top_builddir)/src/.libs/ -lmtdev |
2770 | @@ -239,7 +310,7 @@ |
2771 | |
2772 | .SUFFIXES: |
2773 | .SUFFIXES: .c .lo .o .obj |
2774 | -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) |
2775 | +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) |
2776 | @for dep in $?; do \ |
2777 | case '$(am__configure_deps)' in \ |
2778 | *$$dep*) \ |
2779 | @@ -264,9 +335,9 @@ |
2780 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) |
2781 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
2782 | |
2783 | -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) |
2784 | +$(top_srcdir)/configure: $(am__configure_deps) |
2785 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
2786 | -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) |
2787 | +$(ACLOCAL_M4): $(am__aclocal_m4_deps) |
2788 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
2789 | $(am__aclocal_m4_deps): |
2790 | install-binPROGRAMS: $(bin_PROGRAMS) |
2791 | @@ -278,10 +349,12 @@ |
2792 | fi; \ |
2793 | for p in $$list; do echo "$$p $$p"; done | \ |
2794 | sed 's/$(EXEEXT)$$//' | \ |
2795 | - while read p p1; do if test -f $$p || test -f $$p1; \ |
2796 | - then echo "$$p"; echo "$$p"; else :; fi; \ |
2797 | + while read p p1; do if test -f $$p \ |
2798 | + || test -f $$p1 \ |
2799 | + ; then echo "$$p"; echo "$$p"; else :; fi; \ |
2800 | done | \ |
2801 | - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ |
2802 | + sed -e 'p;s,.*/,,;n;h' \ |
2803 | + -e 's|.*|.|' \ |
2804 | -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ |
2805 | sed 'N;N;N;s,\n, ,g' | \ |
2806 | $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ |
2807 | @@ -302,7 +375,8 @@ |
2808 | @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ |
2809 | files=`for p in $$list; do echo "$$p"; done | \ |
2810 | sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ |
2811 | - -e 's/$$/$(EXEEXT)/' `; \ |
2812 | + -e 's/$$/$(EXEEXT)/' \ |
2813 | + `; \ |
2814 | test -n "$$list" || exit 0; \ |
2815 | echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ |
2816 | cd "$(DESTDIR)$(bindir)" && rm -f $$files |
2817 | @@ -324,18 +398,22 @@ |
2818 | list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ |
2819 | echo " rm -f" $$list; \ |
2820 | rm -f $$list |
2821 | + |
2822 | mtdev-kernel$(EXEEXT): $(mtdev_kernel_OBJECTS) $(mtdev_kernel_DEPENDENCIES) $(EXTRA_mtdev_kernel_DEPENDENCIES) |
2823 | @rm -f mtdev-kernel$(EXEEXT) |
2824 | - $(mtdev_kernel_LINK) $(mtdev_kernel_OBJECTS) $(mtdev_kernel_LDADD) $(LIBS) |
2825 | + $(AM_V_CCLD)$(mtdev_kernel_LINK) $(mtdev_kernel_OBJECTS) $(mtdev_kernel_LDADD) $(LIBS) |
2826 | + |
2827 | mtdev-mapgen$(EXEEXT): $(mtdev_mapgen_OBJECTS) $(mtdev_mapgen_DEPENDENCIES) $(EXTRA_mtdev_mapgen_DEPENDENCIES) |
2828 | @rm -f mtdev-mapgen$(EXEEXT) |
2829 | - $(LINK) $(mtdev_mapgen_OBJECTS) $(mtdev_mapgen_LDADD) $(LIBS) |
2830 | + $(AM_V_CCLD)$(LINK) $(mtdev_mapgen_OBJECTS) $(mtdev_mapgen_LDADD) $(LIBS) |
2831 | + |
2832 | mtdev-matching$(EXEEXT): $(mtdev_matching_OBJECTS) $(mtdev_matching_DEPENDENCIES) $(EXTRA_mtdev_matching_DEPENDENCIES) |
2833 | @rm -f mtdev-matching$(EXEEXT) |
2834 | - $(mtdev_matching_LINK) $(mtdev_matching_OBJECTS) $(mtdev_matching_LDADD) $(LIBS) |
2835 | + $(AM_V_CCLD)$(mtdev_matching_LINK) $(mtdev_matching_OBJECTS) $(mtdev_matching_LDADD) $(LIBS) |
2836 | + |
2837 | mtdev-test$(EXEEXT): $(mtdev_test_OBJECTS) $(mtdev_test_DEPENDENCIES) $(EXTRA_mtdev_test_DEPENDENCIES) |
2838 | @rm -f mtdev-test$(EXEEXT) |
2839 | - $(mtdev_test_LINK) $(mtdev_test_OBJECTS) $(mtdev_test_LDADD) $(LIBS) |
2840 | + $(AM_V_CCLD)$(mtdev_test_LINK) $(mtdev_test_OBJECTS) $(mtdev_test_LDADD) $(LIBS) |
2841 | |
2842 | mostlyclean-compile: |
2843 | -rm -f *.$(OBJEXT) |
2844 | @@ -349,25 +427,25 @@ |
2845 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mtdev-test.Po@am__quote@ |
2846 | |
2847 | .c.o: |
2848 | -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< |
2849 | -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po |
2850 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ |
2851 | +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< |
2852 | +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po |
2853 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ |
2854 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
2855 | -@am__fastdepCC_FALSE@ $(COMPILE) -c $< |
2856 | +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< |
2857 | |
2858 | .c.obj: |
2859 | -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` |
2860 | -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po |
2861 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ |
2862 | +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` |
2863 | +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po |
2864 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ |
2865 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
2866 | -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` |
2867 | +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` |
2868 | |
2869 | .c.lo: |
2870 | -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< |
2871 | -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo |
2872 | -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ |
2873 | +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< |
2874 | +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo |
2875 | +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ |
2876 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
2877 | -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< |
2878 | +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< |
2879 | |
2880 | mostlyclean-libtool: |
2881 | -rm -f *.lo |
2882 | @@ -375,26 +453,15 @@ |
2883 | clean-libtool: |
2884 | -rm -rf .libs _libs |
2885 | |
2886 | -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) |
2887 | - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
2888 | - unique=`for i in $$list; do \ |
2889 | - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
2890 | - done | \ |
2891 | - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
2892 | - END { if (nonempty) { for (i in files) print i; }; }'`; \ |
2893 | - mkid -fID $$unique |
2894 | -tags: TAGS |
2895 | +ID: $(am__tagged_files) |
2896 | + $(am__define_uniq_tagged_files); mkid -fID $$unique |
2897 | +tags: tags-am |
2898 | +TAGS: tags |
2899 | |
2900 | -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ |
2901 | - $(TAGS_FILES) $(LISP) |
2902 | +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) |
2903 | set x; \ |
2904 | here=`pwd`; \ |
2905 | - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
2906 | - unique=`for i in $$list; do \ |
2907 | - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
2908 | - done | \ |
2909 | - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
2910 | - END { if (nonempty) { for (i in files) print i; }; }'`; \ |
2911 | + $(am__define_uniq_tagged_files); \ |
2912 | shift; \ |
2913 | if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ |
2914 | test -n "$$unique" || unique=$$empty_fix; \ |
2915 | @@ -406,15 +473,11 @@ |
2916 | $$unique; \ |
2917 | fi; \ |
2918 | fi |
2919 | -ctags: CTAGS |
2920 | -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ |
2921 | - $(TAGS_FILES) $(LISP) |
2922 | - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
2923 | - unique=`for i in $$list; do \ |
2924 | - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
2925 | - done | \ |
2926 | - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
2927 | - END { if (nonempty) { for (i in files) print i; }; }'`; \ |
2928 | +ctags: ctags-am |
2929 | + |
2930 | +CTAGS: ctags |
2931 | +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) |
2932 | + $(am__define_uniq_tagged_files); \ |
2933 | test -z "$(CTAGS_ARGS)$$unique" \ |
2934 | || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ |
2935 | $$unique |
2936 | @@ -423,9 +486,10 @@ |
2937 | here=`$(am__cd) $(top_builddir) && pwd` \ |
2938 | && $(am__cd) $(top_srcdir) \ |
2939 | && gtags -i $(GTAGS_ARGS) "$$here" |
2940 | +cscopelist: cscopelist-am |
2941 | |
2942 | -cscopelist: $(HEADERS) $(SOURCES) $(LISP) |
2943 | - list='$(SOURCES) $(HEADERS) $(LISP)'; \ |
2944 | +cscopelist-am: $(am__tagged_files) |
2945 | + list='$(am__tagged_files)'; \ |
2946 | case "$(srcdir)" in \ |
2947 | [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ |
2948 | *) sdir=$(subdir)/$(srcdir) ;; \ |
2949 | @@ -581,19 +645,20 @@ |
2950 | |
2951 | .MAKE: install-am install-strip |
2952 | |
2953 | -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ |
2954 | - clean-generic clean-libtool clean-noinstPROGRAMS cscopelist \ |
2955 | - ctags distclean distclean-compile distclean-generic \ |
2956 | - distclean-libtool distclean-tags distdir dvi dvi-am html \ |
2957 | - html-am info info-am install install-am install-binPROGRAMS \ |
2958 | - install-data install-data-am install-dvi install-dvi-am \ |
2959 | - install-exec install-exec-am install-html install-html-am \ |
2960 | - install-info install-info-am install-man install-pdf \ |
2961 | - install-pdf-am install-ps install-ps-am install-strip \ |
2962 | - installcheck installcheck-am installdirs maintainer-clean \ |
2963 | +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ |
2964 | + clean-binPROGRAMS clean-generic clean-libtool \ |
2965 | + clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \ |
2966 | + distclean-compile distclean-generic distclean-libtool \ |
2967 | + distclean-tags distdir dvi dvi-am html html-am info info-am \ |
2968 | + install install-am install-binPROGRAMS install-data \ |
2969 | + install-data-am install-dvi install-dvi-am install-exec \ |
2970 | + install-exec-am install-html install-html-am install-info \ |
2971 | + install-info-am install-man install-pdf install-pdf-am \ |
2972 | + install-ps install-ps-am install-strip installcheck \ |
2973 | + installcheck-am installdirs maintainer-clean \ |
2974 | maintainer-clean-generic mostlyclean mostlyclean-compile \ |
2975 | mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ |
2976 | - tags uninstall uninstall-am uninstall-binPROGRAMS |
2977 | + tags tags-am uninstall uninstall-am uninstall-binPROGRAMS |
2978 | |
2979 | |
2980 | # Tell versions [3.59,3.63) of GNU make to not export all variables. |
2981 | |
2982 | === modified file 'test/mtdev-kernel.c' |
2983 | --- test/mtdev-kernel.c 2010-11-15 02:48:21 +0000 |
2984 | +++ test/mtdev-kernel.c 2013-10-26 22:20:55 +0000 |
2985 | @@ -28,6 +28,7 @@ |
2986 | |
2987 | #include <../src/common.h> |
2988 | #include <stdio.h> |
2989 | +#include <stdlib.h> |
2990 | #include <time.h> |
2991 | |
2992 | /* |
Thanks. Uploaded.