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 | 1 | commit 25070dda4b1aaaf402db621d10fc901b82d78377 | ||
6 | 2 | Author: Henrik Rydberg <rydberg@euromail.se> | ||
7 | 3 | Date: Sat Aug 3 22:01:06 2013 +0200 | ||
8 | 4 | |||
9 | 5 | Release mtdev-1.1.4 | ||
10 | 6 | |||
11 | 7 | Signed-off-by: Henrik Rydberg <rydberg@euromail.se> | ||
12 | 8 | |||
13 | 9 | commit 72bbb5f42fe8e47d6314eb92a0ada6554644305c | ||
14 | 10 | Merge: b5d8e8e a9ea316 | ||
15 | 11 | Author: Henrik Rydberg <rydberg@euromail.se> | ||
16 | 12 | Date: Wed Jul 31 19:25:50 2013 +0200 | ||
17 | 13 | |||
18 | 14 | Merge more build fixes from Peter Hutterer, along with a more explicit | ||
19 | 15 | declaration of the backwards compatibility constraints on the API. | ||
20 | 16 | |||
21 | 17 | Signed-off-by: Henrik Rydberg <rydberg@euromail.se> | ||
22 | 18 | |||
23 | 19 | commit a9ea3168615056360cdb21d6f1576d66be2a43fe | ||
24 | 20 | Author: Peter Hutterer <peter.hutterer@who-t.net> | ||
25 | 21 | Date: Wed Jul 24 14:24:43 2013 +1000 | ||
26 | 22 | |||
27 | 23 | Enable silent rules by default | ||
28 | 24 | |||
29 | 25 | silent rules make it easier to spot compiler errors | ||
30 | 26 | |||
31 | 27 | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> | ||
32 | 28 | |||
33 | 29 | commit 0bccf8c5268826bdb0835dd9b7964bcc95bae35f | ||
34 | 30 | Author: Peter Hutterer <peter.hutterer@who-t.net> | ||
35 | 31 | Date: Wed Jul 24 14:23:25 2013 +1000 | ||
36 | 32 | |||
37 | 33 | test: silence compiler warning - implicit declaration of function ‘atoi’ | ||
38 | 34 | |||
39 | 35 | mtdev-kernel.c:130:2: warning: implicit declaration of function ‘atoi’ | ||
40 | 36 | [-Wimplicit-function-declaration] | ||
41 | 37 | eslot = atoi(argv[1]) + 1; | ||
42 | 38 | |||
43 | 39 | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> | ||
44 | 40 | |||
45 | 41 | commit 1ddaf0af41098d0a01eac162c6fe4d38f2fbbbad | ||
46 | 42 | Author: Peter Hutterer <peter.hutterer@who-t.net> | ||
47 | 43 | Date: Wed Jul 24 13:00:32 2013 +1000 | ||
48 | 44 | |||
49 | 45 | Fix compiler warning - implicit declaration of function 'abs' | ||
50 | 46 | |||
51 | 47 | match_four.c:80:4: warning: implicit declaration of function 'abs' | ||
52 | 48 | [-Wimplicit-function-declaration] | ||
53 | 49 | *dist++ = abs(q->x - p->x) + abs(q->y - p->y); | ||
54 | 50 | |||
55 | 51 | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> | ||
56 | 52 | |||
57 | 53 | commit 6f7c5c558006bb69fdf0af73103097c012ccfed5 | ||
58 | 54 | Author: Peter Hutterer <peter.hutterer@who-t.net> | ||
59 | 55 | Date: Thu Jul 25 13:21:09 2013 +1000 | ||
60 | 56 | |||
61 | 57 | Replace hardcoded 11 with a define | ||
62 | 58 | |||
63 | 59 | The 11 comes from the legacy API that we need to be binary compatible with. | ||
64 | 60 | Make this clear with a define and a comment. | ||
65 | 61 | |||
66 | 62 | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> | ||
67 | 63 | |||
68 | 64 | commit b5d8e8e26c0116e4b6e556a0f6da8777bc55c590 | ||
69 | 65 | Merge: e5eb274 f4fe569 | ||
70 | 66 | Author: Henrik Rydberg <rydberg@euromail.se> | ||
71 | 67 | Date: Thu Jul 25 10:05:20 2013 +0200 | ||
72 | 68 | |||
73 | 69 | Merge build fixes from Peter Hutterer. | ||
74 | 70 | |||
75 | 71 | Signed-off-by: Henrik Rydberg <rydberg@euromail.se> | ||
76 | 72 | |||
77 | 73 | commit f4fe56973a29265e22f049ceed1e299573f90ec4 | ||
78 | 74 | Author: Peter Hutterer <peter.hutterer@who-t.net> | ||
79 | 75 | Date: Wed Jul 3 15:49:21 2013 +1000 | ||
80 | 76 | |||
81 | 77 | Rename INCLUDES to AM_CPPFLAGS | ||
82 | 78 | |||
83 | 79 | src/Makefile.am:22: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') | ||
84 | 80 | |||
85 | 81 | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> | ||
86 | 82 | |||
87 | 83 | commit e79f2b211830dec2bae35595c6dfd1d06f75d903 | ||
88 | 84 | Author: Peter Hutterer <peter.hutterer@who-t.net> | ||
89 | 85 | Date: Wed Jul 3 15:45:12 2013 +1000 | ||
90 | 86 | |||
91 | 87 | Drop maintainer mode - enable by default | ||
92 | 88 | |||
93 | 89 | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> | ||
94 | 90 | |||
95 | 1 | commit e5eb27494cd237e60645db4d7be5b4acf41cb5e0 | 91 | commit e5eb27494cd237e60645db4d7be5b4acf41cb5e0 |
96 | 2 | Author: Henrik Rydberg <rydberg@euromail.se> | 92 | Author: Henrik Rydberg <rydberg@euromail.se> |
97 | 3 | Date: Wed Aug 22 22:20:16 2012 +0200 | 93 | Date: Wed Aug 22 22:20:16 2012 +0200 |
98 | 4 | 94 | ||
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 | 3 | pkgconfigdir = $(libdir)/pkgconfig | 3 | pkgconfigdir = $(libdir)/pkgconfig |
104 | 4 | pkgconfig_DATA = mtdev.pc | 4 | pkgconfig_DATA = mtdev.pc |
105 | 5 | 5 | ||
107 | 6 | INCLUDES = $(top_srcdir)/include/ | 6 | AM_CPPFLAGS = $(top_srcdir)/include/ |
108 | 7 | 7 | ||
109 | 8 | .PHONY: ChangeLog INSTALL | 8 | .PHONY: ChangeLog INSTALL |
110 | 9 | INSTALL: | 9 | INSTALL: |
111 | 10 | 10 | ||
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 @@ | |||
117 | 1 | # Makefile.in generated by automake 1.12.3 from Makefile.am. | 1 | # Makefile.in generated by automake 1.14 from Makefile.am. |
118 | 2 | # @configure_input@ | 2 | # @configure_input@ |
119 | 3 | 3 | ||
121 | 4 | # Copyright (C) 1994-2012 Free Software Foundation, Inc. | 4 | # Copyright (C) 1994-2013 Free Software Foundation, Inc. |
122 | 5 | 5 | ||
123 | 6 | # This Makefile.in is free software; the Free Software Foundation | 6 | # This Makefile.in is free software; the Free Software Foundation |
124 | 7 | # gives unlimited permission to copy and/or distribute it, | 7 | # gives unlimited permission to copy and/or distribute it, |
125 | @@ -15,23 +15,51 @@ | |||
126 | 15 | @SET_MAKE@ | 15 | @SET_MAKE@ |
127 | 16 | 16 | ||
128 | 17 | VPATH = @srcdir@ | 17 | VPATH = @srcdir@ |
132 | 18 | am__make_dryrun = \ | 18 | am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' |
133 | 19 | { \ | 19 | am__make_running_with_option = \ |
134 | 20 | am__dry=no; \ | 20 | case $${target_option-} in \ |
135 | 21 | ?) ;; \ | ||
136 | 22 | *) echo "am__make_running_with_option: internal error: invalid" \ | ||
137 | 23 | "target option '$${target_option-}' specified" >&2; \ | ||
138 | 24 | exit 1;; \ | ||
139 | 25 | esac; \ | ||
140 | 26 | has_opt=no; \ | ||
141 | 27 | sane_makeflags=$$MAKEFLAGS; \ | ||
142 | 28 | if $(am__is_gnu_make); then \ | ||
143 | 29 | sane_makeflags=$$MFLAGS; \ | ||
144 | 30 | else \ | ||
145 | 21 | case $$MAKEFLAGS in \ | 31 | case $$MAKEFLAGS in \ |
146 | 22 | *\\[\ \ ]*) \ | 32 | *\\[\ \ ]*) \ |
159 | 23 | echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ | 33 | bs=\\; \ |
160 | 24 | | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ | 34 | sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ |
161 | 25 | *) \ | 35 | | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ |
162 | 26 | for am__flg in $$MAKEFLAGS; do \ | 36 | esac; \ |
163 | 27 | case $$am__flg in \ | 37 | fi; \ |
164 | 28 | *=*|--*) ;; \ | 38 | skip_next=no; \ |
165 | 29 | *n*) am__dry=yes; break;; \ | 39 | strip_trailopt () \ |
166 | 30 | esac; \ | 40 | { \ |
167 | 31 | done;; \ | 41 | flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ |
168 | 32 | esac; \ | 42 | }; \ |
169 | 33 | test $$am__dry = yes; \ | 43 | for flg in $$sane_makeflags; do \ |
170 | 34 | } | 44 | test $$skip_next = yes && { skip_next=no; continue; }; \ |
171 | 45 | case $$flg in \ | ||
172 | 46 | *=*|--*) continue;; \ | ||
173 | 47 | -*I) strip_trailopt 'I'; skip_next=yes;; \ | ||
174 | 48 | -*I?*) strip_trailopt 'I';; \ | ||
175 | 49 | -*O) strip_trailopt 'O'; skip_next=yes;; \ | ||
176 | 50 | -*O?*) strip_trailopt 'O';; \ | ||
177 | 51 | -*l) strip_trailopt 'l'; skip_next=yes;; \ | ||
178 | 52 | -*l?*) strip_trailopt 'l';; \ | ||
179 | 53 | -[dEDm]) skip_next=yes;; \ | ||
180 | 54 | -[JT]) skip_next=yes;; \ | ||
181 | 55 | esac; \ | ||
182 | 56 | case $$flg in \ | ||
183 | 57 | *$$target_option*) has_opt=yes; break;; \ | ||
184 | 58 | esac; \ | ||
185 | 59 | done; \ | ||
186 | 60 | test $$has_opt = yes | ||
187 | 61 | am__make_dryrun = (target_option=n; $(am__make_running_with_option)) | ||
188 | 62 | am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) | ||
189 | 35 | pkgdatadir = $(datadir)/@PACKAGE@ | 63 | pkgdatadir = $(datadir)/@PACKAGE@ |
190 | 36 | pkgincludedir = $(includedir)/@PACKAGE@ | 64 | pkgincludedir = $(includedir)/@PACKAGE@ |
191 | 37 | pkglibdir = $(libdir)/@PACKAGE@ | 65 | pkglibdir = $(libdir)/@PACKAGE@ |
192 | @@ -51,16 +79,18 @@ | |||
193 | 51 | build_triplet = @build@ | 79 | build_triplet = @build@ |
194 | 52 | host_triplet = @host@ | 80 | host_triplet = @host@ |
195 | 53 | subdir = . | 81 | subdir = . |
199 | 54 | DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ | 82 | DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ |
200 | 55 | $(srcdir)/Makefile.in $(srcdir)/config.h.in \ | 83 | $(top_srcdir)/configure $(am__configure_deps) \ |
201 | 56 | $(srcdir)/mtdev.pc.in $(top_srcdir)/config-aux/config.guess \ | 84 | $(srcdir)/config.h.in $(srcdir)/mtdev.pc.in COPYING ChangeLog \ |
202 | 85 | INSTALL README config-aux/compile config-aux/config.guess \ | ||
203 | 86 | config-aux/config.sub config-aux/depcomp config-aux/install-sh \ | ||
204 | 87 | config-aux/missing config-aux/ltmain.sh \ | ||
205 | 88 | $(top_srcdir)/config-aux/compile \ | ||
206 | 89 | $(top_srcdir)/config-aux/config.guess \ | ||
207 | 57 | $(top_srcdir)/config-aux/config.sub \ | 90 | $(top_srcdir)/config-aux/config.sub \ |
208 | 58 | $(top_srcdir)/config-aux/install-sh \ | 91 | $(top_srcdir)/config-aux/install-sh \ |
209 | 59 | $(top_srcdir)/config-aux/ltmain.sh \ | 92 | $(top_srcdir)/config-aux/ltmain.sh \ |
214 | 60 | $(top_srcdir)/config-aux/missing $(top_srcdir)/configure \ | 93 | $(top_srcdir)/config-aux/missing |
211 | 61 | COPYING ChangeLog INSTALL config-aux/config.guess \ | ||
212 | 62 | config-aux/config.sub config-aux/depcomp config-aux/install-sh \ | ||
213 | 63 | config-aux/ltmain.sh config-aux/missing | ||
215 | 64 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | 94 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
216 | 65 | am__aclocal_m4_deps = $(top_srcdir)/configure.ac | 95 | am__aclocal_m4_deps = $(top_srcdir)/configure.ac |
217 | 66 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | 96 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
218 | @@ -71,15 +101,28 @@ | |||
219 | 71 | CONFIG_HEADER = config.h | 101 | CONFIG_HEADER = config.h |
220 | 72 | CONFIG_CLEAN_FILES = mtdev.pc | 102 | CONFIG_CLEAN_FILES = mtdev.pc |
221 | 73 | CONFIG_CLEAN_VPATH_FILES = | 103 | CONFIG_CLEAN_VPATH_FILES = |
222 | 104 | AM_V_P = $(am__v_P_@AM_V@) | ||
223 | 105 | am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) | ||
224 | 106 | am__v_P_0 = false | ||
225 | 107 | am__v_P_1 = : | ||
226 | 108 | AM_V_GEN = $(am__v_GEN_@AM_V@) | ||
227 | 109 | am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) | ||
228 | 110 | am__v_GEN_0 = @echo " GEN " $@; | ||
229 | 111 | am__v_GEN_1 = | ||
230 | 112 | AM_V_at = $(am__v_at_@AM_V@) | ||
231 | 113 | am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) | ||
232 | 114 | am__v_at_0 = @ | ||
233 | 115 | am__v_at_1 = | ||
234 | 74 | SOURCES = | 116 | SOURCES = |
235 | 75 | DIST_SOURCES = | 117 | DIST_SOURCES = |
243 | 76 | RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ | 118 | RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ |
244 | 77 | html-recursive info-recursive install-data-recursive \ | 119 | ctags-recursive dvi-recursive html-recursive info-recursive \ |
245 | 78 | install-dvi-recursive install-exec-recursive \ | 120 | install-data-recursive install-dvi-recursive \ |
246 | 79 | install-html-recursive install-info-recursive \ | 121 | install-exec-recursive install-html-recursive \ |
247 | 80 | install-pdf-recursive install-ps-recursive install-recursive \ | 122 | install-info-recursive install-pdf-recursive \ |
248 | 81 | installcheck-recursive installdirs-recursive pdf-recursive \ | 123 | install-ps-recursive install-recursive installcheck-recursive \ |
249 | 82 | ps-recursive uninstall-recursive | 124 | installdirs-recursive pdf-recursive ps-recursive \ |
250 | 125 | tags-recursive uninstall-recursive | ||
251 | 83 | am__can_run_installinfo = \ | 126 | am__can_run_installinfo = \ |
252 | 84 | case $$AM_UPDATE_INFO_DIR in \ | 127 | case $$AM_UPDATE_INFO_DIR in \ |
253 | 85 | n|no|NO) false;; \ | 128 | n|no|NO) false;; \ |
254 | @@ -116,9 +159,30 @@ | |||
255 | 116 | DATA = $(pkgconfig_DATA) | 159 | DATA = $(pkgconfig_DATA) |
256 | 117 | RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ | 160 | RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ |
257 | 118 | distclean-recursive maintainer-clean-recursive | 161 | distclean-recursive maintainer-clean-recursive |
260 | 119 | AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ | 162 | am__recursive_targets = \ |
261 | 120 | $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ | 163 | $(RECURSIVE_TARGETS) \ |
262 | 164 | $(RECURSIVE_CLEAN_TARGETS) \ | ||
263 | 165 | $(am__extra_recursive_targets) | ||
264 | 166 | AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ | ||
265 | 121 | cscope distdir dist dist-all distcheck | 167 | cscope distdir dist dist-all distcheck |
266 | 168 | am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ | ||
267 | 169 | $(LISP)config.h.in | ||
268 | 170 | # Read a list of newline-separated strings from the standard input, | ||
269 | 171 | # and print each of them once, without duplicates. Input order is | ||
270 | 172 | # *not* preserved. | ||
271 | 173 | am__uniquify_input = $(AWK) '\ | ||
272 | 174 | BEGIN { nonempty = 0; } \ | ||
273 | 175 | { items[$$0] = 1; nonempty = 1; } \ | ||
274 | 176 | END { if (nonempty) { for (i in items) print i; }; } \ | ||
275 | 177 | ' | ||
276 | 178 | # Make sure the list of sources is unique. This is necessary because, | ||
277 | 179 | # e.g., the same source file might be shared among _SOURCES variables | ||
278 | 180 | # for different programs/libraries. | ||
279 | 181 | am__define_uniq_tagged_files = \ | ||
280 | 182 | list='$(am__tagged_files)'; \ | ||
281 | 183 | unique=`for i in $$list; do \ | ||
282 | 184 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | ||
283 | 185 | done | $(am__uniquify_input)` | ||
284 | 122 | ETAGS = etags | 186 | ETAGS = etags |
285 | 123 | CTAGS = ctags | 187 | CTAGS = ctags |
286 | 124 | CSCOPE = cscope | 188 | CSCOPE = cscope |
287 | @@ -167,6 +231,7 @@ | |||
288 | 167 | distcleancheck_listfiles = find . -type f -print | 231 | distcleancheck_listfiles = find . -type f -print |
289 | 168 | ACLOCAL = @ACLOCAL@ | 232 | ACLOCAL = @ACLOCAL@ |
290 | 169 | AMTAR = @AMTAR@ | 233 | AMTAR = @AMTAR@ |
291 | 234 | AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ | ||
292 | 170 | AR = @AR@ | 235 | AR = @AR@ |
293 | 171 | AUTOCONF = @AUTOCONF@ | 236 | AUTOCONF = @AUTOCONF@ |
294 | 172 | AUTOHEADER = @AUTOHEADER@ | 237 | AUTOHEADER = @AUTOHEADER@ |
295 | @@ -204,7 +269,6 @@ | |||
296 | 204 | LIPO = @LIPO@ | 269 | LIPO = @LIPO@ |
297 | 205 | LN_S = @LN_S@ | 270 | LN_S = @LN_S@ |
298 | 206 | LTLIBOBJS = @LTLIBOBJS@ | 271 | LTLIBOBJS = @LTLIBOBJS@ |
299 | 207 | MAINT = @MAINT@ | ||
300 | 208 | MAKEINFO = @MAKEINFO@ | 272 | MAKEINFO = @MAKEINFO@ |
301 | 209 | MANIFEST_TOOL = @MANIFEST_TOOL@ | 273 | MANIFEST_TOOL = @MANIFEST_TOOL@ |
302 | 210 | MKDIR_P = @MKDIR_P@ | 274 | MKDIR_P = @MKDIR_P@ |
303 | @@ -283,14 +347,14 @@ | |||
304 | 283 | SUBDIRS = src test | 347 | SUBDIRS = src test |
305 | 284 | pkgconfigdir = $(libdir)/pkgconfig | 348 | pkgconfigdir = $(libdir)/pkgconfig |
306 | 285 | pkgconfig_DATA = mtdev.pc | 349 | pkgconfig_DATA = mtdev.pc |
308 | 286 | INCLUDES = $(top_srcdir)/include/ | 350 | AM_CPPFLAGS = $(top_srcdir)/include/ |
309 | 287 | all: config.h | 351 | all: config.h |
310 | 288 | $(MAKE) $(AM_MAKEFLAGS) all-recursive | 352 | $(MAKE) $(AM_MAKEFLAGS) all-recursive |
311 | 289 | 353 | ||
312 | 290 | .SUFFIXES: | 354 | .SUFFIXES: |
313 | 291 | am--refresh: Makefile | 355 | am--refresh: Makefile |
314 | 292 | @: | 356 | @: |
316 | 293 | $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | 357 | $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) |
317 | 294 | @for dep in $?; do \ | 358 | @for dep in $?; do \ |
318 | 295 | case '$(am__configure_deps)' in \ | 359 | case '$(am__configure_deps)' in \ |
319 | 296 | *$$dep*) \ | 360 | *$$dep*) \ |
320 | @@ -317,20 +381,20 @@ | |||
321 | 317 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | 381 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) |
322 | 318 | $(SHELL) ./config.status --recheck | 382 | $(SHELL) ./config.status --recheck |
323 | 319 | 383 | ||
325 | 320 | $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | 384 | $(top_srcdir)/configure: $(am__configure_deps) |
326 | 321 | $(am__cd) $(srcdir) && $(AUTOCONF) | 385 | $(am__cd) $(srcdir) && $(AUTOCONF) |
328 | 322 | $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | 386 | $(ACLOCAL_M4): $(am__aclocal_m4_deps) |
329 | 323 | $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) | 387 | $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) |
330 | 324 | $(am__aclocal_m4_deps): | 388 | $(am__aclocal_m4_deps): |
331 | 325 | 389 | ||
332 | 326 | config.h: stamp-h1 | 390 | config.h: stamp-h1 |
335 | 327 | @if test ! -f $@; then rm -f stamp-h1; else :; fi | 391 | @test -f $@ || rm -f stamp-h1 |
336 | 328 | @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi | 392 | @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 |
337 | 329 | 393 | ||
338 | 330 | stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status | 394 | stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status |
339 | 331 | @rm -f stamp-h1 | 395 | @rm -f stamp-h1 |
340 | 332 | cd $(top_builddir) && $(SHELL) ./config.status config.h | 396 | cd $(top_builddir) && $(SHELL) ./config.status config.h |
342 | 333 | $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | 397 | $(srcdir)/config.h.in: $(am__configure_deps) |
343 | 334 | ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) | 398 | ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) |
344 | 335 | rm -f stamp-h1 | 399 | rm -f stamp-h1 |
345 | 336 | touch $@ | 400 | touch $@ |
346 | @@ -376,14 +440,13 @@ | |||
347 | 376 | # (1) if the variable is set in 'config.status', edit 'config.status' | 440 | # (1) if the variable is set in 'config.status', edit 'config.status' |
348 | 377 | # (which will cause the Makefiles to be regenerated when you run 'make'); | 441 | # (which will cause the Makefiles to be regenerated when you run 'make'); |
349 | 378 | # (2) otherwise, pass the desired values on the 'make' command line. | 442 | # (2) otherwise, pass the desired values on the 'make' command line. |
358 | 379 | $(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): | 443 | $(am__recursive_targets): |
359 | 380 | @fail= failcom='exit 1'; \ | 444 | @fail=; \ |
360 | 381 | for f in x $$MAKEFLAGS; do \ | 445 | if $(am__make_keepgoing); then \ |
361 | 382 | case $$f in \ | 446 | failcom='fail=yes'; \ |
362 | 383 | *=* | --[!k]*);; \ | 447 | else \ |
363 | 384 | *k*) failcom='fail=yes';; \ | 448 | failcom='exit 1'; \ |
364 | 385 | esac; \ | 449 | fi; \ |
357 | 386 | done; \ | ||
365 | 387 | dot_seen=no; \ | 450 | dot_seen=no; \ |
366 | 388 | target=`echo $@ | sed s/-recursive//`; \ | 451 | target=`echo $@ | sed s/-recursive//`; \ |
367 | 389 | case "$@" in \ | 452 | case "$@" in \ |
368 | @@ -404,31 +467,13 @@ | |||
369 | 404 | if test "$$dot_seen" = "no"; then \ | 467 | if test "$$dot_seen" = "no"; then \ |
370 | 405 | $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ | 468 | $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ |
371 | 406 | fi; test -z "$$fail" | 469 | fi; test -z "$$fail" |
397 | 407 | tags-recursive: | 470 | |
398 | 408 | list='$(SUBDIRS)'; for subdir in $$list; do \ | 471 | ID: $(am__tagged_files) |
399 | 409 | test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ | 472 | $(am__define_uniq_tagged_files); mkid -fID $$unique |
400 | 410 | done | 473 | tags: tags-recursive |
401 | 411 | ctags-recursive: | 474 | TAGS: tags |
402 | 412 | list='$(SUBDIRS)'; for subdir in $$list; do \ | 475 | |
403 | 413 | test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ | 476 | tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) |
379 | 414 | done | ||
380 | 415 | cscopelist-recursive: | ||
381 | 416 | list='$(SUBDIRS)'; for subdir in $$list; do \ | ||
382 | 417 | test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ | ||
383 | 418 | done | ||
384 | 419 | |||
385 | 420 | ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) | ||
386 | 421 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | ||
387 | 422 | unique=`for i in $$list; do \ | ||
388 | 423 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | ||
389 | 424 | done | \ | ||
390 | 425 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
391 | 426 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
392 | 427 | mkid -fID $$unique | ||
393 | 428 | tags: TAGS | ||
394 | 429 | |||
395 | 430 | TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ | ||
396 | 431 | $(TAGS_FILES) $(LISP) | ||
404 | 432 | set x; \ | 477 | set x; \ |
405 | 433 | here=`pwd`; \ | 478 | here=`pwd`; \ |
406 | 434 | if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ | 479 | if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ |
407 | @@ -444,12 +489,7 @@ | |||
408 | 444 | set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ | 489 | set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ |
409 | 445 | fi; \ | 490 | fi; \ |
410 | 446 | done; \ | 491 | done; \ |
417 | 447 | list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ | 492 | $(am__define_uniq_tagged_files); \ |
412 | 448 | unique=`for i in $$list; do \ | ||
413 | 449 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | ||
414 | 450 | done | \ | ||
415 | 451 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
416 | 452 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
418 | 453 | shift; \ | 493 | shift; \ |
419 | 454 | if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ | 494 | if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ |
420 | 455 | test -n "$$unique" || unique=$$empty_fix; \ | 495 | test -n "$$unique" || unique=$$empty_fix; \ |
421 | @@ -461,15 +501,11 @@ | |||
422 | 461 | $$unique; \ | 501 | $$unique; \ |
423 | 462 | fi; \ | 502 | fi; \ |
424 | 463 | fi | 503 | fi |
434 | 464 | ctags: CTAGS | 504 | ctags: ctags-recursive |
435 | 465 | CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ | 505 | |
436 | 466 | $(TAGS_FILES) $(LISP) | 506 | CTAGS: ctags |
437 | 467 | list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ | 507 | ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) |
438 | 468 | unique=`for i in $$list; do \ | 508 | $(am__define_uniq_tagged_files); \ |
430 | 469 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | ||
431 | 470 | done | \ | ||
432 | 471 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
433 | 472 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
439 | 473 | test -z "$(CTAGS_ARGS)$$unique" \ | 509 | test -z "$(CTAGS_ARGS)$$unique" \ |
440 | 474 | || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ | 510 | || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ |
441 | 475 | $$unique | 511 | $$unique |
442 | @@ -478,18 +514,16 @@ | |||
443 | 478 | here=`$(am__cd) $(top_builddir) && pwd` \ | 514 | here=`$(am__cd) $(top_builddir) && pwd` \ |
444 | 479 | && $(am__cd) $(top_srcdir) \ | 515 | && $(am__cd) $(top_srcdir) \ |
445 | 480 | && gtags -i $(GTAGS_ARGS) "$$here" | 516 | && gtags -i $(GTAGS_ARGS) "$$here" |
446 | 481 | |||
447 | 482 | cscope: cscope.files | 517 | cscope: cscope.files |
448 | 483 | test ! -s cscope.files \ | 518 | test ! -s cscope.files \ |
449 | 484 | || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) | 519 | || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) |
450 | 485 | |||
451 | 486 | clean-cscope: | 520 | clean-cscope: |
452 | 487 | -rm -f cscope.files | 521 | -rm -f cscope.files |
458 | 488 | 522 | cscope.files: clean-cscope cscopelist | |
459 | 489 | cscope.files: clean-cscope cscopelist-recursive cscopelist | 523 | cscopelist: cscopelist-recursive |
460 | 490 | 524 | ||
461 | 491 | cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) | 525 | cscopelist-am: $(am__tagged_files) |
462 | 492 | list='$(SOURCES) $(HEADERS) $(LISP)'; \ | 526 | list='$(am__tagged_files)'; \ |
463 | 493 | case "$(srcdir)" in \ | 527 | case "$(srcdir)" in \ |
464 | 494 | [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ | 528 | [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ |
465 | 495 | *) sdir=$(subdir)/$(srcdir) ;; \ | 529 | *) sdir=$(subdir)/$(srcdir) ;; \ |
466 | @@ -589,10 +623,16 @@ | |||
467 | 589 | $(am__post_remove_distdir) | 623 | $(am__post_remove_distdir) |
468 | 590 | 624 | ||
469 | 591 | dist-tarZ: distdir | 625 | dist-tarZ: distdir |
470 | 626 | @echo WARNING: "Support for shar distribution archives is" \ | ||
471 | 627 | "deprecated." >&2 | ||
472 | 628 | @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 | ||
473 | 592 | tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z | 629 | tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z |
474 | 593 | $(am__post_remove_distdir) | 630 | $(am__post_remove_distdir) |
475 | 594 | 631 | ||
476 | 595 | dist-shar: distdir | 632 | dist-shar: distdir |
477 | 633 | @echo WARNING: "Support for distribution archives compressed with" \ | ||
478 | 634 | "legacy program 'compress' is deprecated." >&2 | ||
479 | 635 | @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 | ||
480 | 596 | shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz | 636 | shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz |
481 | 597 | $(am__post_remove_distdir) | 637 | $(am__post_remove_distdir) |
482 | 598 | 638 | ||
483 | @@ -797,27 +837,25 @@ | |||
484 | 797 | 837 | ||
485 | 798 | uninstall-am: uninstall-pkgconfigDATA | 838 | uninstall-am: uninstall-pkgconfigDATA |
486 | 799 | 839 | ||
490 | 800 | .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ | 840 | .MAKE: $(am__recursive_targets) all install-am install-strip |
488 | 801 | cscopelist-recursive ctags-recursive install-am install-strip \ | ||
489 | 802 | tags-recursive | ||
491 | 803 | 841 | ||
509 | 804 | .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ | 842 | .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ |
510 | 805 | all all-am am--refresh check check-am clean clean-cscope \ | 843 | am--refresh check check-am clean clean-cscope clean-generic \ |
511 | 806 | clean-generic clean-libtool cscope cscopelist \ | 844 | clean-libtool cscope cscopelist-am ctags ctags-am dist \ |
512 | 807 | cscopelist-recursive ctags ctags-recursive dist dist-all \ | 845 | dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \ |
513 | 808 | dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar dist-tarZ \ | 846 | dist-tarZ dist-xz dist-zip distcheck distclean \ |
514 | 809 | dist-xz dist-zip distcheck distclean distclean-generic \ | 847 | distclean-generic distclean-hdr distclean-libtool \ |
515 | 810 | distclean-hdr distclean-libtool distclean-tags distcleancheck \ | 848 | distclean-tags distcleancheck distdir distuninstallcheck dvi \ |
516 | 811 | distdir distuninstallcheck dvi dvi-am html html-am info \ | 849 | dvi-am html html-am info info-am install install-am \ |
517 | 812 | info-am install install-am install-data install-data-am \ | 850 | install-data install-data-am install-dvi install-dvi-am \ |
518 | 813 | install-dvi install-dvi-am install-exec install-exec-am \ | 851 | install-exec install-exec-am install-html install-html-am \ |
519 | 814 | install-html install-html-am install-info install-info-am \ | 852 | install-info install-info-am install-man install-pdf \ |
520 | 815 | install-man install-pdf install-pdf-am install-pkgconfigDATA \ | 853 | install-pdf-am install-pkgconfigDATA install-ps install-ps-am \ |
521 | 816 | install-ps install-ps-am install-strip installcheck \ | 854 | install-strip installcheck installcheck-am installdirs \ |
522 | 817 | installcheck-am installdirs installdirs-am maintainer-clean \ | 855 | installdirs-am maintainer-clean maintainer-clean-generic \ |
523 | 818 | maintainer-clean-generic mostlyclean mostlyclean-generic \ | 856 | mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ |
524 | 819 | mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ | 857 | ps ps-am tags tags-am uninstall uninstall-am \ |
525 | 820 | uninstall uninstall-am uninstall-pkgconfigDATA | 858 | uninstall-pkgconfigDATA |
526 | 821 | 859 | ||
527 | 822 | 860 | ||
528 | 823 | .PHONY: ChangeLog INSTALL | 861 | .PHONY: ChangeLog INSTALL |
529 | 824 | 862 | ||
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 @@ | |||
535 | 1 | # generated automatically by aclocal 1.12.3 -*- Autoconf -*- | 1 | # generated automatically by aclocal 1.14 -*- Autoconf -*- |
536 | 2 | 2 | ||
538 | 3 | # Copyright (C) 1996-2012 Free Software Foundation, Inc. | 3 | # Copyright (C) 1996-2013 Free Software Foundation, Inc. |
539 | 4 | 4 | ||
540 | 5 | # This file is free software; the Free Software Foundation | 5 | # This file is free software; the Free Software Foundation |
541 | 6 | # gives unlimited permission to copy and/or distribute it, | 6 | # gives unlimited permission to copy and/or distribute it, |
542 | @@ -11,6 +11,7 @@ | |||
543 | 11 | # even the implied warranty of MERCHANTABILITY or FITNESS FOR A | 11 | # even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
544 | 12 | # PARTICULAR PURPOSE. | 12 | # PARTICULAR PURPOSE. |
545 | 13 | 13 | ||
546 | 14 | m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) | ||
547 | 14 | m4_ifndef([AC_AUTOCONF_VERSION], | 15 | m4_ifndef([AC_AUTOCONF_VERSION], |
548 | 15 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl | 16 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
549 | 16 | m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, | 17 | m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, |
550 | @@ -8606,7 +8607,7 @@ | |||
551 | 8606 | m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) | 8607 | m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) |
552 | 8607 | m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) | 8608 | m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) |
553 | 8608 | 8609 | ||
555 | 8609 | # Copyright (C) 2002-2012 Free Software Foundation, Inc. | 8610 | # Copyright (C) 2002-2013 Free Software Foundation, Inc. |
556 | 8610 | # | 8611 | # |
557 | 8611 | # This file is free software; the Free Software Foundation | 8612 | # This file is free software; the Free Software Foundation |
558 | 8612 | # gives unlimited permission to copy and/or distribute it, | 8613 | # gives unlimited permission to copy and/or distribute it, |
559 | @@ -8618,10 +8619,10 @@ | |||
560 | 8618 | # generated from the m4 files accompanying Automake X.Y. | 8619 | # generated from the m4 files accompanying Automake X.Y. |
561 | 8619 | # (This private macro should not be called outside this file.) | 8620 | # (This private macro should not be called outside this file.) |
562 | 8620 | AC_DEFUN([AM_AUTOMAKE_VERSION], | 8621 | AC_DEFUN([AM_AUTOMAKE_VERSION], |
564 | 8621 | [am__api_version='1.12' | 8622 | [am__api_version='1.14' |
565 | 8622 | dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to | 8623 | dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to |
566 | 8623 | dnl require some minimum version. Point them to the right macro. | 8624 | dnl require some minimum version. Point them to the right macro. |
568 | 8624 | m4_if([$1], [1.12.3], [], | 8625 | m4_if([$1], [1.14], [], |
569 | 8625 | [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl | 8626 | [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl |
570 | 8626 | ]) | 8627 | ]) |
571 | 8627 | 8628 | ||
572 | @@ -8637,14 +8638,14 @@ | |||
573 | 8637 | # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. | 8638 | # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. |
574 | 8638 | # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. | 8639 | # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. |
575 | 8639 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], | 8640 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], |
577 | 8640 | [AM_AUTOMAKE_VERSION([1.12.3])dnl | 8641 | [AM_AUTOMAKE_VERSION([1.14])dnl |
578 | 8641 | m4_ifndef([AC_AUTOCONF_VERSION], | 8642 | m4_ifndef([AC_AUTOCONF_VERSION], |
579 | 8642 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl | 8643 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
580 | 8643 | _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) | 8644 | _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) |
581 | 8644 | 8645 | ||
582 | 8645 | # AM_AUX_DIR_EXPAND -*- Autoconf -*- | 8646 | # AM_AUX_DIR_EXPAND -*- Autoconf -*- |
583 | 8646 | 8647 | ||
585 | 8647 | # Copyright (C) 2001-2012 Free Software Foundation, Inc. | 8648 | # Copyright (C) 2001-2013 Free Software Foundation, Inc. |
586 | 8648 | # | 8649 | # |
587 | 8649 | # This file is free software; the Free Software Foundation | 8650 | # This file is free software; the Free Software Foundation |
588 | 8650 | # gives unlimited permission to copy and/or distribute it, | 8651 | # gives unlimited permission to copy and/or distribute it, |
589 | @@ -8697,7 +8698,7 @@ | |||
590 | 8697 | 8698 | ||
591 | 8698 | # AM_CONDITIONAL -*- Autoconf -*- | 8699 | # AM_CONDITIONAL -*- Autoconf -*- |
592 | 8699 | 8700 | ||
594 | 8700 | # Copyright (C) 1997-2012 Free Software Foundation, Inc. | 8701 | # Copyright (C) 1997-2013 Free Software Foundation, Inc. |
595 | 8701 | # | 8702 | # |
596 | 8702 | # This file is free software; the Free Software Foundation | 8703 | # This file is free software; the Free Software Foundation |
597 | 8703 | # gives unlimited permission to copy and/or distribute it, | 8704 | # gives unlimited permission to copy and/or distribute it, |
598 | @@ -8728,7 +8729,7 @@ | |||
599 | 8728 | Usually this means the macro was only invoked conditionally.]]) | 8729 | Usually this means the macro was only invoked conditionally.]]) |
600 | 8729 | fi])]) | 8730 | fi])]) |
601 | 8730 | 8731 | ||
603 | 8731 | # Copyright (C) 1999-2012 Free Software Foundation, Inc. | 8732 | # Copyright (C) 1999-2013 Free Software Foundation, Inc. |
604 | 8732 | # | 8733 | # |
605 | 8733 | # This file is free software; the Free Software Foundation | 8734 | # This file is free software; the Free Software Foundation |
606 | 8734 | # gives unlimited permission to copy and/or distribute it, | 8735 | # gives unlimited permission to copy and/or distribute it, |
607 | @@ -8919,7 +8920,7 @@ | |||
608 | 8919 | 8920 | ||
609 | 8920 | # Generate code to set up dependency tracking. -*- Autoconf -*- | 8921 | # Generate code to set up dependency tracking. -*- Autoconf -*- |
610 | 8921 | 8922 | ||
612 | 8922 | # Copyright (C) 1999-2012 Free Software Foundation, Inc. | 8923 | # Copyright (C) 1999-2013 Free Software Foundation, Inc. |
613 | 8923 | # | 8924 | # |
614 | 8924 | # This file is free software; the Free Software Foundation | 8925 | # This file is free software; the Free Software Foundation |
615 | 8925 | # gives unlimited permission to copy and/or distribute it, | 8926 | # gives unlimited permission to copy and/or distribute it, |
616 | @@ -8930,7 +8931,7 @@ | |||
617 | 8930 | # ------------------------------ | 8931 | # ------------------------------ |
618 | 8931 | AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], | 8932 | AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], |
619 | 8932 | [{ | 8933 | [{ |
621 | 8933 | # Autoconf 2.62 quotes --file arguments for eval, but not when files | 8934 | # Older Autoconf quotes --file arguments for eval, but not when files |
622 | 8934 | # are listed without --file. Let's play safe and only enable the eval | 8935 | # are listed without --file. Let's play safe and only enable the eval |
623 | 8935 | # if we detect the quoting. | 8936 | # if we detect the quoting. |
624 | 8936 | case $CONFIG_FILES in | 8937 | case $CONFIG_FILES in |
625 | @@ -8959,7 +8960,7 @@ | |||
626 | 8959 | DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` | 8960 | DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` |
627 | 8960 | test -z "$DEPDIR" && continue | 8961 | test -z "$DEPDIR" && continue |
628 | 8961 | am__include=`sed -n 's/^am__include = //p' < "$mf"` | 8962 | am__include=`sed -n 's/^am__include = //p' < "$mf"` |
630 | 8962 | test -z "am__include" && continue | 8963 | test -z "$am__include" && continue |
631 | 8963 | am__quote=`sed -n 's/^am__quote = //p' < "$mf"` | 8964 | am__quote=`sed -n 's/^am__quote = //p' < "$mf"` |
632 | 8964 | # Find all dependency output files, they are included files with | 8965 | # Find all dependency output files, they are included files with |
633 | 8965 | # $(DEPDIR) in their names. We invoke sed twice because it is the | 8966 | # $(DEPDIR) in their names. We invoke sed twice because it is the |
634 | @@ -8995,7 +8996,7 @@ | |||
635 | 8995 | 8996 | ||
636 | 8996 | # Do all the work for Automake. -*- Autoconf -*- | 8997 | # Do all the work for Automake. -*- Autoconf -*- |
637 | 8997 | 8998 | ||
639 | 8998 | # Copyright (C) 1996-2012 Free Software Foundation, Inc. | 8999 | # Copyright (C) 1996-2013 Free Software Foundation, Inc. |
640 | 8999 | # | 9000 | # |
641 | 9000 | # This file is free software; the Free Software Foundation | 9001 | # This file is free software; the Free Software Foundation |
642 | 9001 | # gives unlimited permission to copy and/or distribute it, | 9002 | # gives unlimited permission to copy and/or distribute it, |
643 | @@ -9004,6 +9005,12 @@ | |||
644 | 9004 | # This macro actually does too much. Some checks are only needed if | 9005 | # This macro actually does too much. Some checks are only needed if |
645 | 9005 | # your package does certain things. But this isn't really a big deal. | 9006 | # your package does certain things. But this isn't really a big deal. |
646 | 9006 | 9007 | ||
647 | 9008 | dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. | ||
648 | 9009 | m4_define([AC_PROG_CC], | ||
649 | 9010 | m4_defn([AC_PROG_CC]) | ||
650 | 9011 | [_AM_PROG_CC_C_O | ||
651 | 9012 | ]) | ||
652 | 9013 | |||
653 | 9007 | # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) | 9014 | # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) |
654 | 9008 | # AM_INIT_AUTOMAKE([OPTIONS]) | 9015 | # AM_INIT_AUTOMAKE([OPTIONS]) |
655 | 9009 | # ----------------------------------------------- | 9016 | # ----------------------------------------------- |
656 | @@ -9016,7 +9023,7 @@ | |||
657 | 9016 | # arguments mandatory, and then we can depend on a new Autoconf | 9023 | # arguments mandatory, and then we can depend on a new Autoconf |
658 | 9017 | # release and drop the old call support. | 9024 | # release and drop the old call support. |
659 | 9018 | AC_DEFUN([AM_INIT_AUTOMAKE], | 9025 | AC_DEFUN([AM_INIT_AUTOMAKE], |
661 | 9019 | [AC_PREREQ([2.62])dnl | 9026 | [AC_PREREQ([2.65])dnl |
662 | 9020 | dnl Autoconf wants to disallow AM_ names. We explicitly allow | 9027 | dnl Autoconf wants to disallow AM_ names. We explicitly allow |
663 | 9021 | dnl the ones we care about. | 9028 | dnl the ones we care about. |
664 | 9022 | m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl | 9029 | m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl |
665 | @@ -9046,8 +9053,7 @@ | |||
666 | 9046 | dnl Distinguish between old-style and new-style calls. | 9053 | dnl Distinguish between old-style and new-style calls. |
667 | 9047 | m4_ifval([$2], | 9054 | m4_ifval([$2], |
668 | 9048 | [AC_DIAGNOSE([obsolete], | 9055 | [AC_DIAGNOSE([obsolete], |
671 | 9049 | [$0: two- and three-arguments forms are deprecated. For more info, see: | 9056 | [$0: two- and three-arguments forms are deprecated.]) |
670 | 9050 | http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_INIT_AUTOMAKE-invocation]) | ||
672 | 9051 | m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl | 9057 | m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl |
673 | 9052 | AC_SUBST([PACKAGE], [$1])dnl | 9058 | AC_SUBST([PACKAGE], [$1])dnl |
674 | 9053 | AC_SUBST([VERSION], [$2])], | 9059 | AC_SUBST([VERSION], [$2])], |
675 | @@ -9101,22 +9107,60 @@ | |||
676 | 9101 | [_AM_DEPENDENCIES([OBJC])], | 9107 | [_AM_DEPENDENCIES([OBJC])], |
677 | 9102 | [m4_define([AC_PROG_OBJC], | 9108 | [m4_define([AC_PROG_OBJC], |
678 | 9103 | m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl | 9109 | m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl |
683 | 9104 | dnl Support for Objective C++ was only introduced in Autoconf 2.65, | 9110 | AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], |
680 | 9105 | dnl but we still cater to Autoconf 2.62. | ||
681 | 9106 | m4_ifdef([AC_PROG_OBJCXX], | ||
682 | 9107 | [AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], | ||
684 | 9108 | [_AM_DEPENDENCIES([OBJCXX])], | 9111 | [_AM_DEPENDENCIES([OBJCXX])], |
685 | 9109 | [m4_define([AC_PROG_OBJCXX], | 9112 | [m4_define([AC_PROG_OBJCXX], |
687 | 9110 | m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])])dnl | 9113 | m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl |
688 | 9111 | ]) | 9114 | ]) |
693 | 9112 | _AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl | 9115 | AC_REQUIRE([AM_SILENT_RULES])dnl |
694 | 9113 | dnl The 'parallel-tests' driver may need to know about EXEEXT, so add the | 9116 | dnl The testsuite driver may need to know about EXEEXT, so add the |
695 | 9114 | dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro | 9117 | dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This |
696 | 9115 | dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. | 9118 | dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. |
697 | 9116 | AC_CONFIG_COMMANDS_PRE(dnl | 9119 | AC_CONFIG_COMMANDS_PRE(dnl |
698 | 9117 | [m4_provide_if([_AM_COMPILER_EXEEXT], | 9120 | [m4_provide_if([_AM_COMPILER_EXEEXT], |
699 | 9118 | [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl | 9121 | [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl |
701 | 9119 | ]) | 9122 | |
702 | 9123 | # POSIX will say in a future version that running "rm -f" with no argument | ||
703 | 9124 | # is OK; and we want to be able to make that assumption in our Makefile | ||
704 | 9125 | # recipes. So use an aggressive probe to check that the usage we want is | ||
705 | 9126 | # actually supported "in the wild" to an acceptable degree. | ||
706 | 9127 | # See automake bug#10828. | ||
707 | 9128 | # To make any issue more visible, cause the running configure to be aborted | ||
708 | 9129 | # by default if the 'rm' program in use doesn't match our expectations; the | ||
709 | 9130 | # user can still override this though. | ||
710 | 9131 | if rm -f && rm -fr && rm -rf; then : OK; else | ||
711 | 9132 | cat >&2 <<'END' | ||
712 | 9133 | Oops! | ||
713 | 9134 | |||
714 | 9135 | Your 'rm' program seems unable to run without file operands specified | ||
715 | 9136 | on the command line, even when the '-f' option is present. This is contrary | ||
716 | 9137 | to the behaviour of most rm programs out there, and not conforming with | ||
717 | 9138 | the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542> | ||
718 | 9139 | |||
719 | 9140 | Please tell bug-automake@gnu.org about your system, including the value | ||
720 | 9141 | of your $PATH and any error possibly output before this message. This | ||
721 | 9142 | can help us improve future automake versions. | ||
722 | 9143 | |||
723 | 9144 | END | ||
724 | 9145 | if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then | ||
725 | 9146 | echo 'Configuration will proceed anyway, since you have set the' >&2 | ||
726 | 9147 | echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 | ||
727 | 9148 | echo >&2 | ||
728 | 9149 | else | ||
729 | 9150 | cat >&2 <<'END' | ||
730 | 9151 | Aborting the configuration process, to ensure you take notice of the issue. | ||
731 | 9152 | |||
732 | 9153 | You can download and install GNU coreutils to get an 'rm' implementation | ||
733 | 9154 | that behaves properly: <http://www.gnu.org/software/coreutils/>. | ||
734 | 9155 | |||
735 | 9156 | If you want to complete the configuration process using your problematic | ||
736 | 9157 | 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM | ||
737 | 9158 | to "yes", and re-run configure. | ||
738 | 9159 | |||
739 | 9160 | END | ||
740 | 9161 | AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) | ||
741 | 9162 | fi | ||
742 | 9163 | fi]) | ||
743 | 9120 | 9164 | ||
744 | 9121 | dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not | 9165 | dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not |
745 | 9122 | dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further | 9166 | dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further |
746 | @@ -9124,7 +9168,6 @@ | |||
747 | 9124 | m4_define([_AC_COMPILER_EXEEXT], | 9168 | m4_define([_AC_COMPILER_EXEEXT], |
748 | 9125 | m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) | 9169 | m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) |
749 | 9126 | 9170 | ||
750 | 9127 | |||
751 | 9128 | # When config.status generates a header, we must update the stamp-h file. | 9171 | # When config.status generates a header, we must update the stamp-h file. |
752 | 9129 | # This file resides in the same directory as the config header | 9172 | # This file resides in the same directory as the config header |
753 | 9130 | # that is generated. The stamp files are numbered to have different names. | 9173 | # that is generated. The stamp files are numbered to have different names. |
754 | @@ -9146,7 +9189,7 @@ | |||
755 | 9146 | done | 9189 | done |
756 | 9147 | echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) | 9190 | echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) |
757 | 9148 | 9191 | ||
759 | 9149 | # Copyright (C) 2001-2012 Free Software Foundation, Inc. | 9192 | # Copyright (C) 2001-2013 Free Software Foundation, Inc. |
760 | 9150 | # | 9193 | # |
761 | 9151 | # This file is free software; the Free Software Foundation | 9194 | # This file is free software; the Free Software Foundation |
762 | 9152 | # gives unlimited permission to copy and/or distribute it, | 9195 | # gives unlimited permission to copy and/or distribute it, |
763 | @@ -9167,7 +9210,7 @@ | |||
764 | 9167 | fi | 9210 | fi |
765 | 9168 | AC_SUBST([install_sh])]) | 9211 | AC_SUBST([install_sh])]) |
766 | 9169 | 9212 | ||
768 | 9170 | # Copyright (C) 2003-2012 Free Software Foundation, Inc. | 9213 | # Copyright (C) 2003-2013 Free Software Foundation, Inc. |
769 | 9171 | # | 9214 | # |
770 | 9172 | # This file is free software; the Free Software Foundation | 9215 | # This file is free software; the Free Software Foundation |
771 | 9173 | # gives unlimited permission to copy and/or distribute it, | 9216 | # gives unlimited permission to copy and/or distribute it, |
772 | @@ -9186,47 +9229,9 @@ | |||
773 | 9186 | rmdir .tst 2>/dev/null | 9229 | rmdir .tst 2>/dev/null |
774 | 9187 | AC_SUBST([am__leading_dot])]) | 9230 | AC_SUBST([am__leading_dot])]) |
775 | 9188 | 9231 | ||
776 | 9189 | # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- | ||
777 | 9190 | # From Jim Meyering | ||
778 | 9191 | |||
779 | 9192 | # Copyright (C) 1996-2012 Free Software Foundation, Inc. | ||
780 | 9193 | # | ||
781 | 9194 | # This file is free software; the Free Software Foundation | ||
782 | 9195 | # gives unlimited permission to copy and/or distribute it, | ||
783 | 9196 | # with or without modifications, as long as this notice is preserved. | ||
784 | 9197 | |||
785 | 9198 | # AM_MAINTAINER_MODE([DEFAULT-MODE]) | ||
786 | 9199 | # ---------------------------------- | ||
787 | 9200 | # Control maintainer-specific portions of Makefiles. | ||
788 | 9201 | # Default is to disable them, unless 'enable' is passed literally. | ||
789 | 9202 | # For symmetry, 'disable' may be passed as well. Anyway, the user | ||
790 | 9203 | # can override the default with the --enable/--disable switch. | ||
791 | 9204 | AC_DEFUN([AM_MAINTAINER_MODE], | ||
792 | 9205 | [m4_case(m4_default([$1], [disable]), | ||
793 | 9206 | [enable], [m4_define([am_maintainer_other], [disable])], | ||
794 | 9207 | [disable], [m4_define([am_maintainer_other], [enable])], | ||
795 | 9208 | [m4_define([am_maintainer_other], [enable]) | ||
796 | 9209 | m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) | ||
797 | 9210 | AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) | ||
798 | 9211 | dnl maintainer-mode's default is 'disable' unless 'enable' is passed | ||
799 | 9212 | AC_ARG_ENABLE([maintainer-mode], | ||
800 | 9213 | [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode], | ||
801 | 9214 | am_maintainer_other[ make rules and dependencies not useful | ||
802 | 9215 | (and sometimes confusing) to the casual installer])], | ||
803 | 9216 | [USE_MAINTAINER_MODE=$enableval], | ||
804 | 9217 | [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) | ||
805 | 9218 | AC_MSG_RESULT([$USE_MAINTAINER_MODE]) | ||
806 | 9219 | AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) | ||
807 | 9220 | MAINT=$MAINTAINER_MODE_TRUE | ||
808 | 9221 | AC_SUBST([MAINT])dnl | ||
809 | 9222 | ] | ||
810 | 9223 | ) | ||
811 | 9224 | |||
812 | 9225 | AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) | ||
813 | 9226 | |||
814 | 9227 | # Check to see how 'make' treats includes. -*- Autoconf -*- | 9232 | # Check to see how 'make' treats includes. -*- Autoconf -*- |
815 | 9228 | 9233 | ||
817 | 9229 | # Copyright (C) 2001-2012 Free Software Foundation, Inc. | 9234 | # Copyright (C) 2001-2013 Free Software Foundation, Inc. |
818 | 9230 | # | 9235 | # |
819 | 9231 | # This file is free software; the Free Software Foundation | 9236 | # This file is free software; the Free Software Foundation |
820 | 9232 | # gives unlimited permission to copy and/or distribute it, | 9237 | # gives unlimited permission to copy and/or distribute it, |
821 | @@ -9276,7 +9281,7 @@ | |||
822 | 9276 | 9281 | ||
823 | 9277 | # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- | 9282 | # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- |
824 | 9278 | 9283 | ||
826 | 9279 | # Copyright (C) 1997-2012 Free Software Foundation, Inc. | 9284 | # Copyright (C) 1997-2013 Free Software Foundation, Inc. |
827 | 9280 | # | 9285 | # |
828 | 9281 | # This file is free software; the Free Software Foundation | 9286 | # This file is free software; the Free Software Foundation |
829 | 9282 | # gives unlimited permission to copy and/or distribute it, | 9287 | # gives unlimited permission to copy and/or distribute it, |
830 | @@ -9291,8 +9296,8 @@ | |||
831 | 9291 | 9296 | ||
832 | 9292 | # AM_MISSING_HAS_RUN | 9297 | # AM_MISSING_HAS_RUN |
833 | 9293 | # ------------------ | 9298 | # ------------------ |
836 | 9294 | # Define MISSING if not defined so far and test if it supports --run. | 9299 | # Define MISSING if not defined so far and test if it is modern enough. |
837 | 9295 | # If it does, set am_missing_run to use it, otherwise, to nothing. | 9300 | # If it is, set am_missing_run to use it, otherwise, to nothing. |
838 | 9296 | AC_DEFUN([AM_MISSING_HAS_RUN], | 9301 | AC_DEFUN([AM_MISSING_HAS_RUN], |
839 | 9297 | [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl | 9302 | [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl |
840 | 9298 | AC_REQUIRE_AUX_FILE([missing])dnl | 9303 | AC_REQUIRE_AUX_FILE([missing])dnl |
841 | @@ -9305,8 +9310,8 @@ | |||
842 | 9305 | esac | 9310 | esac |
843 | 9306 | fi | 9311 | fi |
844 | 9307 | # Use eval to expand $SHELL | 9312 | # Use eval to expand $SHELL |
847 | 9308 | if eval "$MISSING --run true"; then | 9313 | if eval "$MISSING --is-lightweight"; then |
848 | 9309 | am_missing_run="$MISSING --run " | 9314 | am_missing_run="$MISSING " |
849 | 9310 | else | 9315 | else |
850 | 9311 | am_missing_run= | 9316 | am_missing_run= |
851 | 9312 | AC_MSG_WARN(['missing' script is too old or missing]) | 9317 | AC_MSG_WARN(['missing' script is too old or missing]) |
852 | @@ -9315,7 +9320,7 @@ | |||
853 | 9315 | 9320 | ||
854 | 9316 | # Helper functions for option handling. -*- Autoconf -*- | 9321 | # Helper functions for option handling. -*- Autoconf -*- |
855 | 9317 | 9322 | ||
857 | 9318 | # Copyright (C) 2001-2012 Free Software Foundation, Inc. | 9323 | # Copyright (C) 2001-2013 Free Software Foundation, Inc. |
858 | 9319 | # | 9324 | # |
859 | 9320 | # This file is free software; the Free Software Foundation | 9325 | # This file is free software; the Free Software Foundation |
860 | 9321 | # gives unlimited permission to copy and/or distribute it, | 9326 | # gives unlimited permission to copy and/or distribute it, |
861 | @@ -9344,9 +9349,73 @@ | |||
862 | 9344 | AC_DEFUN([_AM_IF_OPTION], | 9349 | AC_DEFUN([_AM_IF_OPTION], |
863 | 9345 | [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) | 9350 | [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) |
864 | 9346 | 9351 | ||
865 | 9352 | # Copyright (C) 1999-2013 Free Software Foundation, Inc. | ||
866 | 9353 | # | ||
867 | 9354 | # This file is free software; the Free Software Foundation | ||
868 | 9355 | # gives unlimited permission to copy and/or distribute it, | ||
869 | 9356 | # with or without modifications, as long as this notice is preserved. | ||
870 | 9357 | |||
871 | 9358 | # _AM_PROG_CC_C_O | ||
872 | 9359 | # --------------- | ||
873 | 9360 | # Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC | ||
874 | 9361 | # to automatically call this. | ||
875 | 9362 | AC_DEFUN([_AM_PROG_CC_C_O], | ||
876 | 9363 | [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl | ||
877 | 9364 | AC_REQUIRE_AUX_FILE([compile])dnl | ||
878 | 9365 | AC_LANG_PUSH([C])dnl | ||
879 | 9366 | AC_CACHE_CHECK( | ||
880 | 9367 | [whether $CC understands -c and -o together], | ||
881 | 9368 | [am_cv_prog_cc_c_o], | ||
882 | 9369 | [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) | ||
883 | 9370 | # Make sure it works both with $CC and with simple cc. | ||
884 | 9371 | # Following AC_PROG_CC_C_O, we do the test twice because some | ||
885 | 9372 | # compilers refuse to overwrite an existing .o file with -o, | ||
886 | 9373 | # though they will create one. | ||
887 | 9374 | am_cv_prog_cc_c_o=yes | ||
888 | 9375 | for am_i in 1 2; do | ||
889 | 9376 | if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ | ||
890 | 9377 | && test -f conftest2.$ac_objext; then | ||
891 | 9378 | : OK | ||
892 | 9379 | else | ||
893 | 9380 | am_cv_prog_cc_c_o=no | ||
894 | 9381 | break | ||
895 | 9382 | fi | ||
896 | 9383 | done | ||
897 | 9384 | rm -f core conftest* | ||
898 | 9385 | unset am_i]) | ||
899 | 9386 | if test "$am_cv_prog_cc_c_o" != yes; then | ||
900 | 9387 | # Losing compiler, so override with the script. | ||
901 | 9388 | # FIXME: It is wrong to rewrite CC. | ||
902 | 9389 | # But if we don't then we get into trouble of one sort or another. | ||
903 | 9390 | # A longer-term fix would be to have automake use am__CC in this case, | ||
904 | 9391 | # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" | ||
905 | 9392 | CC="$am_aux_dir/compile $CC" | ||
906 | 9393 | fi | ||
907 | 9394 | AC_LANG_POP([C])]) | ||
908 | 9395 | |||
909 | 9396 | # For backward compatibility. | ||
910 | 9397 | AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) | ||
911 | 9398 | |||
912 | 9399 | # Copyright (C) 2001-2013 Free Software Foundation, Inc. | ||
913 | 9400 | # | ||
914 | 9401 | # This file is free software; the Free Software Foundation | ||
915 | 9402 | # gives unlimited permission to copy and/or distribute it, | ||
916 | 9403 | # with or without modifications, as long as this notice is preserved. | ||
917 | 9404 | |||
918 | 9405 | # AM_RUN_LOG(COMMAND) | ||
919 | 9406 | # ------------------- | ||
920 | 9407 | # Run COMMAND, save the exit status in ac_status, and log it. | ||
921 | 9408 | # (This has been adapted from Autoconf's _AC_RUN_LOG macro.) | ||
922 | 9409 | AC_DEFUN([AM_RUN_LOG], | ||
923 | 9410 | [{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD | ||
924 | 9411 | ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD | ||
925 | 9412 | ac_status=$? | ||
926 | 9413 | echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD | ||
927 | 9414 | (exit $ac_status); }]) | ||
928 | 9415 | |||
929 | 9347 | # Check to make sure that the build environment is sane. -*- Autoconf -*- | 9416 | # Check to make sure that the build environment is sane. -*- Autoconf -*- |
930 | 9348 | 9417 | ||
932 | 9349 | # Copyright (C) 1996-2012 Free Software Foundation, Inc. | 9418 | # Copyright (C) 1996-2013 Free Software Foundation, Inc. |
933 | 9350 | # | 9419 | # |
934 | 9351 | # This file is free software; the Free Software Foundation | 9420 | # This file is free software; the Free Software Foundation |
935 | 9352 | # gives unlimited permission to copy and/or distribute it, | 9421 | # gives unlimited permission to copy and/or distribute it, |
936 | @@ -9427,7 +9496,67 @@ | |||
937 | 9427 | rm -f conftest.file | 9496 | rm -f conftest.file |
938 | 9428 | ]) | 9497 | ]) |
939 | 9429 | 9498 | ||
941 | 9430 | # Copyright (C) 2001-2012 Free Software Foundation, Inc. | 9499 | # Copyright (C) 2009-2013 Free Software Foundation, Inc. |
942 | 9500 | # | ||
943 | 9501 | # This file is free software; the Free Software Foundation | ||
944 | 9502 | # gives unlimited permission to copy and/or distribute it, | ||
945 | 9503 | # with or without modifications, as long as this notice is preserved. | ||
946 | 9504 | |||
947 | 9505 | # AM_SILENT_RULES([DEFAULT]) | ||
948 | 9506 | # -------------------------- | ||
949 | 9507 | # Enable less verbose build rules; with the default set to DEFAULT | ||
950 | 9508 | # ("yes" being less verbose, "no" or empty being verbose). | ||
951 | 9509 | AC_DEFUN([AM_SILENT_RULES], | ||
952 | 9510 | [AC_ARG_ENABLE([silent-rules], [dnl | ||
953 | 9511 | AS_HELP_STRING( | ||
954 | 9512 | [--enable-silent-rules], | ||
955 | 9513 | [less verbose build output (undo: "make V=1")]) | ||
956 | 9514 | AS_HELP_STRING( | ||
957 | 9515 | [--disable-silent-rules], | ||
958 | 9516 | [verbose build output (undo: "make V=0")])dnl | ||
959 | 9517 | ]) | ||
960 | 9518 | case $enable_silent_rules in @%:@ ((( | ||
961 | 9519 | yes) AM_DEFAULT_VERBOSITY=0;; | ||
962 | 9520 | no) AM_DEFAULT_VERBOSITY=1;; | ||
963 | 9521 | *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; | ||
964 | 9522 | esac | ||
965 | 9523 | dnl | ||
966 | 9524 | dnl A few 'make' implementations (e.g., NonStop OS and NextStep) | ||
967 | 9525 | dnl do not support nested variable expansions. | ||
968 | 9526 | dnl See automake bug#9928 and bug#10237. | ||
969 | 9527 | am_make=${MAKE-make} | ||
970 | 9528 | AC_CACHE_CHECK([whether $am_make supports nested variables], | ||
971 | 9529 | [am_cv_make_support_nested_variables], | ||
972 | 9530 | [if AS_ECHO([['TRUE=$(BAR$(V)) | ||
973 | 9531 | BAR0=false | ||
974 | 9532 | BAR1=true | ||
975 | 9533 | V=1 | ||
976 | 9534 | am__doit: | ||
977 | 9535 | @$(TRUE) | ||
978 | 9536 | .PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then | ||
979 | 9537 | am_cv_make_support_nested_variables=yes | ||
980 | 9538 | else | ||
981 | 9539 | am_cv_make_support_nested_variables=no | ||
982 | 9540 | fi]) | ||
983 | 9541 | if test $am_cv_make_support_nested_variables = yes; then | ||
984 | 9542 | dnl Using '$V' instead of '$(V)' breaks IRIX make. | ||
985 | 9543 | AM_V='$(V)' | ||
986 | 9544 | AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' | ||
987 | 9545 | else | ||
988 | 9546 | AM_V=$AM_DEFAULT_VERBOSITY | ||
989 | 9547 | AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY | ||
990 | 9548 | fi | ||
991 | 9549 | AC_SUBST([AM_V])dnl | ||
992 | 9550 | AM_SUBST_NOTMAKE([AM_V])dnl | ||
993 | 9551 | AC_SUBST([AM_DEFAULT_V])dnl | ||
994 | 9552 | AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl | ||
995 | 9553 | AC_SUBST([AM_DEFAULT_VERBOSITY])dnl | ||
996 | 9554 | AM_BACKSLASH='\' | ||
997 | 9555 | AC_SUBST([AM_BACKSLASH])dnl | ||
998 | 9556 | _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl | ||
999 | 9557 | ]) | ||
1000 | 9558 | |||
1001 | 9559 | # Copyright (C) 2001-2013 Free Software Foundation, Inc. | ||
1002 | 9431 | # | 9560 | # |
1003 | 9432 | # This file is free software; the Free Software Foundation | 9561 | # This file is free software; the Free Software Foundation |
1004 | 9433 | # gives unlimited permission to copy and/or distribute it, | 9562 | # gives unlimited permission to copy and/or distribute it, |
1005 | @@ -9455,7 +9584,7 @@ | |||
1006 | 9455 | INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" | 9584 | INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" |
1007 | 9456 | AC_SUBST([INSTALL_STRIP_PROGRAM])]) | 9585 | AC_SUBST([INSTALL_STRIP_PROGRAM])]) |
1008 | 9457 | 9586 | ||
1010 | 9458 | # Copyright (C) 2006-2012 Free Software Foundation, Inc. | 9587 | # Copyright (C) 2006-2013 Free Software Foundation, Inc. |
1011 | 9459 | # | 9588 | # |
1012 | 9460 | # This file is free software; the Free Software Foundation | 9589 | # This file is free software; the Free Software Foundation |
1013 | 9461 | # gives unlimited permission to copy and/or distribute it, | 9590 | # gives unlimited permission to copy and/or distribute it, |
1014 | @@ -9474,7 +9603,7 @@ | |||
1015 | 9474 | 9603 | ||
1016 | 9475 | # Check how to create a tarball. -*- Autoconf -*- | 9604 | # Check how to create a tarball. -*- Autoconf -*- |
1017 | 9476 | 9605 | ||
1019 | 9477 | # Copyright (C) 2004-2012 Free Software Foundation, Inc. | 9606 | # Copyright (C) 2004-2013 Free Software Foundation, Inc. |
1020 | 9478 | # | 9607 | # |
1021 | 9479 | # This file is free software; the Free Software Foundation | 9608 | # This file is free software; the Free Software Foundation |
1022 | 9480 | # gives unlimited permission to copy and/or distribute it, | 9609 | # gives unlimited permission to copy and/or distribute it, |
1023 | @@ -9493,76 +9622,114 @@ | |||
1024 | 9493 | # Substitute a variable $(am__untar) that extract such | 9622 | # Substitute a variable $(am__untar) that extract such |
1025 | 9494 | # a tarball read from stdin. | 9623 | # a tarball read from stdin. |
1026 | 9495 | # $(am__untar) < result.tar | 9624 | # $(am__untar) < result.tar |
1027 | 9625 | # | ||
1028 | 9496 | AC_DEFUN([_AM_PROG_TAR], | 9626 | AC_DEFUN([_AM_PROG_TAR], |
1029 | 9497 | [# Always define AMTAR for backward compatibility. Yes, it's still used | 9627 | [# Always define AMTAR for backward compatibility. Yes, it's still used |
1030 | 9498 | # in the wild :-( We should find a proper way to deprecate it ... | 9628 | # in the wild :-( We should find a proper way to deprecate it ... |
1031 | 9499 | AC_SUBST([AMTAR], ['$${TAR-tar}']) | 9629 | AC_SUBST([AMTAR], ['$${TAR-tar}']) |
1032 | 9630 | |||
1033 | 9631 | # We'll loop over all known methods to create a tar archive until one works. | ||
1034 | 9632 | _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' | ||
1035 | 9633 | |||
1036 | 9500 | m4_if([$1], [v7], | 9634 | m4_if([$1], [v7], |
1102 | 9501 | [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], | 9635 | [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], |
1103 | 9502 | [m4_case([$1], [ustar],, [pax],, | 9636 | |
1104 | 9503 | [m4_fatal([Unknown tar format])]) | 9637 | [m4_case([$1], |
1105 | 9504 | AC_MSG_CHECKING([how to create a $1 tar archive]) | 9638 | [ustar], |
1106 | 9505 | # Loop over all known methods to create a tar archive until one works. | 9639 | [# The POSIX 1988 'ustar' format is defined with fixed-size fields. |
1107 | 9506 | _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' | 9640 | # There is notably a 21 bits limit for the UID and the GID. In fact, |
1108 | 9507 | _am_tools=${am_cv_prog_tar_$1-$_am_tools} | 9641 | # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 |
1109 | 9508 | # Do not fold the above two line into one, because Tru64 sh and | 9642 | # and bug#13588). |
1110 | 9509 | # Solaris sh will not grok spaces in the rhs of '-'. | 9643 | am_max_uid=2097151 # 2^21 - 1 |
1111 | 9510 | for _am_tool in $_am_tools | 9644 | am_max_gid=$am_max_uid |
1112 | 9511 | do | 9645 | # The $UID and $GID variables are not portable, so we need to resort |
1113 | 9512 | case $_am_tool in | 9646 | # to the POSIX-mandated id(1) utility. Errors in the 'id' calls |
1114 | 9513 | gnutar) | 9647 | # below are definitely unexpected, so allow the users to see them |
1115 | 9514 | for _am_tar in tar gnutar gtar; | 9648 | # (that is, avoid stderr redirection). |
1116 | 9515 | do | 9649 | am_uid=`id -u || echo unknown` |
1117 | 9516 | AM_RUN_LOG([$_am_tar --version]) && break | 9650 | am_gid=`id -g || echo unknown` |
1118 | 9517 | done | 9651 | AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) |
1119 | 9518 | am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' | 9652 | if test $am_uid -le $am_max_uid; then |
1120 | 9519 | am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' | 9653 | AC_MSG_RESULT([yes]) |
1121 | 9520 | am__untar="$_am_tar -xf -" | 9654 | else |
1122 | 9521 | ;; | 9655 | AC_MSG_RESULT([no]) |
1123 | 9522 | plaintar) | 9656 | _am_tools=none |
1124 | 9523 | # Must skip GNU tar: if it does not support --format= it doesn't create | 9657 | fi |
1125 | 9524 | # ustar tarball either. | 9658 | AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) |
1126 | 9525 | (tar --version) >/dev/null 2>&1 && continue | 9659 | if test $am_gid -le $am_max_gid; then |
1127 | 9526 | am__tar='tar chf - "$$tardir"' | 9660 | AC_MSG_RESULT([yes]) |
1128 | 9527 | am__tar_='tar chf - "$tardir"' | 9661 | else |
1129 | 9528 | am__untar='tar xf -' | 9662 | AC_MSG_RESULT([no]) |
1130 | 9529 | ;; | 9663 | _am_tools=none |
1131 | 9530 | pax) | 9664 | fi], |
1132 | 9531 | am__tar='pax -L -x $1 -w "$$tardir"' | 9665 | |
1133 | 9532 | am__tar_='pax -L -x $1 -w "$tardir"' | 9666 | [pax], |
1134 | 9533 | am__untar='pax -r' | 9667 | [], |
1135 | 9534 | ;; | 9668 | |
1136 | 9535 | cpio) | 9669 | [m4_fatal([Unknown tar format])]) |
1137 | 9536 | am__tar='find "$$tardir" -print | cpio -o -H $1 -L' | 9670 | |
1138 | 9537 | am__tar_='find "$tardir" -print | cpio -o -H $1 -L' | 9671 | AC_MSG_CHECKING([how to create a $1 tar archive]) |
1139 | 9538 | am__untar='cpio -i -H $1 -d' | 9672 | |
1140 | 9539 | ;; | 9673 | # Go ahead even if we have the value already cached. We do so because we |
1141 | 9540 | none) | 9674 | # need to set the values for the 'am__tar' and 'am__untar' variables. |
1142 | 9541 | am__tar=false | 9675 | _am_tools=${am_cv_prog_tar_$1-$_am_tools} |
1143 | 9542 | am__tar_=false | 9676 | |
1144 | 9543 | am__untar=false | 9677 | for _am_tool in $_am_tools; do |
1145 | 9544 | ;; | 9678 | case $_am_tool in |
1146 | 9545 | esac | 9679 | gnutar) |
1147 | 9546 | 9680 | for _am_tar in tar gnutar gtar; do | |
1148 | 9547 | # If the value was cached, stop now. We just wanted to have am__tar | 9681 | AM_RUN_LOG([$_am_tar --version]) && break |
1149 | 9548 | # and am__untar set. | 9682 | done |
1150 | 9549 | test -n "${am_cv_prog_tar_$1}" && break | 9683 | am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' |
1151 | 9550 | 9684 | am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' | |
1152 | 9551 | # tar/untar a dummy directory, and stop if the command works | 9685 | am__untar="$_am_tar -xf -" |
1153 | 9552 | rm -rf conftest.dir | 9686 | ;; |
1154 | 9553 | mkdir conftest.dir | 9687 | plaintar) |
1155 | 9554 | echo GrepMe > conftest.dir/file | 9688 | # Must skip GNU tar: if it does not support --format= it doesn't create |
1156 | 9555 | AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) | 9689 | # ustar tarball either. |
1157 | 9556 | rm -rf conftest.dir | 9690 | (tar --version) >/dev/null 2>&1 && continue |
1158 | 9557 | if test -s conftest.tar; then | 9691 | am__tar='tar chf - "$$tardir"' |
1159 | 9558 | AM_RUN_LOG([$am__untar <conftest.tar]) | 9692 | am__tar_='tar chf - "$tardir"' |
1160 | 9559 | grep GrepMe conftest.dir/file >/dev/null 2>&1 && break | 9693 | am__untar='tar xf -' |
1161 | 9560 | fi | 9694 | ;; |
1162 | 9561 | done | 9695 | pax) |
1163 | 9562 | rm -rf conftest.dir | 9696 | am__tar='pax -L -x $1 -w "$$tardir"' |
1164 | 9563 | 9697 | am__tar_='pax -L -x $1 -w "$tardir"' | |
1165 | 9564 | AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) | 9698 | am__untar='pax -r' |
1166 | 9565 | AC_MSG_RESULT([$am_cv_prog_tar_$1])]) | 9699 | ;; |
1167 | 9700 | cpio) | ||
1168 | 9701 | am__tar='find "$$tardir" -print | cpio -o -H $1 -L' | ||
1169 | 9702 | am__tar_='find "$tardir" -print | cpio -o -H $1 -L' | ||
1170 | 9703 | am__untar='cpio -i -H $1 -d' | ||
1171 | 9704 | ;; | ||
1172 | 9705 | none) | ||
1173 | 9706 | am__tar=false | ||
1174 | 9707 | am__tar_=false | ||
1175 | 9708 | am__untar=false | ||
1176 | 9709 | ;; | ||
1177 | 9710 | esac | ||
1178 | 9711 | |||
1179 | 9712 | # If the value was cached, stop now. We just wanted to have am__tar | ||
1180 | 9713 | # and am__untar set. | ||
1181 | 9714 | test -n "${am_cv_prog_tar_$1}" && break | ||
1182 | 9715 | |||
1183 | 9716 | # tar/untar a dummy directory, and stop if the command works. | ||
1184 | 9717 | rm -rf conftest.dir | ||
1185 | 9718 | mkdir conftest.dir | ||
1186 | 9719 | echo GrepMe > conftest.dir/file | ||
1187 | 9720 | AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) | ||
1188 | 9721 | rm -rf conftest.dir | ||
1189 | 9722 | if test -s conftest.tar; then | ||
1190 | 9723 | AM_RUN_LOG([$am__untar <conftest.tar]) | ||
1191 | 9724 | AM_RUN_LOG([cat conftest.dir/file]) | ||
1192 | 9725 | grep GrepMe conftest.dir/file >/dev/null 2>&1 && break | ||
1193 | 9726 | fi | ||
1194 | 9727 | done | ||
1195 | 9728 | rm -rf conftest.dir | ||
1196 | 9729 | |||
1197 | 9730 | AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) | ||
1198 | 9731 | AC_MSG_RESULT([$am_cv_prog_tar_$1])]) | ||
1199 | 9732 | |||
1200 | 9566 | AC_SUBST([am__tar]) | 9733 | AC_SUBST([am__tar]) |
1201 | 9567 | AC_SUBST([am__untar]) | 9734 | AC_SUBST([am__untar]) |
1202 | 9568 | ]) # _AM_PROG_TAR | 9735 | ]) # _AM_PROG_TAR |
1203 | 9569 | 9736 | ||
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 | 1 | #! /bin/sh | ||
1209 | 2 | # Wrapper for compilers which do not understand '-c -o'. | ||
1210 | 3 | |||
1211 | 4 | scriptversion=2012-10-14.11; # UTC | ||
1212 | 5 | |||
1213 | 6 | # Copyright (C) 1999-2013 Free Software Foundation, Inc. | ||
1214 | 7 | # Written by Tom Tromey <tromey@cygnus.com>. | ||
1215 | 8 | # | ||
1216 | 9 | # This program is free software; you can redistribute it and/or modify | ||
1217 | 10 | # it under the terms of the GNU General Public License as published by | ||
1218 | 11 | # the Free Software Foundation; either version 2, or (at your option) | ||
1219 | 12 | # any later version. | ||
1220 | 13 | # | ||
1221 | 14 | # This program is distributed in the hope that it will be useful, | ||
1222 | 15 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
1223 | 16 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
1224 | 17 | # GNU General Public License for more details. | ||
1225 | 18 | # | ||
1226 | 19 | # You should have received a copy of the GNU General Public License | ||
1227 | 20 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
1228 | 21 | |||
1229 | 22 | # As a special exception to the GNU General Public License, if you | ||
1230 | 23 | # distribute this file as part of a program that contains a | ||
1231 | 24 | # configuration script generated by Autoconf, you may include it under | ||
1232 | 25 | # the same distribution terms that you use for the rest of that program. | ||
1233 | 26 | |||
1234 | 27 | # This file is maintained in Automake, please report | ||
1235 | 28 | # bugs to <bug-automake@gnu.org> or send patches to | ||
1236 | 29 | # <automake-patches@gnu.org>. | ||
1237 | 30 | |||
1238 | 31 | nl=' | ||
1239 | 32 | ' | ||
1240 | 33 | |||
1241 | 34 | # We need space, tab and new line, in precisely that order. Quoting is | ||
1242 | 35 | # there to prevent tools from complaining about whitespace usage. | ||
1243 | 36 | IFS=" "" $nl" | ||
1244 | 37 | |||
1245 | 38 | file_conv= | ||
1246 | 39 | |||
1247 | 40 | # func_file_conv build_file lazy | ||
1248 | 41 | # Convert a $build file to $host form and store it in $file | ||
1249 | 42 | # Currently only supports Windows hosts. If the determined conversion | ||
1250 | 43 | # type is listed in (the comma separated) LAZY, no conversion will | ||
1251 | 44 | # take place. | ||
1252 | 45 | func_file_conv () | ||
1253 | 46 | { | ||
1254 | 47 | file=$1 | ||
1255 | 48 | case $file in | ||
1256 | 49 | / | /[!/]*) # absolute file, and not a UNC file | ||
1257 | 50 | if test -z "$file_conv"; then | ||
1258 | 51 | # lazily determine how to convert abs files | ||
1259 | 52 | case `uname -s` in | ||
1260 | 53 | MINGW*) | ||
1261 | 54 | file_conv=mingw | ||
1262 | 55 | ;; | ||
1263 | 56 | CYGWIN*) | ||
1264 | 57 | file_conv=cygwin | ||
1265 | 58 | ;; | ||
1266 | 59 | *) | ||
1267 | 60 | file_conv=wine | ||
1268 | 61 | ;; | ||
1269 | 62 | esac | ||
1270 | 63 | fi | ||
1271 | 64 | case $file_conv/,$2, in | ||
1272 | 65 | *,$file_conv,*) | ||
1273 | 66 | ;; | ||
1274 | 67 | mingw/*) | ||
1275 | 68 | file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` | ||
1276 | 69 | ;; | ||
1277 | 70 | cygwin/*) | ||
1278 | 71 | file=`cygpath -m "$file" || echo "$file"` | ||
1279 | 72 | ;; | ||
1280 | 73 | wine/*) | ||
1281 | 74 | file=`winepath -w "$file" || echo "$file"` | ||
1282 | 75 | ;; | ||
1283 | 76 | esac | ||
1284 | 77 | ;; | ||
1285 | 78 | esac | ||
1286 | 79 | } | ||
1287 | 80 | |||
1288 | 81 | # func_cl_dashL linkdir | ||
1289 | 82 | # Make cl look for libraries in LINKDIR | ||
1290 | 83 | func_cl_dashL () | ||
1291 | 84 | { | ||
1292 | 85 | func_file_conv "$1" | ||
1293 | 86 | if test -z "$lib_path"; then | ||
1294 | 87 | lib_path=$file | ||
1295 | 88 | else | ||
1296 | 89 | lib_path="$lib_path;$file" | ||
1297 | 90 | fi | ||
1298 | 91 | linker_opts="$linker_opts -LIBPATH:$file" | ||
1299 | 92 | } | ||
1300 | 93 | |||
1301 | 94 | # func_cl_dashl library | ||
1302 | 95 | # Do a library search-path lookup for cl | ||
1303 | 96 | func_cl_dashl () | ||
1304 | 97 | { | ||
1305 | 98 | lib=$1 | ||
1306 | 99 | found=no | ||
1307 | 100 | save_IFS=$IFS | ||
1308 | 101 | IFS=';' | ||
1309 | 102 | for dir in $lib_path $LIB | ||
1310 | 103 | do | ||
1311 | 104 | IFS=$save_IFS | ||
1312 | 105 | if $shared && test -f "$dir/$lib.dll.lib"; then | ||
1313 | 106 | found=yes | ||
1314 | 107 | lib=$dir/$lib.dll.lib | ||
1315 | 108 | break | ||
1316 | 109 | fi | ||
1317 | 110 | if test -f "$dir/$lib.lib"; then | ||
1318 | 111 | found=yes | ||
1319 | 112 | lib=$dir/$lib.lib | ||
1320 | 113 | break | ||
1321 | 114 | fi | ||
1322 | 115 | if test -f "$dir/lib$lib.a"; then | ||
1323 | 116 | found=yes | ||
1324 | 117 | lib=$dir/lib$lib.a | ||
1325 | 118 | break | ||
1326 | 119 | fi | ||
1327 | 120 | done | ||
1328 | 121 | IFS=$save_IFS | ||
1329 | 122 | |||
1330 | 123 | if test "$found" != yes; then | ||
1331 | 124 | lib=$lib.lib | ||
1332 | 125 | fi | ||
1333 | 126 | } | ||
1334 | 127 | |||
1335 | 128 | # func_cl_wrapper cl arg... | ||
1336 | 129 | # Adjust compile command to suit cl | ||
1337 | 130 | func_cl_wrapper () | ||
1338 | 131 | { | ||
1339 | 132 | # Assume a capable shell | ||
1340 | 133 | lib_path= | ||
1341 | 134 | shared=: | ||
1342 | 135 | linker_opts= | ||
1343 | 136 | for arg | ||
1344 | 137 | do | ||
1345 | 138 | if test -n "$eat"; then | ||
1346 | 139 | eat= | ||
1347 | 140 | else | ||
1348 | 141 | case $1 in | ||
1349 | 142 | -o) | ||
1350 | 143 | # configure might choose to run compile as 'compile cc -o foo foo.c'. | ||
1351 | 144 | eat=1 | ||
1352 | 145 | case $2 in | ||
1353 | 146 | *.o | *.[oO][bB][jJ]) | ||
1354 | 147 | func_file_conv "$2" | ||
1355 | 148 | set x "$@" -Fo"$file" | ||
1356 | 149 | shift | ||
1357 | 150 | ;; | ||
1358 | 151 | *) | ||
1359 | 152 | func_file_conv "$2" | ||
1360 | 153 | set x "$@" -Fe"$file" | ||
1361 | 154 | shift | ||
1362 | 155 | ;; | ||
1363 | 156 | esac | ||
1364 | 157 | ;; | ||
1365 | 158 | -I) | ||
1366 | 159 | eat=1 | ||
1367 | 160 | func_file_conv "$2" mingw | ||
1368 | 161 | set x "$@" -I"$file" | ||
1369 | 162 | shift | ||
1370 | 163 | ;; | ||
1371 | 164 | -I*) | ||
1372 | 165 | func_file_conv "${1#-I}" mingw | ||
1373 | 166 | set x "$@" -I"$file" | ||
1374 | 167 | shift | ||
1375 | 168 | ;; | ||
1376 | 169 | -l) | ||
1377 | 170 | eat=1 | ||
1378 | 171 | func_cl_dashl "$2" | ||
1379 | 172 | set x "$@" "$lib" | ||
1380 | 173 | shift | ||
1381 | 174 | ;; | ||
1382 | 175 | -l*) | ||
1383 | 176 | func_cl_dashl "${1#-l}" | ||
1384 | 177 | set x "$@" "$lib" | ||
1385 | 178 | shift | ||
1386 | 179 | ;; | ||
1387 | 180 | -L) | ||
1388 | 181 | eat=1 | ||
1389 | 182 | func_cl_dashL "$2" | ||
1390 | 183 | ;; | ||
1391 | 184 | -L*) | ||
1392 | 185 | func_cl_dashL "${1#-L}" | ||
1393 | 186 | ;; | ||
1394 | 187 | -static) | ||
1395 | 188 | shared=false | ||
1396 | 189 | ;; | ||
1397 | 190 | -Wl,*) | ||
1398 | 191 | arg=${1#-Wl,} | ||
1399 | 192 | save_ifs="$IFS"; IFS=',' | ||
1400 | 193 | for flag in $arg; do | ||
1401 | 194 | IFS="$save_ifs" | ||
1402 | 195 | linker_opts="$linker_opts $flag" | ||
1403 | 196 | done | ||
1404 | 197 | IFS="$save_ifs" | ||
1405 | 198 | ;; | ||
1406 | 199 | -Xlinker) | ||
1407 | 200 | eat=1 | ||
1408 | 201 | linker_opts="$linker_opts $2" | ||
1409 | 202 | ;; | ||
1410 | 203 | -*) | ||
1411 | 204 | set x "$@" "$1" | ||
1412 | 205 | shift | ||
1413 | 206 | ;; | ||
1414 | 207 | *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) | ||
1415 | 208 | func_file_conv "$1" | ||
1416 | 209 | set x "$@" -Tp"$file" | ||
1417 | 210 | shift | ||
1418 | 211 | ;; | ||
1419 | 212 | *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) | ||
1420 | 213 | func_file_conv "$1" mingw | ||
1421 | 214 | set x "$@" "$file" | ||
1422 | 215 | shift | ||
1423 | 216 | ;; | ||
1424 | 217 | *) | ||
1425 | 218 | set x "$@" "$1" | ||
1426 | 219 | shift | ||
1427 | 220 | ;; | ||
1428 | 221 | esac | ||
1429 | 222 | fi | ||
1430 | 223 | shift | ||
1431 | 224 | done | ||
1432 | 225 | if test -n "$linker_opts"; then | ||
1433 | 226 | linker_opts="-link$linker_opts" | ||
1434 | 227 | fi | ||
1435 | 228 | exec "$@" $linker_opts | ||
1436 | 229 | exit 1 | ||
1437 | 230 | } | ||
1438 | 231 | |||
1439 | 232 | eat= | ||
1440 | 233 | |||
1441 | 234 | case $1 in | ||
1442 | 235 | '') | ||
1443 | 236 | echo "$0: No command. Try '$0 --help' for more information." 1>&2 | ||
1444 | 237 | exit 1; | ||
1445 | 238 | ;; | ||
1446 | 239 | -h | --h*) | ||
1447 | 240 | cat <<\EOF | ||
1448 | 241 | Usage: compile [--help] [--version] PROGRAM [ARGS] | ||
1449 | 242 | |||
1450 | 243 | Wrapper for compilers which do not understand '-c -o'. | ||
1451 | 244 | Remove '-o dest.o' from ARGS, run PROGRAM with the remaining | ||
1452 | 245 | arguments, and rename the output as expected. | ||
1453 | 246 | |||
1454 | 247 | If you are trying to build a whole package this is not the | ||
1455 | 248 | right script to run: please start by reading the file 'INSTALL'. | ||
1456 | 249 | |||
1457 | 250 | Report bugs to <bug-automake@gnu.org>. | ||
1458 | 251 | EOF | ||
1459 | 252 | exit $? | ||
1460 | 253 | ;; | ||
1461 | 254 | -v | --v*) | ||
1462 | 255 | echo "compile $scriptversion" | ||
1463 | 256 | exit $? | ||
1464 | 257 | ;; | ||
1465 | 258 | cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) | ||
1466 | 259 | func_cl_wrapper "$@" # Doesn't return... | ||
1467 | 260 | ;; | ||
1468 | 261 | esac | ||
1469 | 262 | |||
1470 | 263 | ofile= | ||
1471 | 264 | cfile= | ||
1472 | 265 | |||
1473 | 266 | for arg | ||
1474 | 267 | do | ||
1475 | 268 | if test -n "$eat"; then | ||
1476 | 269 | eat= | ||
1477 | 270 | else | ||
1478 | 271 | case $1 in | ||
1479 | 272 | -o) | ||
1480 | 273 | # configure might choose to run compile as 'compile cc -o foo foo.c'. | ||
1481 | 274 | # So we strip '-o arg' only if arg is an object. | ||
1482 | 275 | eat=1 | ||
1483 | 276 | case $2 in | ||
1484 | 277 | *.o | *.obj) | ||
1485 | 278 | ofile=$2 | ||
1486 | 279 | ;; | ||
1487 | 280 | *) | ||
1488 | 281 | set x "$@" -o "$2" | ||
1489 | 282 | shift | ||
1490 | 283 | ;; | ||
1491 | 284 | esac | ||
1492 | 285 | ;; | ||
1493 | 286 | *.c) | ||
1494 | 287 | cfile=$1 | ||
1495 | 288 | set x "$@" "$1" | ||
1496 | 289 | shift | ||
1497 | 290 | ;; | ||
1498 | 291 | *) | ||
1499 | 292 | set x "$@" "$1" | ||
1500 | 293 | shift | ||
1501 | 294 | ;; | ||
1502 | 295 | esac | ||
1503 | 296 | fi | ||
1504 | 297 | shift | ||
1505 | 298 | done | ||
1506 | 299 | |||
1507 | 300 | if test -z "$ofile" || test -z "$cfile"; then | ||
1508 | 301 | # If no '-o' option was seen then we might have been invoked from a | ||
1509 | 302 | # pattern rule where we don't need one. That is ok -- this is a | ||
1510 | 303 | # normal compilation that the losing compiler can handle. If no | ||
1511 | 304 | # '.c' file was seen then we are probably linking. That is also | ||
1512 | 305 | # ok. | ||
1513 | 306 | exec "$@" | ||
1514 | 307 | fi | ||
1515 | 308 | |||
1516 | 309 | # Name of file we expect compiler to create. | ||
1517 | 310 | cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` | ||
1518 | 311 | |||
1519 | 312 | # Create the lock directory. | ||
1520 | 313 | # Note: use '[/\\:.-]' here to ensure that we don't use the same name | ||
1521 | 314 | # that we are using for the .o file. Also, base the name on the expected | ||
1522 | 315 | # object file name, since that is what matters with a parallel build. | ||
1523 | 316 | lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d | ||
1524 | 317 | while true; do | ||
1525 | 318 | if mkdir "$lockdir" >/dev/null 2>&1; then | ||
1526 | 319 | break | ||
1527 | 320 | fi | ||
1528 | 321 | sleep 1 | ||
1529 | 322 | done | ||
1530 | 323 | # FIXME: race condition here if user kills between mkdir and trap. | ||
1531 | 324 | trap "rmdir '$lockdir'; exit 1" 1 2 15 | ||
1532 | 325 | |||
1533 | 326 | # Run the compile. | ||
1534 | 327 | "$@" | ||
1535 | 328 | ret=$? | ||
1536 | 329 | |||
1537 | 330 | if test -f "$cofile"; then | ||
1538 | 331 | test "$cofile" = "$ofile" || mv "$cofile" "$ofile" | ||
1539 | 332 | elif test -f "${cofile}bj"; then | ||
1540 | 333 | test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" | ||
1541 | 334 | fi | ||
1542 | 335 | |||
1543 | 336 | rmdir "$lockdir" | ||
1544 | 337 | exit $ret | ||
1545 | 338 | |||
1546 | 339 | # Local Variables: | ||
1547 | 340 | # mode: shell-script | ||
1548 | 341 | # sh-indentation: 2 | ||
1549 | 342 | # eval: (add-hook 'write-file-hooks 'time-stamp) | ||
1550 | 343 | # time-stamp-start: "scriptversion=" | ||
1551 | 344 | # time-stamp-format: "%:y-%02m-%02d.%02H" | ||
1552 | 345 | # time-stamp-time-zone: "UTC" | ||
1553 | 346 | # time-stamp-end: "; # UTC" | ||
1554 | 347 | # End: | ||
1555 | 0 | 348 | ||
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 | 1 | #! /bin/sh | 1 | #! /bin/sh |
1561 | 2 | # Guess values for system-dependent variables and create Makefiles. | 2 | # Guess values for system-dependent variables and create Makefiles. |
1563 | 3 | # Generated by GNU Autoconf 2.69 for Multitouch Protocol Translation Library 1.1.3. | 3 | # Generated by GNU Autoconf 2.69 for Multitouch Protocol Translation Library 1.1.4. |
1564 | 4 | # | 4 | # |
1565 | 5 | # | 5 | # |
1566 | 6 | # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. | 6 | # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. |
1567 | @@ -587,8 +587,8 @@ | |||
1568 | 587 | # Identity of this package. | 587 | # Identity of this package. |
1569 | 588 | PACKAGE_NAME='Multitouch Protocol Translation Library' | 588 | PACKAGE_NAME='Multitouch Protocol Translation Library' |
1570 | 589 | PACKAGE_TARNAME='mtdev' | 589 | PACKAGE_TARNAME='mtdev' |
1573 | 590 | PACKAGE_VERSION='1.1.3' | 590 | PACKAGE_VERSION='1.1.4' |
1574 | 591 | PACKAGE_STRING='Multitouch Protocol Translation Library 1.1.3' | 591 | PACKAGE_STRING='Multitouch Protocol Translation Library 1.1.4' |
1575 | 592 | PACKAGE_BUGREPORT='' | 592 | PACKAGE_BUGREPORT='' |
1576 | 593 | PACKAGE_URL='' | 593 | PACKAGE_URL='' |
1577 | 594 | 594 | ||
1578 | @@ -681,9 +681,10 @@ | |||
1579 | 681 | build | 681 | build |
1580 | 682 | LIBTOOL | 682 | LIBTOOL |
1581 | 683 | LIB_VERSION | 683 | LIB_VERSION |
1585 | 684 | MAINT | 684 | AM_BACKSLASH |
1586 | 685 | MAINTAINER_MODE_FALSE | 685 | AM_DEFAULT_VERBOSITY |
1587 | 686 | MAINTAINER_MODE_TRUE | 686 | AM_DEFAULT_V |
1588 | 687 | AM_V | ||
1589 | 687 | am__untar | 688 | am__untar |
1590 | 688 | am__tar | 689 | am__tar |
1591 | 689 | AMTAR | 690 | AMTAR |
1592 | @@ -748,7 +749,7 @@ | |||
1593 | 748 | ac_subst_files='' | 749 | ac_subst_files='' |
1594 | 749 | ac_user_opts=' | 750 | ac_user_opts=' |
1595 | 750 | enable_option_checking | 751 | enable_option_checking |
1597 | 751 | enable_maintainer_mode | 752 | enable_silent_rules |
1598 | 752 | enable_shared | 753 | enable_shared |
1599 | 753 | enable_static | 754 | enable_static |
1600 | 754 | with_pic | 755 | with_pic |
1601 | @@ -1307,7 +1308,7 @@ | |||
1602 | 1307 | # Omit some internal or obsolete options to make the list less imposing. | 1308 | # Omit some internal or obsolete options to make the list less imposing. |
1603 | 1308 | # This message is too long to be a string in the A/UX 3.1 sh. | 1309 | # This message is too long to be a string in the A/UX 3.1 sh. |
1604 | 1309 | cat <<_ACEOF | 1310 | cat <<_ACEOF |
1606 | 1310 | \`configure' configures Multitouch Protocol Translation Library 1.1.3 to adapt to many kinds of systems. | 1311 | \`configure' configures Multitouch Protocol Translation Library 1.1.4 to adapt to many kinds of systems. |
1607 | 1311 | 1312 | ||
1608 | 1312 | Usage: $0 [OPTION]... [VAR=VALUE]... | 1313 | Usage: $0 [OPTION]... [VAR=VALUE]... |
1609 | 1313 | 1314 | ||
1610 | @@ -1377,7 +1378,7 @@ | |||
1611 | 1377 | 1378 | ||
1612 | 1378 | if test -n "$ac_init_help"; then | 1379 | if test -n "$ac_init_help"; then |
1613 | 1379 | case $ac_init_help in | 1380 | case $ac_init_help in |
1615 | 1380 | short | recursive ) echo "Configuration of Multitouch Protocol Translation Library 1.1.3:";; | 1381 | short | recursive ) echo "Configuration of Multitouch Protocol Translation Library 1.1.4:";; |
1616 | 1381 | esac | 1382 | esac |
1617 | 1382 | cat <<\_ACEOF | 1383 | cat <<\_ACEOF |
1618 | 1383 | 1384 | ||
1619 | @@ -1385,9 +1386,8 @@ | |||
1620 | 1385 | --disable-option-checking ignore unrecognized --enable/--with options | 1386 | --disable-option-checking ignore unrecognized --enable/--with options |
1621 | 1386 | --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) | 1387 | --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) |
1622 | 1387 | --enable-FEATURE[=ARG] include FEATURE [ARG=yes] | 1388 | --enable-FEATURE[=ARG] include FEATURE [ARG=yes] |
1626 | 1388 | --enable-maintainer-mode | 1389 | --enable-silent-rules less verbose build output (undo: "make V=1") |
1627 | 1389 | enable make rules and dependencies not useful (and | 1390 | --disable-silent-rules verbose build output (undo: "make V=0") |
1625 | 1390 | sometimes confusing) to the casual installer | ||
1628 | 1391 | --enable-shared[=PKGS] build shared libraries [default=yes] | 1391 | --enable-shared[=PKGS] build shared libraries [default=yes] |
1629 | 1392 | --enable-static[=PKGS] build static libraries [default=yes] | 1392 | --enable-static[=PKGS] build static libraries [default=yes] |
1630 | 1393 | --enable-fast-install[=PKGS] | 1393 | --enable-fast-install[=PKGS] |
1631 | @@ -1483,7 +1483,7 @@ | |||
1632 | 1483 | test -n "$ac_init_help" && exit $ac_status | 1483 | test -n "$ac_init_help" && exit $ac_status |
1633 | 1484 | if $ac_init_version; then | 1484 | if $ac_init_version; then |
1634 | 1485 | cat <<\_ACEOF | 1485 | cat <<\_ACEOF |
1636 | 1486 | Multitouch Protocol Translation Library configure 1.1.3 | 1486 | Multitouch Protocol Translation Library configure 1.1.4 |
1637 | 1487 | generated by GNU Autoconf 2.69 | 1487 | generated by GNU Autoconf 2.69 |
1638 | 1488 | 1488 | ||
1639 | 1489 | Copyright (C) 2012 Free Software Foundation, Inc. | 1489 | Copyright (C) 2012 Free Software Foundation, Inc. |
1640 | @@ -1761,7 +1761,7 @@ | |||
1641 | 1761 | This file contains any messages produced by compilers while | 1761 | This file contains any messages produced by compilers while |
1642 | 1762 | running configure, to aid debugging if configure makes a mistake. | 1762 | running configure, to aid debugging if configure makes a mistake. |
1643 | 1763 | 1763 | ||
1645 | 1764 | It was created by Multitouch Protocol Translation Library $as_me 1.1.3, which was | 1764 | It was created by Multitouch Protocol Translation Library $as_me 1.1.4, which was |
1646 | 1765 | generated by GNU Autoconf 2.69. Invocation command line was | 1765 | generated by GNU Autoconf 2.69. Invocation command line was |
1647 | 1766 | 1766 | ||
1648 | 1767 | $ $0 $@ | 1767 | $ $0 $@ |
1649 | @@ -2143,7 +2143,7 @@ | |||
1650 | 2143 | 2143 | ||
1651 | 2144 | 2144 | ||
1652 | 2145 | # Initialize Automake | 2145 | # Initialize Automake |
1654 | 2146 | am__api_version='1.12' | 2146 | am__api_version='1.14' |
1655 | 2147 | 2147 | ||
1656 | 2148 | # Find a good install program. We prefer a C program (faster), | 2148 | # Find a good install program. We prefer a C program (faster), |
1657 | 2149 | # so one script is as good as another. But avoid the broken or | 2149 | # so one script is as good as another. But avoid the broken or |
1658 | @@ -2327,8 +2327,8 @@ | |||
1659 | 2327 | esac | 2327 | esac |
1660 | 2328 | fi | 2328 | fi |
1661 | 2329 | # Use eval to expand $SHELL | 2329 | # Use eval to expand $SHELL |
1664 | 2330 | if eval "$MISSING --run true"; then | 2330 | if eval "$MISSING --is-lightweight"; then |
1665 | 2331 | am_missing_run="$MISSING --run " | 2331 | am_missing_run="$MISSING " |
1666 | 2332 | else | 2332 | else |
1667 | 2333 | am_missing_run= | 2333 | am_missing_run= |
1668 | 2334 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 | 2334 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 |
1669 | @@ -2568,6 +2568,45 @@ | |||
1670 | 2568 | fi | 2568 | fi |
1671 | 2569 | rmdir .tst 2>/dev/null | 2569 | rmdir .tst 2>/dev/null |
1672 | 2570 | 2570 | ||
1673 | 2571 | # Check whether --enable-silent-rules was given. | ||
1674 | 2572 | if test "${enable_silent_rules+set}" = set; then : | ||
1675 | 2573 | enableval=$enable_silent_rules; | ||
1676 | 2574 | fi | ||
1677 | 2575 | |||
1678 | 2576 | case $enable_silent_rules in # ((( | ||
1679 | 2577 | yes) AM_DEFAULT_VERBOSITY=0;; | ||
1680 | 2578 | no) AM_DEFAULT_VERBOSITY=1;; | ||
1681 | 2579 | *) AM_DEFAULT_VERBOSITY=1;; | ||
1682 | 2580 | esac | ||
1683 | 2581 | am_make=${MAKE-make} | ||
1684 | 2582 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 | ||
1685 | 2583 | $as_echo_n "checking whether $am_make supports nested variables... " >&6; } | ||
1686 | 2584 | if ${am_cv_make_support_nested_variables+:} false; then : | ||
1687 | 2585 | $as_echo_n "(cached) " >&6 | ||
1688 | 2586 | else | ||
1689 | 2587 | if $as_echo 'TRUE=$(BAR$(V)) | ||
1690 | 2588 | BAR0=false | ||
1691 | 2589 | BAR1=true | ||
1692 | 2590 | V=1 | ||
1693 | 2591 | am__doit: | ||
1694 | 2592 | @$(TRUE) | ||
1695 | 2593 | .PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then | ||
1696 | 2594 | am_cv_make_support_nested_variables=yes | ||
1697 | 2595 | else | ||
1698 | 2596 | am_cv_make_support_nested_variables=no | ||
1699 | 2597 | fi | ||
1700 | 2598 | fi | ||
1701 | 2599 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 | ||
1702 | 2600 | $as_echo "$am_cv_make_support_nested_variables" >&6; } | ||
1703 | 2601 | if test $am_cv_make_support_nested_variables = yes; then | ||
1704 | 2602 | AM_V='$(V)' | ||
1705 | 2603 | AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' | ||
1706 | 2604 | else | ||
1707 | 2605 | AM_V=$AM_DEFAULT_VERBOSITY | ||
1708 | 2606 | AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY | ||
1709 | 2607 | fi | ||
1710 | 2608 | AM_BACKSLASH='\' | ||
1711 | 2609 | |||
1712 | 2571 | if test "`cd $srcdir && pwd`" != "`pwd`"; then | 2610 | if test "`cd $srcdir && pwd`" != "`pwd`"; then |
1713 | 2572 | # Use -I$(srcdir) only when $(srcdir) != ., so that make's output | 2611 | # Use -I$(srcdir) only when $(srcdir) != ., so that make's output |
1714 | 2573 | # is not polluted with repeated "-I." | 2612 | # is not polluted with repeated "-I." |
1715 | @@ -2590,7 +2629,7 @@ | |||
1716 | 2590 | 2629 | ||
1717 | 2591 | # Define the identity of the package. | 2630 | # Define the identity of the package. |
1718 | 2592 | PACKAGE='mtdev' | 2631 | PACKAGE='mtdev' |
1720 | 2593 | VERSION='1.1.3' | 2632 | VERSION='1.1.4' |
1721 | 2594 | 2633 | ||
1722 | 2595 | 2634 | ||
1723 | 2596 | cat >>confdefs.h <<_ACEOF | 2635 | cat >>confdefs.h <<_ACEOF |
1724 | @@ -2630,6 +2669,10 @@ | |||
1725 | 2630 | # in the wild :-( We should find a proper way to deprecate it ... | 2669 | # in the wild :-( We should find a proper way to deprecate it ... |
1726 | 2631 | AMTAR='$${TAR-tar}' | 2670 | AMTAR='$${TAR-tar}' |
1727 | 2632 | 2671 | ||
1728 | 2672 | |||
1729 | 2673 | # We'll loop over all known methods to create a tar archive until one works. | ||
1730 | 2674 | _am_tools='gnutar pax cpio none' | ||
1731 | 2675 | |||
1732 | 2633 | am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' | 2676 | am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' |
1733 | 2634 | 2677 | ||
1734 | 2635 | 2678 | ||
1735 | @@ -2637,27 +2680,85 @@ | |||
1736 | 2637 | 2680 | ||
1737 | 2638 | 2681 | ||
1738 | 2639 | 2682 | ||
1760 | 2640 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 | 2683 | # POSIX will say in a future version that running "rm -f" with no argument |
1761 | 2641 | $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } | 2684 | # is OK; and we want to be able to make that assumption in our Makefile |
1762 | 2642 | # Check whether --enable-maintainer-mode was given. | 2685 | # recipes. So use an aggressive probe to check that the usage we want is |
1763 | 2643 | if test "${enable_maintainer_mode+set}" = set; then : | 2686 | # actually supported "in the wild" to an acceptable degree. |
1764 | 2644 | enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval | 2687 | # See automake bug#10828. |
1765 | 2645 | else | 2688 | # To make any issue more visible, cause the running configure to be aborted |
1766 | 2646 | USE_MAINTAINER_MODE=no | 2689 | # by default if the 'rm' program in use doesn't match our expectations; the |
1767 | 2647 | fi | 2690 | # user can still override this though. |
1768 | 2648 | 2691 | if rm -f && rm -fr && rm -rf; then : OK; else | |
1769 | 2649 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 | 2692 | cat >&2 <<'END' |
1770 | 2650 | $as_echo "$USE_MAINTAINER_MODE" >&6; } | 2693 | Oops! |
1771 | 2651 | if test $USE_MAINTAINER_MODE = yes; then | 2694 | |
1772 | 2652 | MAINTAINER_MODE_TRUE= | 2695 | Your 'rm' program seems unable to run without file operands specified |
1773 | 2653 | MAINTAINER_MODE_FALSE='#' | 2696 | on the command line, even when the '-f' option is present. This is contrary |
1774 | 2654 | else | 2697 | to the behaviour of most rm programs out there, and not conforming with |
1775 | 2655 | MAINTAINER_MODE_TRUE='#' | 2698 | the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542> |
1776 | 2656 | MAINTAINER_MODE_FALSE= | 2699 | |
1777 | 2657 | fi | 2700 | Please tell bug-automake@gnu.org about your system, including the value |
1778 | 2658 | 2701 | of your $PATH and any error possibly output before this message. This | |
1779 | 2659 | MAINT=$MAINTAINER_MODE_TRUE | 2702 | can help us improve future automake versions. |
1780 | 2660 | 2703 | ||
1781 | 2704 | END | ||
1782 | 2705 | if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then | ||
1783 | 2706 | echo 'Configuration will proceed anyway, since you have set the' >&2 | ||
1784 | 2707 | echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 | ||
1785 | 2708 | echo >&2 | ||
1786 | 2709 | else | ||
1787 | 2710 | cat >&2 <<'END' | ||
1788 | 2711 | Aborting the configuration process, to ensure you take notice of the issue. | ||
1789 | 2712 | |||
1790 | 2713 | You can download and install GNU coreutils to get an 'rm' implementation | ||
1791 | 2714 | that behaves properly: <http://www.gnu.org/software/coreutils/>. | ||
1792 | 2715 | |||
1793 | 2716 | If you want to complete the configuration process using your problematic | ||
1794 | 2717 | 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM | ||
1795 | 2718 | to "yes", and re-run configure. | ||
1796 | 2719 | |||
1797 | 2720 | END | ||
1798 | 2721 | as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 | ||
1799 | 2722 | fi | ||
1800 | 2723 | fi | ||
1801 | 2724 | # Check whether --enable-silent-rules was given. | ||
1802 | 2725 | if test "${enable_silent_rules+set}" = set; then : | ||
1803 | 2726 | enableval=$enable_silent_rules; | ||
1804 | 2727 | fi | ||
1805 | 2728 | |||
1806 | 2729 | case $enable_silent_rules in # ((( | ||
1807 | 2730 | yes) AM_DEFAULT_VERBOSITY=0;; | ||
1808 | 2731 | no) AM_DEFAULT_VERBOSITY=1;; | ||
1809 | 2732 | *) AM_DEFAULT_VERBOSITY=0;; | ||
1810 | 2733 | esac | ||
1811 | 2734 | am_make=${MAKE-make} | ||
1812 | 2735 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 | ||
1813 | 2736 | $as_echo_n "checking whether $am_make supports nested variables... " >&6; } | ||
1814 | 2737 | if ${am_cv_make_support_nested_variables+:} false; then : | ||
1815 | 2738 | $as_echo_n "(cached) " >&6 | ||
1816 | 2739 | else | ||
1817 | 2740 | if $as_echo 'TRUE=$(BAR$(V)) | ||
1818 | 2741 | BAR0=false | ||
1819 | 2742 | BAR1=true | ||
1820 | 2743 | V=1 | ||
1821 | 2744 | am__doit: | ||
1822 | 2745 | @$(TRUE) | ||
1823 | 2746 | .PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then | ||
1824 | 2747 | am_cv_make_support_nested_variables=yes | ||
1825 | 2748 | else | ||
1826 | 2749 | am_cv_make_support_nested_variables=no | ||
1827 | 2750 | fi | ||
1828 | 2751 | fi | ||
1829 | 2752 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 | ||
1830 | 2753 | $as_echo "$am_cv_make_support_nested_variables" >&6; } | ||
1831 | 2754 | if test $am_cv_make_support_nested_variables = yes; then | ||
1832 | 2755 | AM_V='$(V)' | ||
1833 | 2756 | AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' | ||
1834 | 2757 | else | ||
1835 | 2758 | AM_V=$AM_DEFAULT_VERBOSITY | ||
1836 | 2759 | AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY | ||
1837 | 2760 | fi | ||
1838 | 2761 | AM_BACKSLASH='\' | ||
1839 | 2661 | 2762 | ||
1840 | 2662 | 2763 | ||
1841 | 2663 | LIB_VERSION=1:0:0 | 2764 | LIB_VERSION=1:0:0 |
1842 | @@ -3681,6 +3782,65 @@ | |||
1843 | 3681 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | 3782 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
1844 | 3682 | ac_compiler_gnu=$ac_cv_c_compiler_gnu | 3783 | ac_compiler_gnu=$ac_cv_c_compiler_gnu |
1845 | 3683 | 3784 | ||
1846 | 3785 | ac_ext=c | ||
1847 | 3786 | ac_cpp='$CPP $CPPFLAGS' | ||
1848 | 3787 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
1849 | 3788 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
1850 | 3789 | ac_compiler_gnu=$ac_cv_c_compiler_gnu | ||
1851 | 3790 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 | ||
1852 | 3791 | $as_echo_n "checking whether $CC understands -c and -o together... " >&6; } | ||
1853 | 3792 | if ${am_cv_prog_cc_c_o+:} false; then : | ||
1854 | 3793 | $as_echo_n "(cached) " >&6 | ||
1855 | 3794 | else | ||
1856 | 3795 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
1857 | 3796 | /* end confdefs.h. */ | ||
1858 | 3797 | |||
1859 | 3798 | int | ||
1860 | 3799 | main () | ||
1861 | 3800 | { | ||
1862 | 3801 | |||
1863 | 3802 | ; | ||
1864 | 3803 | return 0; | ||
1865 | 3804 | } | ||
1866 | 3805 | _ACEOF | ||
1867 | 3806 | # Make sure it works both with $CC and with simple cc. | ||
1868 | 3807 | # Following AC_PROG_CC_C_O, we do the test twice because some | ||
1869 | 3808 | # compilers refuse to overwrite an existing .o file with -o, | ||
1870 | 3809 | # though they will create one. | ||
1871 | 3810 | am_cv_prog_cc_c_o=yes | ||
1872 | 3811 | for am_i in 1 2; do | ||
1873 | 3812 | if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 | ||
1874 | 3813 | ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 | ||
1875 | 3814 | ac_status=$? | ||
1876 | 3815 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
1877 | 3816 | (exit $ac_status); } \ | ||
1878 | 3817 | && test -f conftest2.$ac_objext; then | ||
1879 | 3818 | : OK | ||
1880 | 3819 | else | ||
1881 | 3820 | am_cv_prog_cc_c_o=no | ||
1882 | 3821 | break | ||
1883 | 3822 | fi | ||
1884 | 3823 | done | ||
1885 | 3824 | rm -f core conftest* | ||
1886 | 3825 | unset am_i | ||
1887 | 3826 | fi | ||
1888 | 3827 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 | ||
1889 | 3828 | $as_echo "$am_cv_prog_cc_c_o" >&6; } | ||
1890 | 3829 | if test "$am_cv_prog_cc_c_o" != yes; then | ||
1891 | 3830 | # Losing compiler, so override with the script. | ||
1892 | 3831 | # FIXME: It is wrong to rewrite CC. | ||
1893 | 3832 | # But if we don't then we get into trouble of one sort or another. | ||
1894 | 3833 | # A longer-term fix would be to have automake use am__CC in this case, | ||
1895 | 3834 | # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" | ||
1896 | 3835 | CC="$am_aux_dir/compile $CC" | ||
1897 | 3836 | fi | ||
1898 | 3837 | ac_ext=c | ||
1899 | 3838 | ac_cpp='$CPP $CPPFLAGS' | ||
1900 | 3839 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
1901 | 3840 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
1902 | 3841 | ac_compiler_gnu=$ac_cv_c_compiler_gnu | ||
1903 | 3842 | |||
1904 | 3843 | |||
1905 | 3684 | depcc="$CC" am_compiler_list= | 3844 | depcc="$CC" am_compiler_list= |
1906 | 3685 | 3845 | ||
1907 | 3686 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 | 3846 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 |
1908 | @@ -11763,6 +11923,65 @@ | |||
1909 | 11763 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | 11923 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' |
1910 | 11764 | ac_compiler_gnu=$ac_cv_c_compiler_gnu | 11924 | ac_compiler_gnu=$ac_cv_c_compiler_gnu |
1911 | 11765 | 11925 | ||
1912 | 11926 | ac_ext=c | ||
1913 | 11927 | ac_cpp='$CPP $CPPFLAGS' | ||
1914 | 11928 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
1915 | 11929 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
1916 | 11930 | ac_compiler_gnu=$ac_cv_c_compiler_gnu | ||
1917 | 11931 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 | ||
1918 | 11932 | $as_echo_n "checking whether $CC understands -c and -o together... " >&6; } | ||
1919 | 11933 | if ${am_cv_prog_cc_c_o+:} false; then : | ||
1920 | 11934 | $as_echo_n "(cached) " >&6 | ||
1921 | 11935 | else | ||
1922 | 11936 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
1923 | 11937 | /* end confdefs.h. */ | ||
1924 | 11938 | |||
1925 | 11939 | int | ||
1926 | 11940 | main () | ||
1927 | 11941 | { | ||
1928 | 11942 | |||
1929 | 11943 | ; | ||
1930 | 11944 | return 0; | ||
1931 | 11945 | } | ||
1932 | 11946 | _ACEOF | ||
1933 | 11947 | # Make sure it works both with $CC and with simple cc. | ||
1934 | 11948 | # Following AC_PROG_CC_C_O, we do the test twice because some | ||
1935 | 11949 | # compilers refuse to overwrite an existing .o file with -o, | ||
1936 | 11950 | # though they will create one. | ||
1937 | 11951 | am_cv_prog_cc_c_o=yes | ||
1938 | 11952 | for am_i in 1 2; do | ||
1939 | 11953 | if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 | ||
1940 | 11954 | ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 | ||
1941 | 11955 | ac_status=$? | ||
1942 | 11956 | echo "$as_me:$LINENO: \$? = $ac_status" >&5 | ||
1943 | 11957 | (exit $ac_status); } \ | ||
1944 | 11958 | && test -f conftest2.$ac_objext; then | ||
1945 | 11959 | : OK | ||
1946 | 11960 | else | ||
1947 | 11961 | am_cv_prog_cc_c_o=no | ||
1948 | 11962 | break | ||
1949 | 11963 | fi | ||
1950 | 11964 | done | ||
1951 | 11965 | rm -f core conftest* | ||
1952 | 11966 | unset am_i | ||
1953 | 11967 | fi | ||
1954 | 11968 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 | ||
1955 | 11969 | $as_echo "$am_cv_prog_cc_c_o" >&6; } | ||
1956 | 11970 | if test "$am_cv_prog_cc_c_o" != yes; then | ||
1957 | 11971 | # Losing compiler, so override with the script. | ||
1958 | 11972 | # FIXME: It is wrong to rewrite CC. | ||
1959 | 11973 | # But if we don't then we get into trouble of one sort or another. | ||
1960 | 11974 | # A longer-term fix would be to have automake use am__CC in this case, | ||
1961 | 11975 | # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" | ||
1962 | 11976 | CC="$am_aux_dir/compile $CC" | ||
1963 | 11977 | fi | ||
1964 | 11978 | ac_ext=c | ||
1965 | 11979 | ac_cpp='$CPP $CPPFLAGS' | ||
1966 | 11980 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' | ||
1967 | 11981 | ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' | ||
1968 | 11982 | ac_compiler_gnu=$ac_cv_c_compiler_gnu | ||
1969 | 11983 | |||
1970 | 11984 | |||
1971 | 11766 | depcc="$CC" am_compiler_list= | 11985 | depcc="$CC" am_compiler_list= |
1972 | 11767 | 11986 | ||
1973 | 11768 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 | 11987 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 |
1974 | @@ -12020,10 +12239,6 @@ | |||
1975 | 12020 | am__EXEEXT_FALSE= | 12239 | am__EXEEXT_FALSE= |
1976 | 12021 | fi | 12240 | fi |
1977 | 12022 | 12241 | ||
1978 | 12023 | if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then | ||
1979 | 12024 | as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. | ||
1980 | 12025 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | ||
1981 | 12026 | fi | ||
1982 | 12027 | if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then | 12242 | if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then |
1983 | 12028 | as_fn_error $? "conditional \"AMDEP\" was never defined. | 12243 | as_fn_error $? "conditional \"AMDEP\" was never defined. |
1984 | 12029 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | 12244 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
1985 | @@ -12433,7 +12648,7 @@ | |||
1986 | 12433 | # report actual input values of CONFIG_FILES etc. instead of their | 12648 | # report actual input values of CONFIG_FILES etc. instead of their |
1987 | 12434 | # values after options handling. | 12649 | # values after options handling. |
1988 | 12435 | ac_log=" | 12650 | ac_log=" |
1990 | 12436 | This file was extended by Multitouch Protocol Translation Library $as_me 1.1.3, which was | 12651 | This file was extended by Multitouch Protocol Translation Library $as_me 1.1.4, which was |
1991 | 12437 | generated by GNU Autoconf 2.69. Invocation command line was | 12652 | generated by GNU Autoconf 2.69. Invocation command line was |
1992 | 12438 | 12653 | ||
1993 | 12439 | CONFIG_FILES = $CONFIG_FILES | 12654 | CONFIG_FILES = $CONFIG_FILES |
1994 | @@ -12499,7 +12714,7 @@ | |||
1995 | 12499 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 | 12714 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
1996 | 12500 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" | 12715 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
1997 | 12501 | ac_cs_version="\\ | 12716 | ac_cs_version="\\ |
1999 | 12502 | Multitouch Protocol Translation Library config.status 1.1.3 | 12717 | Multitouch Protocol Translation Library config.status 1.1.4 |
2000 | 12503 | configured by $0, generated by GNU Autoconf 2.69, | 12718 | configured by $0, generated by GNU Autoconf 2.69, |
2001 | 12504 | with options \\"\$ac_cs_config\\" | 12719 | with options \\"\$ac_cs_config\\" |
2002 | 12505 | 12720 | ||
2003 | @@ -13508,7 +13723,7 @@ | |||
2004 | 13508 | 13723 | ||
2005 | 13509 | case $ac_file$ac_mode in | 13724 | case $ac_file$ac_mode in |
2006 | 13510 | "depfiles":C) test x"$AMDEP_TRUE" != x"" || { | 13725 | "depfiles":C) test x"$AMDEP_TRUE" != x"" || { |
2008 | 13511 | # Autoconf 2.62 quotes --file arguments for eval, but not when files | 13726 | # Older Autoconf quotes --file arguments for eval, but not when files |
2009 | 13512 | # are listed without --file. Let's play safe and only enable the eval | 13727 | # are listed without --file. Let's play safe and only enable the eval |
2010 | 13513 | # if we detect the quoting. | 13728 | # if we detect the quoting. |
2011 | 13514 | case $CONFIG_FILES in | 13729 | case $CONFIG_FILES in |
2012 | @@ -13559,7 +13774,7 @@ | |||
2013 | 13559 | DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` | 13774 | DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` |
2014 | 13560 | test -z "$DEPDIR" && continue | 13775 | test -z "$DEPDIR" && continue |
2015 | 13561 | am__include=`sed -n 's/^am__include = //p' < "$mf"` | 13776 | am__include=`sed -n 's/^am__include = //p' < "$mf"` |
2017 | 13562 | test -z "am__include" && continue | 13777 | test -z "$am__include" && continue |
2018 | 13563 | am__quote=`sed -n 's/^am__quote = //p' < "$mf"` | 13778 | am__quote=`sed -n 's/^am__quote = //p' < "$mf"` |
2019 | 13564 | # Find all dependency output files, they are included files with | 13779 | # Find all dependency output files, they are included files with |
2020 | 13565 | # $(DEPDIR) in their names. We invoke sed twice because it is the | 13780 | # $(DEPDIR) in their names. We invoke sed twice because it is the |
2021 | 13566 | 13781 | ||
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 | 1 | # Initialize Autoconf | 1 | # Initialize Autoconf |
2027 | 2 | AC_PREREQ([2.60]) | 2 | AC_PREREQ([2.60]) |
2028 | 3 | AC_INIT([Multitouch Protocol Translation Library], | 3 | AC_INIT([Multitouch Protocol Translation Library], |
2030 | 4 | [1.1.3], | 4 | [1.1.4], |
2031 | 5 | [], | 5 | [], |
2032 | 6 | [mtdev]) | 6 | [mtdev]) |
2033 | 7 | AC_CONFIG_SRCDIR([Makefile.am]) | 7 | AC_CONFIG_SRCDIR([Makefile.am]) |
2034 | @@ -10,7 +10,7 @@ | |||
2035 | 10 | 10 | ||
2036 | 11 | # Initialize Automake | 11 | # Initialize Automake |
2037 | 12 | AM_INIT_AUTOMAKE([foreign dist-bzip2]) | 12 | AM_INIT_AUTOMAKE([foreign dist-bzip2]) |
2039 | 13 | AM_MAINTAINER_MODE | 13 | AM_SILENT_RULES([yes]) |
2040 | 14 | 14 | ||
2041 | 15 | LIB_VERSION=1:0:0 | 15 | LIB_VERSION=1:0:0 |
2042 | 16 | AC_SUBST([LIB_VERSION]) | 16 | AC_SUBST([LIB_VERSION]) |
2043 | 17 | 17 | ||
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 | 1 | mtdev (1.1.4-1ubuntu1) trusty; urgency=low | ||
2049 | 2 | |||
2050 | 3 | * Merge from Debian unstable. Remaining changes: | ||
2051 | 4 | - debian/libmtdev1.links: Install apport hook links. | ||
2052 | 5 | |||
2053 | 6 | -- Logan Rosen <logan@ubuntu.com> Sat, 26 Oct 2013 18:16:52 -0400 | ||
2054 | 7 | |||
2055 | 8 | mtdev (1.1.4-1) unstable; urgency=low | ||
2056 | 9 | |||
2057 | 10 | * New upstream release. | ||
2058 | 11 | |||
2059 | 12 | -- Nobuhiro Iwamatsu <iwamatsu@debian.org> Tue, 24 Sep 2013 08:25:26 +0900 | ||
2060 | 13 | |||
2061 | 1 | mtdev (1.1.3-1ubuntu1) saucy; urgency=low | 14 | mtdev (1.1.3-1ubuntu1) saucy; urgency=low |
2062 | 2 | 15 | ||
2063 | 3 | * Merge from Debian unstable. Remaining changes: | 16 | * Merge from Debian unstable. Remaining changes: |
2064 | 4 | 17 | ||
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 | 18 | 18 | ||
2070 | 19 | AM_CFLAGS = $(CWARNFLAGS) #-DMTDEV_NO_LEGACY_ABI | 19 | AM_CFLAGS = $(CWARNFLAGS) #-DMTDEV_NO_LEGACY_ABI |
2071 | 20 | 20 | ||
2073 | 21 | INCLUDES = -I$(top_srcdir)/include/ | 21 | AM_CPPFLAGS = -I$(top_srcdir)/include/ |
2074 | 22 | 22 | ||
2075 | 23 | libmtdevincludedir = $(includedir) | 23 | libmtdevincludedir = $(includedir) |
2076 | 24 | libmtdevinclude_HEADERS = \ | 24 | libmtdevinclude_HEADERS = \ |
2077 | 25 | 25 | ||
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 @@ | |||
2083 | 1 | # Makefile.in generated by automake 1.12.3 from Makefile.am. | 1 | # Makefile.in generated by automake 1.14 from Makefile.am. |
2084 | 2 | # @configure_input@ | 2 | # @configure_input@ |
2085 | 3 | 3 | ||
2087 | 4 | # Copyright (C) 1994-2012 Free Software Foundation, Inc. | 4 | # Copyright (C) 1994-2013 Free Software Foundation, Inc. |
2088 | 5 | 5 | ||
2089 | 6 | # This Makefile.in is free software; the Free Software Foundation | 6 | # This Makefile.in is free software; the Free Software Foundation |
2090 | 7 | # gives unlimited permission to copy and/or distribute it, | 7 | # gives unlimited permission to copy and/or distribute it, |
2091 | @@ -16,23 +16,51 @@ | |||
2092 | 16 | 16 | ||
2093 | 17 | 17 | ||
2094 | 18 | VPATH = @srcdir@ | 18 | VPATH = @srcdir@ |
2098 | 19 | am__make_dryrun = \ | 19 | am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' |
2099 | 20 | { \ | 20 | am__make_running_with_option = \ |
2100 | 21 | am__dry=no; \ | 21 | case $${target_option-} in \ |
2101 | 22 | ?) ;; \ | ||
2102 | 23 | *) echo "am__make_running_with_option: internal error: invalid" \ | ||
2103 | 24 | "target option '$${target_option-}' specified" >&2; \ | ||
2104 | 25 | exit 1;; \ | ||
2105 | 26 | esac; \ | ||
2106 | 27 | has_opt=no; \ | ||
2107 | 28 | sane_makeflags=$$MAKEFLAGS; \ | ||
2108 | 29 | if $(am__is_gnu_make); then \ | ||
2109 | 30 | sane_makeflags=$$MFLAGS; \ | ||
2110 | 31 | else \ | ||
2111 | 22 | case $$MAKEFLAGS in \ | 32 | case $$MAKEFLAGS in \ |
2112 | 23 | *\\[\ \ ]*) \ | 33 | *\\[\ \ ]*) \ |
2125 | 24 | echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ | 34 | bs=\\; \ |
2126 | 25 | | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ | 35 | sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ |
2127 | 26 | *) \ | 36 | | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ |
2128 | 27 | for am__flg in $$MAKEFLAGS; do \ | 37 | esac; \ |
2129 | 28 | case $$am__flg in \ | 38 | fi; \ |
2130 | 29 | *=*|--*) ;; \ | 39 | skip_next=no; \ |
2131 | 30 | *n*) am__dry=yes; break;; \ | 40 | strip_trailopt () \ |
2132 | 31 | esac; \ | 41 | { \ |
2133 | 32 | done;; \ | 42 | flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ |
2134 | 33 | esac; \ | 43 | }; \ |
2135 | 34 | test $$am__dry = yes; \ | 44 | for flg in $$sane_makeflags; do \ |
2136 | 35 | } | 45 | test $$skip_next = yes && { skip_next=no; continue; }; \ |
2137 | 46 | case $$flg in \ | ||
2138 | 47 | *=*|--*) continue;; \ | ||
2139 | 48 | -*I) strip_trailopt 'I'; skip_next=yes;; \ | ||
2140 | 49 | -*I?*) strip_trailopt 'I';; \ | ||
2141 | 50 | -*O) strip_trailopt 'O'; skip_next=yes;; \ | ||
2142 | 51 | -*O?*) strip_trailopt 'O';; \ | ||
2143 | 52 | -*l) strip_trailopt 'l'; skip_next=yes;; \ | ||
2144 | 53 | -*l?*) strip_trailopt 'l';; \ | ||
2145 | 54 | -[dEDm]) skip_next=yes;; \ | ||
2146 | 55 | -[JT]) skip_next=yes;; \ | ||
2147 | 56 | esac; \ | ||
2148 | 57 | case $$flg in \ | ||
2149 | 58 | *$$target_option*) has_opt=yes; break;; \ | ||
2150 | 59 | esac; \ | ||
2151 | 60 | done; \ | ||
2152 | 61 | test $$has_opt = yes | ||
2153 | 62 | am__make_dryrun = (target_option=n; $(am__make_running_with_option)) | ||
2154 | 63 | am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) | ||
2155 | 36 | pkgdatadir = $(datadir)/@PACKAGE@ | 64 | pkgdatadir = $(datadir)/@PACKAGE@ |
2156 | 37 | pkgincludedir = $(includedir)/@PACKAGE@ | 65 | pkgincludedir = $(includedir)/@PACKAGE@ |
2157 | 38 | pkglibdir = $(libdir)/@PACKAGE@ | 66 | pkglibdir = $(libdir)/@PACKAGE@ |
2158 | @@ -52,8 +80,8 @@ | |||
2159 | 52 | build_triplet = @build@ | 80 | build_triplet = @build@ |
2160 | 53 | host_triplet = @host@ | 81 | host_triplet = @host@ |
2161 | 54 | subdir = src | 82 | subdir = src |
2164 | 55 | DIST_COMMON = $(libmtdevinclude_HEADERS) $(srcdir)/Makefile.am \ | 83 | DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ |
2165 | 56 | $(srcdir)/Makefile.in $(top_srcdir)/config-aux/depcomp | 84 | $(top_srcdir)/config-aux/depcomp $(libmtdevinclude_HEADERS) |
2166 | 57 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | 85 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
2167 | 58 | am__aclocal_m4_deps = $(top_srcdir)/configure.ac | 86 | am__aclocal_m4_deps = $(top_srcdir)/configure.ac |
2168 | 59 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ | 87 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
2169 | @@ -96,22 +124,47 @@ | |||
2170 | 96 | am_libmtdev_la_OBJECTS = caps.lo core.lo iobuf.lo match.lo \ | 124 | am_libmtdev_la_OBJECTS = caps.lo core.lo iobuf.lo match.lo \ |
2171 | 97 | match_four.lo | 125 | match_four.lo |
2172 | 98 | libmtdev_la_OBJECTS = $(am_libmtdev_la_OBJECTS) | 126 | libmtdev_la_OBJECTS = $(am_libmtdev_la_OBJECTS) |
2174 | 99 | libmtdev_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ | 127 | AM_V_lt = $(am__v_lt_@AM_V@) |
2175 | 128 | am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) | ||
2176 | 129 | am__v_lt_0 = --silent | ||
2177 | 130 | am__v_lt_1 = | ||
2178 | 131 | libmtdev_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ | ||
2179 | 100 | $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ | 132 | $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ |
2180 | 101 | $(libmtdev_la_LDFLAGS) $(LDFLAGS) -o $@ | 133 | $(libmtdev_la_LDFLAGS) $(LDFLAGS) -o $@ |
2181 | 134 | AM_V_P = $(am__v_P_@AM_V@) | ||
2182 | 135 | am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) | ||
2183 | 136 | am__v_P_0 = false | ||
2184 | 137 | am__v_P_1 = : | ||
2185 | 138 | AM_V_GEN = $(am__v_GEN_@AM_V@) | ||
2186 | 139 | am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) | ||
2187 | 140 | am__v_GEN_0 = @echo " GEN " $@; | ||
2188 | 141 | am__v_GEN_1 = | ||
2189 | 142 | AM_V_at = $(am__v_at_@AM_V@) | ||
2190 | 143 | am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) | ||
2191 | 144 | am__v_at_0 = @ | ||
2192 | 145 | am__v_at_1 = | ||
2193 | 102 | DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) | 146 | DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) |
2194 | 103 | depcomp = $(SHELL) $(top_srcdir)/config-aux/depcomp | 147 | depcomp = $(SHELL) $(top_srcdir)/config-aux/depcomp |
2195 | 104 | am__depfiles_maybe = depfiles | 148 | am__depfiles_maybe = depfiles |
2196 | 105 | am__mv = mv -f | 149 | am__mv = mv -f |
2197 | 106 | COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ | 150 | COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ |
2198 | 107 | $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) | 151 | $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) |
2202 | 108 | LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ | 152 | LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ |
2203 | 109 | --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ | 153 | $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ |
2204 | 110 | $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) | 154 | $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ |
2205 | 155 | $(AM_CFLAGS) $(CFLAGS) | ||
2206 | 156 | AM_V_CC = $(am__v_CC_@AM_V@) | ||
2207 | 157 | am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) | ||
2208 | 158 | am__v_CC_0 = @echo " CC " $@; | ||
2209 | 159 | am__v_CC_1 = | ||
2210 | 111 | CCLD = $(CC) | 160 | CCLD = $(CC) |
2214 | 112 | LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ | 161 | LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ |
2215 | 113 | --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ | 162 | $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ |
2216 | 114 | $(LDFLAGS) -o $@ | 163 | $(AM_LDFLAGS) $(LDFLAGS) -o $@ |
2217 | 164 | AM_V_CCLD = $(am__v_CCLD_@AM_V@) | ||
2218 | 165 | am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) | ||
2219 | 166 | am__v_CCLD_0 = @echo " CCLD " $@; | ||
2220 | 167 | am__v_CCLD_1 = | ||
2221 | 115 | SOURCES = $(libmtdev_la_SOURCES) | 168 | SOURCES = $(libmtdev_la_SOURCES) |
2222 | 116 | DIST_SOURCES = $(libmtdev_la_SOURCES) | 169 | DIST_SOURCES = $(libmtdev_la_SOURCES) |
2223 | 117 | am__can_run_installinfo = \ | 170 | am__can_run_installinfo = \ |
2224 | @@ -120,11 +173,29 @@ | |||
2225 | 120 | *) (install-info --version) >/dev/null 2>&1;; \ | 173 | *) (install-info --version) >/dev/null 2>&1;; \ |
2226 | 121 | esac | 174 | esac |
2227 | 122 | HEADERS = $(libmtdevinclude_HEADERS) | 175 | HEADERS = $(libmtdevinclude_HEADERS) |
2228 | 176 | am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) | ||
2229 | 177 | # Read a list of newline-separated strings from the standard input, | ||
2230 | 178 | # and print each of them once, without duplicates. Input order is | ||
2231 | 179 | # *not* preserved. | ||
2232 | 180 | am__uniquify_input = $(AWK) '\ | ||
2233 | 181 | BEGIN { nonempty = 0; } \ | ||
2234 | 182 | { items[$$0] = 1; nonempty = 1; } \ | ||
2235 | 183 | END { if (nonempty) { for (i in items) print i; }; } \ | ||
2236 | 184 | ' | ||
2237 | 185 | # Make sure the list of sources is unique. This is necessary because, | ||
2238 | 186 | # e.g., the same source file might be shared among _SOURCES variables | ||
2239 | 187 | # for different programs/libraries. | ||
2240 | 188 | am__define_uniq_tagged_files = \ | ||
2241 | 189 | list='$(am__tagged_files)'; \ | ||
2242 | 190 | unique=`for i in $$list; do \ | ||
2243 | 191 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | ||
2244 | 192 | done | $(am__uniquify_input)` | ||
2245 | 123 | ETAGS = etags | 193 | ETAGS = etags |
2246 | 124 | CTAGS = ctags | 194 | CTAGS = ctags |
2247 | 125 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) | 195 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
2248 | 126 | ACLOCAL = @ACLOCAL@ | 196 | ACLOCAL = @ACLOCAL@ |
2249 | 127 | AMTAR = @AMTAR@ | 197 | AMTAR = @AMTAR@ |
2250 | 198 | AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ | ||
2251 | 128 | AR = @AR@ | 199 | AR = @AR@ |
2252 | 129 | AUTOCONF = @AUTOCONF@ | 200 | AUTOCONF = @AUTOCONF@ |
2253 | 130 | AUTOHEADER = @AUTOHEADER@ | 201 | AUTOHEADER = @AUTOHEADER@ |
2254 | @@ -162,7 +233,6 @@ | |||
2255 | 162 | LIPO = @LIPO@ | 233 | LIPO = @LIPO@ |
2256 | 163 | LN_S = @LN_S@ | 234 | LN_S = @LN_S@ |
2257 | 164 | LTLIBOBJS = @LTLIBOBJS@ | 235 | LTLIBOBJS = @LTLIBOBJS@ |
2258 | 165 | MAINT = @MAINT@ | ||
2259 | 166 | MAKEINFO = @MAKEINFO@ | 236 | MAKEINFO = @MAKEINFO@ |
2260 | 167 | MANIFEST_TOOL = @MANIFEST_TOOL@ | 237 | MANIFEST_TOOL = @MANIFEST_TOOL@ |
2261 | 168 | MKDIR_P = @MKDIR_P@ | 238 | MKDIR_P = @MKDIR_P@ |
2262 | @@ -255,7 +325,7 @@ | |||
2263 | 255 | match_four.c | 325 | match_four.c |
2264 | 256 | 326 | ||
2265 | 257 | AM_CFLAGS = $(CWARNFLAGS) #-DMTDEV_NO_LEGACY_ABI | 327 | AM_CFLAGS = $(CWARNFLAGS) #-DMTDEV_NO_LEGACY_ABI |
2267 | 258 | INCLUDES = -I$(top_srcdir)/include/ | 328 | AM_CPPFLAGS = -I$(top_srcdir)/include/ |
2268 | 259 | libmtdevincludedir = $(includedir) | 329 | libmtdevincludedir = $(includedir) |
2269 | 260 | libmtdevinclude_HEADERS = \ | 330 | libmtdevinclude_HEADERS = \ |
2270 | 261 | $(top_srcdir)/include/mtdev-mapping.h \ | 331 | $(top_srcdir)/include/mtdev-mapping.h \ |
2271 | @@ -266,7 +336,7 @@ | |||
2272 | 266 | 336 | ||
2273 | 267 | .SUFFIXES: | 337 | .SUFFIXES: |
2274 | 268 | .SUFFIXES: .c .lo .o .obj | 338 | .SUFFIXES: .c .lo .o .obj |
2276 | 269 | $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | 339 | $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) |
2277 | 270 | @for dep in $?; do \ | 340 | @for dep in $?; do \ |
2278 | 271 | case '$(am__configure_deps)' in \ | 341 | case '$(am__configure_deps)' in \ |
2279 | 272 | *$$dep*) \ | 342 | *$$dep*) \ |
2280 | @@ -291,11 +361,12 @@ | |||
2281 | 291 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | 361 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) |
2282 | 292 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | 362 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
2283 | 293 | 363 | ||
2285 | 294 | $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | 364 | $(top_srcdir)/configure: $(am__configure_deps) |
2286 | 295 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | 365 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
2288 | 296 | $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | 366 | $(ACLOCAL_M4): $(am__aclocal_m4_deps) |
2289 | 297 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | 367 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
2290 | 298 | $(am__aclocal_m4_deps): | 368 | $(am__aclocal_m4_deps): |
2291 | 369 | |||
2292 | 299 | install-libLTLIBRARIES: $(lib_LTLIBRARIES) | 370 | install-libLTLIBRARIES: $(lib_LTLIBRARIES) |
2293 | 300 | @$(NORMAL_INSTALL) | 371 | @$(NORMAL_INSTALL) |
2294 | 301 | @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ | 372 | @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ |
2295 | @@ -330,8 +401,9 @@ | |||
2296 | 330 | echo rm -f $${locs}; \ | 401 | echo rm -f $${locs}; \ |
2297 | 331 | rm -f $${locs}; \ | 402 | rm -f $${locs}; \ |
2298 | 332 | } | 403 | } |
2299 | 404 | |||
2300 | 333 | libmtdev.la: $(libmtdev_la_OBJECTS) $(libmtdev_la_DEPENDENCIES) $(EXTRA_libmtdev_la_DEPENDENCIES) | 405 | libmtdev.la: $(libmtdev_la_OBJECTS) $(libmtdev_la_DEPENDENCIES) $(EXTRA_libmtdev_la_DEPENDENCIES) |
2302 | 334 | $(libmtdev_la_LINK) -rpath $(libdir) $(libmtdev_la_OBJECTS) $(libmtdev_la_LIBADD) $(LIBS) | 406 | $(AM_V_CCLD)$(libmtdev_la_LINK) -rpath $(libdir) $(libmtdev_la_OBJECTS) $(libmtdev_la_LIBADD) $(LIBS) |
2303 | 335 | 407 | ||
2304 | 336 | mostlyclean-compile: | 408 | mostlyclean-compile: |
2305 | 337 | -rm -f *.$(OBJEXT) | 409 | -rm -f *.$(OBJEXT) |
2306 | @@ -346,25 +418,25 @@ | |||
2307 | 346 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/match_four.Plo@am__quote@ | 418 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/match_four.Plo@am__quote@ |
2308 | 347 | 419 | ||
2309 | 348 | .c.o: | 420 | .c.o: |
2313 | 349 | @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | 421 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< |
2314 | 350 | @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | 422 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po |
2315 | 351 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | 423 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ |
2316 | 352 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | 424 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
2318 | 353 | @am__fastdepCC_FALSE@ $(COMPILE) -c $< | 425 | @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< |
2319 | 354 | 426 | ||
2320 | 355 | .c.obj: | 427 | .c.obj: |
2324 | 356 | @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` | 428 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` |
2325 | 357 | @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | 429 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po |
2326 | 358 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | 430 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ |
2327 | 359 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | 431 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
2329 | 360 | @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` | 432 | @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` |
2330 | 361 | 433 | ||
2331 | 362 | .c.lo: | 434 | .c.lo: |
2335 | 363 | @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | 435 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< |
2336 | 364 | @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | 436 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo |
2337 | 365 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | 437 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ |
2338 | 366 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | 438 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
2340 | 367 | @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< | 439 | @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< |
2341 | 368 | 440 | ||
2342 | 369 | mostlyclean-libtool: | 441 | mostlyclean-libtool: |
2343 | 370 | -rm -f *.lo | 442 | -rm -f *.lo |
2344 | @@ -393,26 +465,15 @@ | |||
2345 | 393 | files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ | 465 | files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ |
2346 | 394 | dir='$(DESTDIR)$(libmtdevincludedir)'; $(am__uninstall_files_from_dir) | 466 | dir='$(DESTDIR)$(libmtdevincludedir)'; $(am__uninstall_files_from_dir) |
2347 | 395 | 467 | ||
2357 | 396 | ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) | 468 | ID: $(am__tagged_files) |
2358 | 397 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | 469 | $(am__define_uniq_tagged_files); mkid -fID $$unique |
2359 | 398 | unique=`for i in $$list; do \ | 470 | tags: tags-am |
2360 | 399 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | 471 | TAGS: tags |
2352 | 400 | done | \ | ||
2353 | 401 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
2354 | 402 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
2355 | 403 | mkid -fID $$unique | ||
2356 | 404 | tags: TAGS | ||
2361 | 405 | 472 | ||
2364 | 406 | TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | 473 | tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) |
2363 | 407 | $(TAGS_FILES) $(LISP) | ||
2365 | 408 | set x; \ | 474 | set x; \ |
2366 | 409 | here=`pwd`; \ | 475 | here=`pwd`; \ |
2373 | 410 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | 476 | $(am__define_uniq_tagged_files); \ |
2368 | 411 | unique=`for i in $$list; do \ | ||
2369 | 412 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | ||
2370 | 413 | done | \ | ||
2371 | 414 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
2372 | 415 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
2374 | 416 | shift; \ | 477 | shift; \ |
2375 | 417 | if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ | 478 | if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ |
2376 | 418 | test -n "$$unique" || unique=$$empty_fix; \ | 479 | test -n "$$unique" || unique=$$empty_fix; \ |
2377 | @@ -424,15 +485,11 @@ | |||
2378 | 424 | $$unique; \ | 485 | $$unique; \ |
2379 | 425 | fi; \ | 486 | fi; \ |
2380 | 426 | fi | 487 | fi |
2390 | 427 | ctags: CTAGS | 488 | ctags: ctags-am |
2391 | 428 | CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | 489 | |
2392 | 429 | $(TAGS_FILES) $(LISP) | 490 | CTAGS: ctags |
2393 | 430 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | 491 | ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) |
2394 | 431 | unique=`for i in $$list; do \ | 492 | $(am__define_uniq_tagged_files); \ |
2386 | 432 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | ||
2387 | 433 | done | \ | ||
2388 | 434 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
2389 | 435 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
2395 | 436 | test -z "$(CTAGS_ARGS)$$unique" \ | 493 | test -z "$(CTAGS_ARGS)$$unique" \ |
2396 | 437 | || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ | 494 | || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ |
2397 | 438 | $$unique | 495 | $$unique |
2398 | @@ -441,9 +498,10 @@ | |||
2399 | 441 | here=`$(am__cd) $(top_builddir) && pwd` \ | 498 | here=`$(am__cd) $(top_builddir) && pwd` \ |
2400 | 442 | && $(am__cd) $(top_srcdir) \ | 499 | && $(am__cd) $(top_srcdir) \ |
2401 | 443 | && gtags -i $(GTAGS_ARGS) "$$here" | 500 | && gtags -i $(GTAGS_ARGS) "$$here" |
2402 | 501 | cscopelist: cscopelist-am | ||
2403 | 444 | 502 | ||
2406 | 445 | cscopelist: $(HEADERS) $(SOURCES) $(LISP) | 503 | cscopelist-am: $(am__tagged_files) |
2407 | 446 | list='$(SOURCES) $(HEADERS) $(LISP)'; \ | 504 | list='$(am__tagged_files)'; \ |
2408 | 447 | case "$(srcdir)" in \ | 505 | case "$(srcdir)" in \ |
2409 | 448 | [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ | 506 | [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ |
2410 | 449 | *) sdir=$(subdir)/$(srcdir) ;; \ | 507 | *) sdir=$(subdir)/$(srcdir) ;; \ |
2411 | @@ -600,20 +658,20 @@ | |||
2412 | 600 | 658 | ||
2413 | 601 | .MAKE: install-am install-strip | 659 | .MAKE: install-am install-strip |
2414 | 602 | 660 | ||
2429 | 603 | .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ | 661 | .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ |
2430 | 604 | clean-libLTLIBRARIES clean-libtool cscopelist ctags distclean \ | 662 | clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \ |
2431 | 605 | distclean-compile distclean-generic distclean-libtool \ | 663 | ctags-am distclean distclean-compile distclean-generic \ |
2432 | 606 | distclean-tags distdir dvi dvi-am html html-am info info-am \ | 664 | distclean-libtool distclean-tags distdir dvi dvi-am html \ |
2433 | 607 | install install-am install-data install-data-am install-dvi \ | 665 | html-am info info-am install install-am install-data \ |
2434 | 608 | install-dvi-am install-exec install-exec-am install-html \ | 666 | install-data-am install-dvi install-dvi-am install-exec \ |
2435 | 609 | install-html-am install-info install-info-am \ | 667 | install-exec-am install-html install-html-am install-info \ |
2436 | 610 | install-libLTLIBRARIES install-libmtdevincludeHEADERS \ | 668 | install-info-am install-libLTLIBRARIES \ |
2437 | 611 | install-man install-pdf install-pdf-am install-ps \ | 669 | install-libmtdevincludeHEADERS install-man install-pdf \ |
2438 | 612 | install-ps-am install-strip installcheck installcheck-am \ | 670 | install-pdf-am install-ps install-ps-am install-strip \ |
2439 | 613 | installdirs maintainer-clean maintainer-clean-generic \ | 671 | installcheck installcheck-am installdirs maintainer-clean \ |
2440 | 614 | mostlyclean mostlyclean-compile mostlyclean-generic \ | 672 | maintainer-clean-generic mostlyclean mostlyclean-compile \ |
2441 | 615 | mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ | 673 | mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ |
2442 | 616 | uninstall-am uninstall-libLTLIBRARIES \ | 674 | tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES \ |
2443 | 617 | uninstall-libmtdevincludeHEADERS | 675 | uninstall-libmtdevincludeHEADERS |
2444 | 618 | 676 | ||
2445 | 619 | 677 | ||
2446 | 620 | 678 | ||
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 | 61 | return NULL; | 61 | return NULL; |
2452 | 62 | 62 | ||
2453 | 63 | ix = mtdev_abs2mt(code); | 63 | ix = mtdev_abs2mt(code); |
2455 | 64 | if (ix < 11) | 64 | if (ix < LEGACY_API_NUM_MT_AXES) |
2456 | 65 | return &dev->abs[ix]; | 65 | return &dev->abs[ix]; |
2457 | 66 | else | 66 | else |
2459 | 67 | return &dev->state->ext_abs[ix - 11]; | 67 | return &dev->state->ext_abs[ix - LEGACY_API_NUM_MT_AXES]; |
2460 | 68 | } | 68 | } |
2461 | 69 | 69 | ||
2462 | 70 | static void set_info(struct mtdev *dev, int code, | 70 | static void set_info(struct mtdev *dev, int code, |
2463 | @@ -156,10 +156,10 @@ | |||
2464 | 156 | return 0; | 156 | return 0; |
2465 | 157 | 157 | ||
2466 | 158 | ix = mtdev_abs2mt(code); | 158 | ix = mtdev_abs2mt(code); |
2468 | 159 | if (ix < 11) | 159 | if (ix < LEGACY_API_NUM_MT_AXES) |
2469 | 160 | return dev->has_abs[ix]; | 160 | return dev->has_abs[ix]; |
2470 | 161 | else | 161 | else |
2472 | 162 | return dev->state->has_ext_abs[ix - 11]; | 162 | return dev->state->has_ext_abs[ix - LEGACY_API_NUM_MT_AXES]; |
2473 | 163 | } | 163 | } |
2474 | 164 | 164 | ||
2475 | 165 | int mtdev_get_abs_minimum(const struct mtdev *dev, int code) | 165 | int mtdev_get_abs_minimum(const struct mtdev *dev, int code) |
2476 | @@ -203,10 +203,10 @@ | |||
2477 | 203 | return; | 203 | return; |
2478 | 204 | 204 | ||
2479 | 205 | ix = mtdev_abs2mt(code); | 205 | ix = mtdev_abs2mt(code); |
2481 | 206 | if (ix < 11) | 206 | if (ix < LEGACY_API_NUM_MT_AXES) |
2482 | 207 | dev->has_abs[ix] = value; | 207 | dev->has_abs[ix] = value; |
2483 | 208 | else | 208 | else |
2485 | 209 | dev->state->has_ext_abs[ix - 11] = value; | 209 | dev->state->has_ext_abs[ix - LEGACY_API_NUM_MT_AXES] = value; |
2486 | 210 | } | 210 | } |
2487 | 211 | 211 | ||
2488 | 212 | void mtdev_set_abs_maximum(struct mtdev *dev, int code, int value) | 212 | void mtdev_set_abs_maximum(struct mtdev *dev, int code, int value) |
2489 | 213 | 213 | ||
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 | 87 | /* robust system ioctl calls */ | 87 | /* robust system ioctl calls */ |
2495 | 88 | #define SYSCALL(call) while (((call) == -1) && (errno == EINTR)) | 88 | #define SYSCALL(call) while (((call) == -1) && (errno == EINTR)) |
2496 | 89 | 89 | ||
2497 | 90 | /* To be compatible to the original, non-opaque mtdev API, we can only use 11 | ||
2498 | 91 | * axes in the basic struct. Everything else is hidden in the state, see the | ||
2499 | 92 | * use of dev->abs[idx] vs dev->state->ext_abs[idx] | ||
2500 | 93 | * | ||
2501 | 94 | * See MT_ABS_SIZE in include/mtdev.h | ||
2502 | 95 | */ | ||
2503 | 96 | #define LEGACY_API_NUM_MT_AXES 11 | ||
2504 | 97 | |||
2505 | 90 | /** | 98 | /** |
2506 | 91 | * struct mtdev - represents an input MT device | 99 | * struct mtdev - represents an input MT device |
2507 | 92 | * @has_mtdata: true if the device has MT capabilities | 100 | * @has_mtdata: true if the device has MT capabilities |
2508 | @@ -105,9 +113,9 @@ | |||
2509 | 105 | struct mtdev { | 113 | struct mtdev { |
2510 | 106 | int has_mtdata; | 114 | int has_mtdata; |
2511 | 107 | int has_slot; | 115 | int has_slot; |
2513 | 108 | int has_abs[11]; | 116 | int has_abs[LEGACY_API_NUM_MT_AXES]; |
2514 | 109 | struct input_absinfo slot; | 117 | struct input_absinfo slot; |
2516 | 110 | struct input_absinfo abs[11]; | 118 | struct input_absinfo abs[LEGACY_API_NUM_MT_AXES]; |
2517 | 111 | struct mtdev_state *state; | 119 | struct mtdev_state *state; |
2518 | 112 | }; | 120 | }; |
2519 | 113 | 121 | ||
2520 | 114 | 122 | ||
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 | 1 | #include "match.h" | 1 | #include "match.h" |
2526 | 2 | #include <limits.h> | 2 | #include <limits.h> |
2527 | 3 | #include <stdlib.h> | ||
2528 | 3 | 4 | ||
2529 | 4 | typedef unsigned char u8; | 5 | typedef unsigned char u8; |
2530 | 5 | typedef unsigned int u32; | 6 | typedef unsigned int u32; |
2531 | 6 | 7 | ||
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 | 72 | */ | 72 | */ |
2537 | 73 | struct mtdev_state { | 73 | struct mtdev_state { |
2538 | 74 | 74 | ||
2541 | 75 | int has_ext_abs[MT_ABS_SIZE - 11]; | 75 | int has_ext_abs[MT_ABS_SIZE - LEGACY_API_NUM_MT_AXES]; |
2542 | 76 | struct input_absinfo ext_abs[MT_ABS_SIZE - 11]; | 76 | struct input_absinfo ext_abs[MT_ABS_SIZE - LEGACY_API_NUM_MT_AXES]; |
2543 | 77 | 77 | ||
2544 | 78 | struct mtdev_iobuf iobuf; | 78 | struct mtdev_iobuf iobuf; |
2545 | 79 | struct mtdev_evbuf inbuf; | 79 | struct mtdev_evbuf inbuf; |
2546 | 80 | 80 | ||
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 | 1 | noinst_PROGRAMS = mtdev-mapgen mtdev-matching mtdev-kernel | 1 | noinst_PROGRAMS = mtdev-mapgen mtdev-matching mtdev-kernel |
2552 | 2 | bin_PROGRAMS = mtdev-test | 2 | bin_PROGRAMS = mtdev-test |
2553 | 3 | 3 | ||
2555 | 4 | INCLUDES=-I$(top_srcdir)/include/ | 4 | AM_CPPFLAGS=-I$(top_srcdir)/include/ |
2556 | 5 | 5 | ||
2557 | 6 | mtdev_mapgen_SOURCES = mtdev-mapgen.c | 6 | mtdev_mapgen_SOURCES = mtdev-mapgen.c |
2558 | 7 | 7 | ||
2559 | 8 | 8 | ||
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 @@ | |||
2565 | 1 | # Makefile.in generated by automake 1.12.3 from Makefile.am. | 1 | # Makefile.in generated by automake 1.14 from Makefile.am. |
2566 | 2 | # @configure_input@ | 2 | # @configure_input@ |
2567 | 3 | 3 | ||
2569 | 4 | # Copyright (C) 1994-2012 Free Software Foundation, Inc. | 4 | # Copyright (C) 1994-2013 Free Software Foundation, Inc. |
2570 | 5 | 5 | ||
2571 | 6 | # This Makefile.in is free software; the Free Software Foundation | 6 | # This Makefile.in is free software; the Free Software Foundation |
2572 | 7 | # gives unlimited permission to copy and/or distribute it, | 7 | # gives unlimited permission to copy and/or distribute it, |
2573 | @@ -15,23 +15,51 @@ | |||
2574 | 15 | @SET_MAKE@ | 15 | @SET_MAKE@ |
2575 | 16 | 16 | ||
2576 | 17 | VPATH = @srcdir@ | 17 | VPATH = @srcdir@ |
2580 | 18 | am__make_dryrun = \ | 18 | am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' |
2581 | 19 | { \ | 19 | am__make_running_with_option = \ |
2582 | 20 | am__dry=no; \ | 20 | case $${target_option-} in \ |
2583 | 21 | ?) ;; \ | ||
2584 | 22 | *) echo "am__make_running_with_option: internal error: invalid" \ | ||
2585 | 23 | "target option '$${target_option-}' specified" >&2; \ | ||
2586 | 24 | exit 1;; \ | ||
2587 | 25 | esac; \ | ||
2588 | 26 | has_opt=no; \ | ||
2589 | 27 | sane_makeflags=$$MAKEFLAGS; \ | ||
2590 | 28 | if $(am__is_gnu_make); then \ | ||
2591 | 29 | sane_makeflags=$$MFLAGS; \ | ||
2592 | 30 | else \ | ||
2593 | 21 | case $$MAKEFLAGS in \ | 31 | case $$MAKEFLAGS in \ |
2594 | 22 | *\\[\ \ ]*) \ | 32 | *\\[\ \ ]*) \ |
2607 | 23 | echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ | 33 | bs=\\; \ |
2608 | 24 | | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ | 34 | sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ |
2609 | 25 | *) \ | 35 | | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ |
2610 | 26 | for am__flg in $$MAKEFLAGS; do \ | 36 | esac; \ |
2611 | 27 | case $$am__flg in \ | 37 | fi; \ |
2612 | 28 | *=*|--*) ;; \ | 38 | skip_next=no; \ |
2613 | 29 | *n*) am__dry=yes; break;; \ | 39 | strip_trailopt () \ |
2614 | 30 | esac; \ | 40 | { \ |
2615 | 31 | done;; \ | 41 | flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ |
2616 | 32 | esac; \ | 42 | }; \ |
2617 | 33 | test $$am__dry = yes; \ | 43 | for flg in $$sane_makeflags; do \ |
2618 | 34 | } | 44 | test $$skip_next = yes && { skip_next=no; continue; }; \ |
2619 | 45 | case $$flg in \ | ||
2620 | 46 | *=*|--*) continue;; \ | ||
2621 | 47 | -*I) strip_trailopt 'I'; skip_next=yes;; \ | ||
2622 | 48 | -*I?*) strip_trailopt 'I';; \ | ||
2623 | 49 | -*O) strip_trailopt 'O'; skip_next=yes;; \ | ||
2624 | 50 | -*O?*) strip_trailopt 'O';; \ | ||
2625 | 51 | -*l) strip_trailopt 'l'; skip_next=yes;; \ | ||
2626 | 52 | -*l?*) strip_trailopt 'l';; \ | ||
2627 | 53 | -[dEDm]) skip_next=yes;; \ | ||
2628 | 54 | -[JT]) skip_next=yes;; \ | ||
2629 | 55 | esac; \ | ||
2630 | 56 | case $$flg in \ | ||
2631 | 57 | *$$target_option*) has_opt=yes; break;; \ | ||
2632 | 58 | esac; \ | ||
2633 | 59 | done; \ | ||
2634 | 60 | test $$has_opt = yes | ||
2635 | 61 | am__make_dryrun = (target_option=n; $(am__make_running_with_option)) | ||
2636 | 62 | am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) | ||
2637 | 35 | pkgdatadir = $(datadir)/@PACKAGE@ | 63 | pkgdatadir = $(datadir)/@PACKAGE@ |
2638 | 36 | pkgincludedir = $(includedir)/@PACKAGE@ | 64 | pkgincludedir = $(includedir)/@PACKAGE@ |
2639 | 37 | pkglibdir = $(libdir)/@PACKAGE@ | 65 | pkglibdir = $(libdir)/@PACKAGE@ |
2640 | @@ -54,7 +82,7 @@ | |||
2641 | 54 | mtdev-kernel$(EXEEXT) | 82 | mtdev-kernel$(EXEEXT) |
2642 | 55 | bin_PROGRAMS = mtdev-test$(EXEEXT) | 83 | bin_PROGRAMS = mtdev-test$(EXEEXT) |
2643 | 56 | subdir = test | 84 | subdir = test |
2645 | 57 | DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ | 85 | DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ |
2646 | 58 | $(top_srcdir)/config-aux/depcomp | 86 | $(top_srcdir)/config-aux/depcomp |
2647 | 59 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | 87 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
2648 | 60 | am__aclocal_m4_deps = $(top_srcdir)/configure.ac | 88 | am__aclocal_m4_deps = $(top_srcdir)/configure.ac |
2649 | @@ -69,7 +97,11 @@ | |||
2650 | 69 | am_mtdev_kernel_OBJECTS = mtdev-kernel.$(OBJEXT) | 97 | am_mtdev_kernel_OBJECTS = mtdev-kernel.$(OBJEXT) |
2651 | 70 | mtdev_kernel_OBJECTS = $(am_mtdev_kernel_OBJECTS) | 98 | mtdev_kernel_OBJECTS = $(am_mtdev_kernel_OBJECTS) |
2652 | 71 | mtdev_kernel_LDADD = $(LDADD) | 99 | mtdev_kernel_LDADD = $(LDADD) |
2654 | 72 | mtdev_kernel_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ | 100 | AM_V_lt = $(am__v_lt_@AM_V@) |
2655 | 101 | am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) | ||
2656 | 102 | am__v_lt_0 = --silent | ||
2657 | 103 | am__v_lt_1 = | ||
2658 | 104 | mtdev_kernel_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ | ||
2659 | 73 | $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ | 105 | $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ |
2660 | 74 | $(mtdev_kernel_LDFLAGS) $(LDFLAGS) -o $@ | 106 | $(mtdev_kernel_LDFLAGS) $(LDFLAGS) -o $@ |
2661 | 75 | am_mtdev_mapgen_OBJECTS = mtdev-mapgen.$(OBJEXT) | 107 | am_mtdev_mapgen_OBJECTS = mtdev-mapgen.$(OBJEXT) |
2662 | @@ -78,28 +110,50 @@ | |||
2663 | 78 | am_mtdev_matching_OBJECTS = mtdev-matching.$(OBJEXT) | 110 | am_mtdev_matching_OBJECTS = mtdev-matching.$(OBJEXT) |
2664 | 79 | mtdev_matching_OBJECTS = $(am_mtdev_matching_OBJECTS) | 111 | mtdev_matching_OBJECTS = $(am_mtdev_matching_OBJECTS) |
2665 | 80 | mtdev_matching_LDADD = $(LDADD) | 112 | mtdev_matching_LDADD = $(LDADD) |
2669 | 81 | mtdev_matching_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ | 113 | mtdev_matching_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ |
2670 | 82 | $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ | 114 | $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ |
2671 | 83 | $(mtdev_matching_LDFLAGS) $(LDFLAGS) -o $@ | 115 | $(AM_CFLAGS) $(CFLAGS) $(mtdev_matching_LDFLAGS) $(LDFLAGS) -o \ |
2672 | 116 | $@ | ||
2673 | 84 | am_mtdev_test_OBJECTS = mtdev-test.$(OBJEXT) | 117 | am_mtdev_test_OBJECTS = mtdev-test.$(OBJEXT) |
2674 | 85 | mtdev_test_OBJECTS = $(am_mtdev_test_OBJECTS) | 118 | mtdev_test_OBJECTS = $(am_mtdev_test_OBJECTS) |
2675 | 86 | mtdev_test_LDADD = $(LDADD) | 119 | mtdev_test_LDADD = $(LDADD) |
2677 | 87 | mtdev_test_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ | 120 | mtdev_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ |
2678 | 88 | $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ | 121 | $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ |
2679 | 89 | $(mtdev_test_LDFLAGS) $(LDFLAGS) -o $@ | 122 | $(mtdev_test_LDFLAGS) $(LDFLAGS) -o $@ |
2680 | 123 | AM_V_P = $(am__v_P_@AM_V@) | ||
2681 | 124 | am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) | ||
2682 | 125 | am__v_P_0 = false | ||
2683 | 126 | am__v_P_1 = : | ||
2684 | 127 | AM_V_GEN = $(am__v_GEN_@AM_V@) | ||
2685 | 128 | am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) | ||
2686 | 129 | am__v_GEN_0 = @echo " GEN " $@; | ||
2687 | 130 | am__v_GEN_1 = | ||
2688 | 131 | AM_V_at = $(am__v_at_@AM_V@) | ||
2689 | 132 | am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) | ||
2690 | 133 | am__v_at_0 = @ | ||
2691 | 134 | am__v_at_1 = | ||
2692 | 90 | DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) | 135 | DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) |
2693 | 91 | depcomp = $(SHELL) $(top_srcdir)/config-aux/depcomp | 136 | depcomp = $(SHELL) $(top_srcdir)/config-aux/depcomp |
2694 | 92 | am__depfiles_maybe = depfiles | 137 | am__depfiles_maybe = depfiles |
2695 | 93 | am__mv = mv -f | 138 | am__mv = mv -f |
2696 | 94 | COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ | 139 | COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ |
2697 | 95 | $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) | 140 | $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) |
2701 | 96 | LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ | 141 | LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ |
2702 | 97 | --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ | 142 | $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ |
2703 | 98 | $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) | 143 | $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ |
2704 | 144 | $(AM_CFLAGS) $(CFLAGS) | ||
2705 | 145 | AM_V_CC = $(am__v_CC_@AM_V@) | ||
2706 | 146 | am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) | ||
2707 | 147 | am__v_CC_0 = @echo " CC " $@; | ||
2708 | 148 | am__v_CC_1 = | ||
2709 | 99 | CCLD = $(CC) | 149 | CCLD = $(CC) |
2713 | 100 | LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ | 150 | LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ |
2714 | 101 | --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ | 151 | $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ |
2715 | 102 | $(LDFLAGS) -o $@ | 152 | $(AM_LDFLAGS) $(LDFLAGS) -o $@ |
2716 | 153 | AM_V_CCLD = $(am__v_CCLD_@AM_V@) | ||
2717 | 154 | am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) | ||
2718 | 155 | am__v_CCLD_0 = @echo " CCLD " $@; | ||
2719 | 156 | am__v_CCLD_1 = | ||
2720 | 103 | SOURCES = $(mtdev_kernel_SOURCES) $(mtdev_mapgen_SOURCES) \ | 157 | SOURCES = $(mtdev_kernel_SOURCES) $(mtdev_mapgen_SOURCES) \ |
2721 | 104 | $(mtdev_matching_SOURCES) $(mtdev_test_SOURCES) | 158 | $(mtdev_matching_SOURCES) $(mtdev_test_SOURCES) |
2722 | 105 | DIST_SOURCES = $(mtdev_kernel_SOURCES) $(mtdev_mapgen_SOURCES) \ | 159 | DIST_SOURCES = $(mtdev_kernel_SOURCES) $(mtdev_mapgen_SOURCES) \ |
2723 | @@ -109,11 +163,29 @@ | |||
2724 | 109 | n|no|NO) false;; \ | 163 | n|no|NO) false;; \ |
2725 | 110 | *) (install-info --version) >/dev/null 2>&1;; \ | 164 | *) (install-info --version) >/dev/null 2>&1;; \ |
2726 | 111 | esac | 165 | esac |
2727 | 166 | am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) | ||
2728 | 167 | # Read a list of newline-separated strings from the standard input, | ||
2729 | 168 | # and print each of them once, without duplicates. Input order is | ||
2730 | 169 | # *not* preserved. | ||
2731 | 170 | am__uniquify_input = $(AWK) '\ | ||
2732 | 171 | BEGIN { nonempty = 0; } \ | ||
2733 | 172 | { items[$$0] = 1; nonempty = 1; } \ | ||
2734 | 173 | END { if (nonempty) { for (i in items) print i; }; } \ | ||
2735 | 174 | ' | ||
2736 | 175 | # Make sure the list of sources is unique. This is necessary because, | ||
2737 | 176 | # e.g., the same source file might be shared among _SOURCES variables | ||
2738 | 177 | # for different programs/libraries. | ||
2739 | 178 | am__define_uniq_tagged_files = \ | ||
2740 | 179 | list='$(am__tagged_files)'; \ | ||
2741 | 180 | unique=`for i in $$list; do \ | ||
2742 | 181 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | ||
2743 | 182 | done | $(am__uniquify_input)` | ||
2744 | 112 | ETAGS = etags | 183 | ETAGS = etags |
2745 | 113 | CTAGS = ctags | 184 | CTAGS = ctags |
2746 | 114 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) | 185 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
2747 | 115 | ACLOCAL = @ACLOCAL@ | 186 | ACLOCAL = @ACLOCAL@ |
2748 | 116 | AMTAR = @AMTAR@ | 187 | AMTAR = @AMTAR@ |
2749 | 188 | AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ | ||
2750 | 117 | AR = @AR@ | 189 | AR = @AR@ |
2751 | 118 | AUTOCONF = @AUTOCONF@ | 190 | AUTOCONF = @AUTOCONF@ |
2752 | 119 | AUTOHEADER = @AUTOHEADER@ | 191 | AUTOHEADER = @AUTOHEADER@ |
2753 | @@ -151,7 +223,6 @@ | |||
2754 | 151 | LIPO = @LIPO@ | 223 | LIPO = @LIPO@ |
2755 | 152 | LN_S = @LN_S@ | 224 | LN_S = @LN_S@ |
2756 | 153 | LTLIBOBJS = @LTLIBOBJS@ | 225 | LTLIBOBJS = @LTLIBOBJS@ |
2757 | 154 | MAINT = @MAINT@ | ||
2758 | 155 | MAKEINFO = @MAKEINFO@ | 226 | MAKEINFO = @MAKEINFO@ |
2759 | 156 | MANIFEST_TOOL = @MANIFEST_TOOL@ | 227 | MANIFEST_TOOL = @MANIFEST_TOOL@ |
2760 | 157 | MKDIR_P = @MKDIR_P@ | 228 | MKDIR_P = @MKDIR_P@ |
2761 | @@ -227,7 +298,7 @@ | |||
2762 | 227 | top_build_prefix = @top_build_prefix@ | 298 | top_build_prefix = @top_build_prefix@ |
2763 | 228 | top_builddir = @top_builddir@ | 299 | top_builddir = @top_builddir@ |
2764 | 229 | top_srcdir = @top_srcdir@ | 300 | top_srcdir = @top_srcdir@ |
2766 | 230 | INCLUDES = -I$(top_srcdir)/include/ | 301 | AM_CPPFLAGS = -I$(top_srcdir)/include/ |
2767 | 231 | mtdev_mapgen_SOURCES = mtdev-mapgen.c | 302 | mtdev_mapgen_SOURCES = mtdev-mapgen.c |
2768 | 232 | mtdev_matching_SOURCES = mtdev-matching.c | 303 | mtdev_matching_SOURCES = mtdev-matching.c |
2769 | 233 | mtdev_matching_LDFLAGS = -L$(top_builddir)/src/.libs/ -lmtdev | 304 | mtdev_matching_LDFLAGS = -L$(top_builddir)/src/.libs/ -lmtdev |
2770 | @@ -239,7 +310,7 @@ | |||
2771 | 239 | 310 | ||
2772 | 240 | .SUFFIXES: | 311 | .SUFFIXES: |
2773 | 241 | .SUFFIXES: .c .lo .o .obj | 312 | .SUFFIXES: .c .lo .o .obj |
2775 | 242 | $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) | 313 | $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) |
2776 | 243 | @for dep in $?; do \ | 314 | @for dep in $?; do \ |
2777 | 244 | case '$(am__configure_deps)' in \ | 315 | case '$(am__configure_deps)' in \ |
2778 | 245 | *$$dep*) \ | 316 | *$$dep*) \ |
2779 | @@ -264,9 +335,9 @@ | |||
2780 | 264 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) | 335 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) |
2781 | 265 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | 336 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
2782 | 266 | 337 | ||
2784 | 267 | $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) | 338 | $(top_srcdir)/configure: $(am__configure_deps) |
2785 | 268 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | 339 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
2787 | 269 | $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) | 340 | $(ACLOCAL_M4): $(am__aclocal_m4_deps) |
2788 | 270 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh | 341 | cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh |
2789 | 271 | $(am__aclocal_m4_deps): | 342 | $(am__aclocal_m4_deps): |
2790 | 272 | install-binPROGRAMS: $(bin_PROGRAMS) | 343 | install-binPROGRAMS: $(bin_PROGRAMS) |
2791 | @@ -278,10 +349,12 @@ | |||
2792 | 278 | fi; \ | 349 | fi; \ |
2793 | 279 | for p in $$list; do echo "$$p $$p"; done | \ | 350 | for p in $$list; do echo "$$p $$p"; done | \ |
2794 | 280 | sed 's/$(EXEEXT)$$//' | \ | 351 | sed 's/$(EXEEXT)$$//' | \ |
2797 | 281 | while read p p1; do if test -f $$p || test -f $$p1; \ | 352 | while read p p1; do if test -f $$p \ |
2798 | 282 | then echo "$$p"; echo "$$p"; else :; fi; \ | 353 | || test -f $$p1 \ |
2799 | 354 | ; then echo "$$p"; echo "$$p"; else :; fi; \ | ||
2800 | 283 | done | \ | 355 | done | \ |
2802 | 284 | sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ | 356 | sed -e 'p;s,.*/,,;n;h' \ |
2803 | 357 | -e 's|.*|.|' \ | ||
2804 | 285 | -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ | 358 | -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ |
2805 | 286 | sed 'N;N;N;s,\n, ,g' | \ | 359 | sed 'N;N;N;s,\n, ,g' | \ |
2806 | 287 | $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ | 360 | $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ |
2807 | @@ -302,7 +375,8 @@ | |||
2808 | 302 | @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ | 375 | @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ |
2809 | 303 | files=`for p in $$list; do echo "$$p"; done | \ | 376 | files=`for p in $$list; do echo "$$p"; done | \ |
2810 | 304 | sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ | 377 | sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ |
2812 | 305 | -e 's/$$/$(EXEEXT)/' `; \ | 378 | -e 's/$$/$(EXEEXT)/' \ |
2813 | 379 | `; \ | ||
2814 | 306 | test -n "$$list" || exit 0; \ | 380 | test -n "$$list" || exit 0; \ |
2815 | 307 | echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ | 381 | echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ |
2816 | 308 | cd "$(DESTDIR)$(bindir)" && rm -f $$files | 382 | cd "$(DESTDIR)$(bindir)" && rm -f $$files |
2817 | @@ -324,18 +398,22 @@ | |||
2818 | 324 | list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ | 398 | list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ |
2819 | 325 | echo " rm -f" $$list; \ | 399 | echo " rm -f" $$list; \ |
2820 | 326 | rm -f $$list | 400 | rm -f $$list |
2821 | 401 | |||
2822 | 327 | mtdev-kernel$(EXEEXT): $(mtdev_kernel_OBJECTS) $(mtdev_kernel_DEPENDENCIES) $(EXTRA_mtdev_kernel_DEPENDENCIES) | 402 | mtdev-kernel$(EXEEXT): $(mtdev_kernel_OBJECTS) $(mtdev_kernel_DEPENDENCIES) $(EXTRA_mtdev_kernel_DEPENDENCIES) |
2823 | 328 | @rm -f mtdev-kernel$(EXEEXT) | 403 | @rm -f mtdev-kernel$(EXEEXT) |
2825 | 329 | $(mtdev_kernel_LINK) $(mtdev_kernel_OBJECTS) $(mtdev_kernel_LDADD) $(LIBS) | 404 | $(AM_V_CCLD)$(mtdev_kernel_LINK) $(mtdev_kernel_OBJECTS) $(mtdev_kernel_LDADD) $(LIBS) |
2826 | 405 | |||
2827 | 330 | mtdev-mapgen$(EXEEXT): $(mtdev_mapgen_OBJECTS) $(mtdev_mapgen_DEPENDENCIES) $(EXTRA_mtdev_mapgen_DEPENDENCIES) | 406 | mtdev-mapgen$(EXEEXT): $(mtdev_mapgen_OBJECTS) $(mtdev_mapgen_DEPENDENCIES) $(EXTRA_mtdev_mapgen_DEPENDENCIES) |
2828 | 331 | @rm -f mtdev-mapgen$(EXEEXT) | 407 | @rm -f mtdev-mapgen$(EXEEXT) |
2830 | 332 | $(LINK) $(mtdev_mapgen_OBJECTS) $(mtdev_mapgen_LDADD) $(LIBS) | 408 | $(AM_V_CCLD)$(LINK) $(mtdev_mapgen_OBJECTS) $(mtdev_mapgen_LDADD) $(LIBS) |
2831 | 409 | |||
2832 | 333 | mtdev-matching$(EXEEXT): $(mtdev_matching_OBJECTS) $(mtdev_matching_DEPENDENCIES) $(EXTRA_mtdev_matching_DEPENDENCIES) | 410 | mtdev-matching$(EXEEXT): $(mtdev_matching_OBJECTS) $(mtdev_matching_DEPENDENCIES) $(EXTRA_mtdev_matching_DEPENDENCIES) |
2833 | 334 | @rm -f mtdev-matching$(EXEEXT) | 411 | @rm -f mtdev-matching$(EXEEXT) |
2835 | 335 | $(mtdev_matching_LINK) $(mtdev_matching_OBJECTS) $(mtdev_matching_LDADD) $(LIBS) | 412 | $(AM_V_CCLD)$(mtdev_matching_LINK) $(mtdev_matching_OBJECTS) $(mtdev_matching_LDADD) $(LIBS) |
2836 | 413 | |||
2837 | 336 | mtdev-test$(EXEEXT): $(mtdev_test_OBJECTS) $(mtdev_test_DEPENDENCIES) $(EXTRA_mtdev_test_DEPENDENCIES) | 414 | mtdev-test$(EXEEXT): $(mtdev_test_OBJECTS) $(mtdev_test_DEPENDENCIES) $(EXTRA_mtdev_test_DEPENDENCIES) |
2838 | 337 | @rm -f mtdev-test$(EXEEXT) | 415 | @rm -f mtdev-test$(EXEEXT) |
2840 | 338 | $(mtdev_test_LINK) $(mtdev_test_OBJECTS) $(mtdev_test_LDADD) $(LIBS) | 416 | $(AM_V_CCLD)$(mtdev_test_LINK) $(mtdev_test_OBJECTS) $(mtdev_test_LDADD) $(LIBS) |
2841 | 339 | 417 | ||
2842 | 340 | mostlyclean-compile: | 418 | mostlyclean-compile: |
2843 | 341 | -rm -f *.$(OBJEXT) | 419 | -rm -f *.$(OBJEXT) |
2844 | @@ -349,25 +427,25 @@ | |||
2845 | 349 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mtdev-test.Po@am__quote@ | 427 | @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mtdev-test.Po@am__quote@ |
2846 | 350 | 428 | ||
2847 | 351 | .c.o: | 429 | .c.o: |
2851 | 352 | @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | 430 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< |
2852 | 353 | @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | 431 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po |
2853 | 354 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | 432 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ |
2854 | 355 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | 433 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
2856 | 356 | @am__fastdepCC_FALSE@ $(COMPILE) -c $< | 434 | @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< |
2857 | 357 | 435 | ||
2858 | 358 | .c.obj: | 436 | .c.obj: |
2862 | 359 | @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` | 437 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` |
2863 | 360 | @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po | 438 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po |
2864 | 361 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ | 439 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ |
2865 | 362 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | 440 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
2867 | 363 | @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` | 441 | @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` |
2868 | 364 | 442 | ||
2869 | 365 | .c.lo: | 443 | .c.lo: |
2873 | 366 | @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< | 444 | @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< |
2874 | 367 | @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo | 445 | @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo |
2875 | 368 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ | 446 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ |
2876 | 369 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ | 447 | @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ |
2878 | 370 | @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< | 448 | @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< |
2879 | 371 | 449 | ||
2880 | 372 | mostlyclean-libtool: | 450 | mostlyclean-libtool: |
2881 | 373 | -rm -f *.lo | 451 | -rm -f *.lo |
2882 | @@ -375,26 +453,15 @@ | |||
2883 | 375 | clean-libtool: | 453 | clean-libtool: |
2884 | 376 | -rm -rf .libs _libs | 454 | -rm -rf .libs _libs |
2885 | 377 | 455 | ||
2895 | 378 | ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) | 456 | ID: $(am__tagged_files) |
2896 | 379 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | 457 | $(am__define_uniq_tagged_files); mkid -fID $$unique |
2897 | 380 | unique=`for i in $$list; do \ | 458 | tags: tags-am |
2898 | 381 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | 459 | TAGS: tags |
2890 | 382 | done | \ | ||
2891 | 383 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
2892 | 384 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
2893 | 385 | mkid -fID $$unique | ||
2894 | 386 | tags: TAGS | ||
2899 | 387 | 460 | ||
2902 | 388 | TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | 461 | tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) |
2901 | 389 | $(TAGS_FILES) $(LISP) | ||
2903 | 390 | set x; \ | 462 | set x; \ |
2904 | 391 | here=`pwd`; \ | 463 | here=`pwd`; \ |
2911 | 392 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | 464 | $(am__define_uniq_tagged_files); \ |
2906 | 393 | unique=`for i in $$list; do \ | ||
2907 | 394 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | ||
2908 | 395 | done | \ | ||
2909 | 396 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
2910 | 397 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
2912 | 398 | shift; \ | 465 | shift; \ |
2913 | 399 | if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ | 466 | if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ |
2914 | 400 | test -n "$$unique" || unique=$$empty_fix; \ | 467 | test -n "$$unique" || unique=$$empty_fix; \ |
2915 | @@ -406,15 +473,11 @@ | |||
2916 | 406 | $$unique; \ | 473 | $$unique; \ |
2917 | 407 | fi; \ | 474 | fi; \ |
2918 | 408 | fi | 475 | fi |
2928 | 409 | ctags: CTAGS | 476 | ctags: ctags-am |
2929 | 410 | CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ | 477 | |
2930 | 411 | $(TAGS_FILES) $(LISP) | 478 | CTAGS: ctags |
2931 | 412 | list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ | 479 | ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) |
2932 | 413 | unique=`for i in $$list; do \ | 480 | $(am__define_uniq_tagged_files); \ |
2924 | 414 | if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ | ||
2925 | 415 | done | \ | ||
2926 | 416 | $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ | ||
2927 | 417 | END { if (nonempty) { for (i in files) print i; }; }'`; \ | ||
2933 | 418 | test -z "$(CTAGS_ARGS)$$unique" \ | 481 | test -z "$(CTAGS_ARGS)$$unique" \ |
2934 | 419 | || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ | 482 | || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ |
2935 | 420 | $$unique | 483 | $$unique |
2936 | @@ -423,9 +486,10 @@ | |||
2937 | 423 | here=`$(am__cd) $(top_builddir) && pwd` \ | 486 | here=`$(am__cd) $(top_builddir) && pwd` \ |
2938 | 424 | && $(am__cd) $(top_srcdir) \ | 487 | && $(am__cd) $(top_srcdir) \ |
2939 | 425 | && gtags -i $(GTAGS_ARGS) "$$here" | 488 | && gtags -i $(GTAGS_ARGS) "$$here" |
2940 | 489 | cscopelist: cscopelist-am | ||
2941 | 426 | 490 | ||
2944 | 427 | cscopelist: $(HEADERS) $(SOURCES) $(LISP) | 491 | cscopelist-am: $(am__tagged_files) |
2945 | 428 | list='$(SOURCES) $(HEADERS) $(LISP)'; \ | 492 | list='$(am__tagged_files)'; \ |
2946 | 429 | case "$(srcdir)" in \ | 493 | case "$(srcdir)" in \ |
2947 | 430 | [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ | 494 | [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ |
2948 | 431 | *) sdir=$(subdir)/$(srcdir) ;; \ | 495 | *) sdir=$(subdir)/$(srcdir) ;; \ |
2949 | @@ -581,19 +645,20 @@ | |||
2950 | 581 | 645 | ||
2951 | 582 | .MAKE: install-am install-strip | 646 | .MAKE: install-am install-strip |
2952 | 583 | 647 | ||
2963 | 584 | .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ | 648 | .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ |
2964 | 585 | clean-generic clean-libtool clean-noinstPROGRAMS cscopelist \ | 649 | clean-binPROGRAMS clean-generic clean-libtool \ |
2965 | 586 | ctags distclean distclean-compile distclean-generic \ | 650 | clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \ |
2966 | 587 | distclean-libtool distclean-tags distdir dvi dvi-am html \ | 651 | distclean-compile distclean-generic distclean-libtool \ |
2967 | 588 | html-am info info-am install install-am install-binPROGRAMS \ | 652 | distclean-tags distdir dvi dvi-am html html-am info info-am \ |
2968 | 589 | install-data install-data-am install-dvi install-dvi-am \ | 653 | install install-am install-binPROGRAMS install-data \ |
2969 | 590 | install-exec install-exec-am install-html install-html-am \ | 654 | install-data-am install-dvi install-dvi-am install-exec \ |
2970 | 591 | install-info install-info-am install-man install-pdf \ | 655 | install-exec-am install-html install-html-am install-info \ |
2971 | 592 | install-pdf-am install-ps install-ps-am install-strip \ | 656 | install-info-am install-man install-pdf install-pdf-am \ |
2972 | 593 | installcheck installcheck-am installdirs maintainer-clean \ | 657 | install-ps install-ps-am install-strip installcheck \ |
2973 | 658 | installcheck-am installdirs maintainer-clean \ | ||
2974 | 594 | maintainer-clean-generic mostlyclean mostlyclean-compile \ | 659 | maintainer-clean-generic mostlyclean mostlyclean-compile \ |
2975 | 595 | mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ | 660 | mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ |
2977 | 596 | tags uninstall uninstall-am uninstall-binPROGRAMS | 661 | tags tags-am uninstall uninstall-am uninstall-binPROGRAMS |
2978 | 597 | 662 | ||
2979 | 598 | 663 | ||
2980 | 599 | # Tell versions [3.59,3.63) of GNU make to not export all variables. | 664 | # Tell versions [3.59,3.63) of GNU make to not export all variables. |
2981 | 600 | 665 | ||
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 | 28 | 28 | ||
2987 | 29 | #include <../src/common.h> | 29 | #include <../src/common.h> |
2988 | 30 | #include <stdio.h> | 30 | #include <stdio.h> |
2989 | 31 | #include <stdlib.h> | ||
2990 | 31 | #include <time.h> | 32 | #include <time.h> |
2991 | 32 | 33 | ||
2992 | 33 | /* | 34 | /* |
Thanks. Uploaded.