69-touchscreen.rules | 3
ChangeLog | 13
Makefile.in | 240
aclocal.m4 | 9137 +++++++++++++++++------------
calibrate.sh | 67
config.guess | 60
config.h.in | 4
config.sub | 66
configure |15856 +++++++++++++--------------------------------------
configure.ac | 2
ev_calibrate.c | 17
evtouch.c | 118
evtouch.h | 3
install-sh | 514 +
libtouch.c | 4
ltmain.sh | 7911 ++++++++++++++-----------
make_distrib.sh | 2
17 files changed, 14787 insertions(+), 19230 deletions(-)
New commits:
commit c3d89f875aea8fc4d70867b47343ee931f44ef87
Author: Mattia Dongili <malat...@linux.it>
Date: Fri Jan 2 20:50:12 2009 +0900
Imported upstream sources (version 0.8.8)
Signed-off-by: Mattia Dongili <malat...@linux.it>
diff --git a/69-touchscreen.rules b/69-touchscreen.rules
index 5bdaa1c..b122ddb 100644
--- a/69-touchscreen.rules
+++ b/69-touchscreen.rules
@@ -7,6 +7,9 @@
# Name can be found in /proc/bus/input/devices ('cat /proc/bus/input/devices')
#
+# Generic ts-adc touchscreen modules
+KERNEL=="event*", SUBSYSTEM=="input", ATTRS{name}=="ts-adc",
SYMLINK+="input/evtouch_event"
+
# These are the touchscreens supported by kernel's "usbtouchscreen" module
# eGalax Inc. USB TouchController)
diff --git a/ChangeLog b/ChangeLog
index 6d41d7a..4a2ba92 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+0.8.8
+ - Fixed RR left an right rotation (gborzi)
+ - Changed code to compile a working driver for both
+ XInput ABI 0.x and 2.0 (Xorg 1.4.0) (me)
+ (Not tested yet for 0.x)
+ - Added improvements to calibrate.sh from Debian package
+ - Added changes to ev_calibrate from Debian package
+ - Added following stuff from Harald Radke to mainstream
+ (harry...@postnuklear.de):
+ - added support for Option "Rotate" "UD" (upside down) in evtouch
+ input section of xorg.conf
+ - added generic ts-adc touchscreen device to udev rules file
+
0.8.7
- Added Elo Touchscreen to udev-rules (Stephen Webb)
- Added "fix" for AMD64-crashes on touch (Martin Letenay)
diff --git a/Makefile.in b/Makefile.in
index 56a38af..ce4cc3e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -38,15 +38,11 @@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -61,18 +57,18 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
@enable_evcal_t...@pkglib_programs = ev_calibrate$(EXEEXT)
+subdir = .
DIST_COMMON = README $(am__configure_deps) $(noinst_HEADERS) \
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/config.h.in $(top_srcdir)/configure AUTHORS COPYING \
ChangeLog INSTALL NEWS TODO compile config.guess config.sub \
depcomp install-sh ltmain.sh missing
-subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
+ configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
@@ -92,6 +88,10 @@ a...@driver_name@_drv_la_OBJECTS = \
@driver_n...@_drv_la-@driver_n...@.lo \
@driver_n...@_drv_la-libtouch.lo
@driver_n...@_drv_la_objects = $(a...@driver_name@_drv_la_OBJECTS)
+...@driver_name@_drv_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ $(@driver_n...@_drv_la_cflags) $(CFLAGS) \
+ $(@driver_n...@_drv_la_ldflags) $(LDFLAGS) -o $@
pkglibPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(pkglib_PROGRAMS)
am__ev_calibrate_SOURCES_DIST = ev_calibrate.c
@@ -99,19 +99,23 @@ am__ev_calibrate_SOURCES_DIST = ev_calibrate.c
@ENABLE_EVCAL_TRUE@ ev_calibrate-ev_calibrate.$(OBJEXT)
ev_calibrate_OBJECTS = $(am_ev_calibrate_OBJECTS)
ev_calibrate_LDADD = $(LDADD)
+ev_calibrate_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(ev_calibrate_CFLAGS) \
+ $(CFLAGS) $(ev_calibrate_LDFLAGS) $(LDFLAGS) -o $@
pkglibSCRIPT_INSTALL = $(INSTALL_SCRIPT)
SCRIPTS = $(pkglib_SCRIPTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
+DEFAULT_INCLUDES = -...@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ $(LDFLAGS) -o $@
SOURCES = $(@driver_n...@_drv_la_sources) $(ev_calibrate_SOURCES)
DIST_SOURCES = $(@driver_n...@_drv_la_sources) \
$(am__ev_calibrate_SOURCES_DIST)
@@ -133,8 +137,6 @@ GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
AUTOCONF = @AUTOCONF@
@@ -147,46 +149,44 @@ CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CURSORDIR = @CURSORDIR@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_NAME = @DRIVER_NAME@
-ECHO = @ECHO@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
-ENABLE_EVCAL_FALSE = @ENABLE_EVCAL_FALSE@
-ENABLE_EVCAL_TRUE = @ENABLE_EVCAL_TRUE@
-ENABLE_UDEVINSTALL_FALSE = @ENABLE_UDEVINSTALL_FALSE@
-ENABLE_UDEVINSTALL_TRUE = @ENABLE_UDEVINSTALL_TRUE@
EVCALIBRATE_CFLAGS = @EVCALIBRATE_CFLAGS@
EVCALIBRATE_LDFLAGS = @EVCALIBRATE_LDFLAGS@
EVCALIBRATE_LIBS = @EVCALIBRATE_LIBS@
EVTOUCH_CFLAGS = @EVTOUCH_CFLAGS@
EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
GREP = @GREP@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -196,19 +196,19 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
XORG_CFLAGS = @XORG_CFLAGS@
XORG_LIBS = @XORG_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -220,6 +220,7 @@ build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -239,6 +240,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -248,8 +250,11 @@ program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
EXTRA_DIST = ev_calibrate.c ev_calibrate.h evtouch.h calibrate.sh
make_distrib.sh \
README.calibration empty_cursor.xbm 69-touchscreen.rules
@@ -308,7 +313,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
config.h: stamp-h1
@if test ! -f $@; then \
rm -f stamp-h1; \
- $(MAKE) stamp-h1; \
+ $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
else :; fi
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@@ -323,21 +328,21 @@ distclean-hdr:
-rm -f config.h stamp-h1
insta...@driver_name@_drv_laLTLIBRARIES: $(@driver_n...@_drv_la_ltlibraries)
@$(NORMAL_INSTALL)
- test -z "$(@driver_n...@_drv_ladir)" || $(mkdir_p)
"$(DESTDIR)$(@driver_n...@_drv_ladir)"
+ test -z "$(@driver_n...@_drv_ladir)" || $(MKDIR_P)
"$(DESTDIR)$(@driver_n...@_drv_ladir)"
@list='$(@driver_n...@_drv_la_ltlibraries)'; for p in $$list; do \
if test -f $$p; then \
f=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=install
$(@driver_n...@_drv_laltlibraries_install) $(INSTALL_STRIP_FLAG) '$$p'
'$(DESTDIR)$(@driver_n...@_drv_ladir)/$$f'"; \
- $(LIBTOOL) --mode=install
$(@driver_n...@_drv_laltlibraries_install) $(INSTALL_STRIP_FLAG) "$$p"
"$(DESTDIR)$(@driver_n...@_drv_ladir)/$$f"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install
$(@driver_n...@_drv_laltlibraries_install) $(INSTALL_STRIP_FLAG) '$$p'
'$(DESTDIR)$(@driver_n...@_drv_ladir)/$$f'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install
$(@driver_n...@_drv_laltlibraries_install) $(INSTALL_STRIP_FLAG) "$$p"
"$(DESTDIR)$(@driver_n...@_drv_ladir)/$$f"; \
else :; fi; \
done
uninsta...@driver_name@_drv_laLTLIBRARIES:
@$(NORMAL_UNINSTALL)
- @set -x; list='$(@driver_n...@_drv_la_ltlibraries)'; for p in $$list;
do \
+ @list='$(@driver_n...@_drv_la_ltlibraries)'; for p in $$list; do \
p=$(am__strip_dir) \
- echo " $(LIBTOOL) --mode=uninstall rm -f
'$(DESTDIR)$(@driver_n...@_drv_ladir)/$$p'"; \
- $(LIBTOOL) --mode=uninstall rm -f
"$(DESTDIR)$(@driver_n...@_drv_ladir)/$$p"; \
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall
rm -f '$(DESTDIR)$(@driver_n...@_drv_ladir)/$$p'"; \
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f
"$(DESTDIR)$(@driver_n...@_drv_ladir)/$$p"; \
done
cle...@driver_name@_drv_laLTLIBRARIES:
@@ -349,18 +354,18 @@ cle...@driver_name@_drv_laLTLIBRARIES:
rm -f "$${dir}/so_locations"; \
done
@driver_n...@_drv.la: $(@driver_n...@_drv_la_objects)
$(@driver_n...@_drv_la_dependencies)
- $(LINK) -rpath $(@driver_n...@_drv_ladir)
$(@driver_n...@_drv_la_ldflags) $(@driver_n...@_drv_la_objects)
$(@driver_n...@_drv_la_libadd) $(LIBS)
+ $(@driver_n...@_drv_la_link) -rpath $(@driver_n...@_drv_ladir)
$(@driver_n...@_drv_la_objects) $(@driver_n...@_drv_la_libadd) $(LIBS)
install-pkglibPROGRAMS: $(pkglib_PROGRAMS)
@$(NORMAL_INSTALL)
- test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
+ test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)"
@list='$(pkglib_PROGRAMS)'; for p in $$list; do \
p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
if test -f $$p \
|| test -f $$p1 \
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install
$(pkglibPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install
$(pkglibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(pkglibdir)/$$f" || exit 1; \
+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS)
$(LIBTOOLFLAGS) --mode=install $(pkglibPROGRAMS_INSTALL) '$$p'
'$(DESTDIR)$(pkglibdir)/$$f'"; \
+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS)
--mode=install $(pkglibPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(pkglibdir)/$$f" ||
exit 1; \
else :; fi; \
done
@@ -380,10 +385,10 @@ clean-pkglibPROGRAMS:
done
ev_calibrate$(EXEEXT): $(ev_calibrate_OBJECTS) $(ev_calibrate_DEPENDENCIES)
@rm -f ev_calibrate$(EXEEXT)
- $(LINK) $(ev_calibrate_LDFLAGS) $(ev_calibrate_OBJECTS)
$(ev_calibrate_LDADD) $(LIBS)
+ $(ev_calibrate_LINK) $(ev_calibrate_OBJECTS) $(ev_calibrate_LDADD)
$(LIBS)
install-pkglibSCRIPTS: $(pkglib_SCRIPTS)
@$(NORMAL_INSTALL)
- test -z "$(pkglibdir)" || $(mkdir_p) "$(DESTDIR)$(pkglibdir)"
+ test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)"
@list='$(pkglib_SCRIPTS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
if test -f $$d$$p; then \
@@ -412,50 +417,50 @@ distclean-compile:
@AMDEP_TRUE@@am__include@
@am__qu...@./$(DEPDIR)/ev_calibrate-ev_calibrate...@am__quote@
.c.o:
-...@am__fastdepcc_true@ if $(COMPILE) -MT $@ -MD -MP -MF
"$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-...@am__fastdepcc_true@ then mv -f "$(DEPDIR)/$*.Tpo"
"$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+...@am__fastdepcc_true@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo
-c -o $@ $<
+...@am__fastdepcc_true@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no
@AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c $<
.c.obj:
-...@am__fastdepcc_true@ if $(COMPILE) -MT $@ -MD -MP -MF
"$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-...@am__fastdepcc_true@ then mv -f "$(DEPDIR)/$*.Tpo"
"$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+...@am__fastdepcc_true@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo
-c -o $@ `$(CYGPATH_W) '$<'`
+...@am__fastdepcc_true@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no
@AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
.c.lo:
-...@am__fastdepcc_true@ if $(LTCOMPILE) -MT $@ -MD -MP -MF
"$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-...@am__fastdepcc_true@ then mv -f "$(DEPDIR)/$*.Tpo"
"$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+...@am__fastdepcc_true@ $(LTCOMPILE) -MT $@ -MD -MP -MF
$(DEPDIR)/$*.Tpo -c -o $@ $<
+...@am__fastdepcc_true@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes
@AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
@driver_n...@_drv_la-@driver_n...@.lo: @driver_n...@.c
-...@am__fastdepcc_true@ if $(LIBTOOL) --tag=CC --mode=compile $(CC)
$(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)
$(@driver_n...@_drv_la_cflags) $(CFLAGS) -MT
@driver_n...@_drv_la-@driver_n...@.lo -MD -MP -MF
"$(DEPDIR)/@driver_n...@_drv_la-@driver_n...@.tpo" -c -o
@driver_n...@_drv_la-@driver_n...@.lo `test -f '@driver_n...@.c' || echo
'$(srcdir)/'`...@driver_name@.c; \
-...@am__fastdepcc_true@ then mv -f
"$(DEPDIR)/@driver_n...@_drv_la-@driver_n...@.tpo"
"$(DEPDIR)/@driver_n...@_drv_la-@driver_n...@.plo"; else rm -f
"$(DEPDIR)/@driver_n...@_drv_la-@driver_n...@.tpo"; exit 1; fi
+...@am__fastdepcc_true@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS)
$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(@driver_n...@_drv_la_cflags) $(CFLAGS) -MT
@driver_n...@_drv_la-@driver_n...@.lo -MD -MP -MF
$(DEPDIR)/@driver_n...@_drv_la-@driver_n...@.tpo -c -o
@driver_n...@_drv_la-@driver_n...@.lo `test -f '@driver_n...@.c' || echo
'$(srcdir)/'`...@driver_name@.c
+...@am__fastdepcc_true@ mv -f
$(DEPDIR)/@driver_n...@_drv_la-@driver_n...@.tpo
$(DEPDIR)/@driver_n...@_drv_la-@driver_n...@.plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='@driver_n...@.c'
object='@driver_n...@_drv_la-@driver_n...@.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-...@am__fastdepcc_false@ $(LIBTOOL) --tag=CC --mode=compile $(CC)
$(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)
$(@driver_n...@_drv_la_cflags) $(CFLAGS) -c -o
@driver_n...@_drv_la-@driver_n...@.lo `test -f '@driver_n...@.c' || echo
'$(srcdir)/'`...@driver_name@.c
+...@am__fastdepcc_false@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS)
$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(@driver_n...@_drv_la_cflags) $(CFLAGS) -c -o
@driver_n...@_drv_la-@driver_n...@.lo `test -f '@driver_n...@.c' || echo
'$(srcdir)/'`...@driver_name@.c
@driver_n...@_drv_la-libtouch.lo: libtouch.c
-...@am__fastdepcc_true@ if $(LIBTOOL) --tag=CC --mode=compile $(CC)
$(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)
$(@driver_n...@_drv_la_cflags) $(CFLAGS) -MT @driver_n...@_drv_la-libtouch.lo
-MD -MP -MF "$(DEPDIR)/@driver_n...@_drv_la-libtouch.tpo" -c -o
@driver_n...@_drv_la-libtouch.lo `test -f 'libtouch.c' || echo
'$(srcdir)/'`libtouch.c; \
-...@am__fastdepcc_true@ then mv -f
"$(DEPDIR)/@driver_n...@_drv_la-libtouch.tpo"
"$(DEPDIR)/@driver_n...@_drv_la-libtouch.plo"; else rm -f
"$(DEPDIR)/@driver_n...@_drv_la-libtouch.tpo"; exit 1; fi
+...@am__fastdepcc_true@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS)
$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(@driver_n...@_drv_la_cflags) $(CFLAGS) -MT
@driver_n...@_drv_la-libtouch.lo -MD -MP -MF
$(DEPDIR)/@driver_n...@_drv_la-libtouch.tpo -c -o
@driver_n...@_drv_la-libtouch.lo `test -f 'libtouch.c' || echo
'$(srcdir)/'`libtouch.c
+...@am__fastdepcc_true@ mv -f
$(DEPDIR)/@driver_n...@_drv_la-libtouch.tpo
$(DEPDIR)/@driver_n...@_drv_la-libtouch.plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='libtouch.c'
object='@driver_n...@_drv_la-libtouch.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
-...@am__fastdepcc_false@ $(LIBTOOL) --tag=CC --mode=compile $(CC)
$(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS)
$(@driver_n...@_drv_la_cflags) $(CFLAGS) -c -o @driver_n...@_drv_la-libtouch.lo
`test -f 'libtouch.c' || echo '$(srcdir)/'`libtouch.c
+...@am__fastdepcc_false@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS)
$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(@driver_n...@_drv_la_cflags) $(CFLAGS) -c -o
@driver_n...@_drv_la-libtouch.lo `test -f 'libtouch.c' || echo
'$(srcdir)/'`libtouch.c
ev_calibrate-ev_calibrate.o: ev_calibrate.c
-...@am__fastdepcc_true@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ev_calibrate_CFLAGS) $(CFLAGS) -MT
ev_calibrate-ev_calibrate.o -MD -MP -MF
"$(DEPDIR)/ev_calibrate-ev_calibrate.Tpo" -c -o ev_calibrate-ev_calibrate.o
`test -f 'ev_calibrate.c' || echo '$(srcdir)/'`ev_calibrate.c; \
-...@am__fastdepcc_true@ then mv -f
"$(DEPDIR)/ev_calibrate-ev_calibrate.Tpo"
"$(DEPDIR)/ev_calibrate-ev_calibrate.Po"; else rm -f
"$(DEPDIR)/ev_calibrate-ev_calibrate.Tpo"; exit 1; fi
+...@am__fastdepcc_true@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(ev_calibrate_CFLAGS) $(CFLAGS) -MT
ev_calibrate-ev_calibrate.o -MD -MP -MF $(DEPDIR)/ev_calibrate-ev_calibrate.Tpo
-c -o ev_calibrate-ev_calibrate.o `test -f 'ev_calibrate.c' || echo
'$(srcdir)/'`ev_calibrate.c
+...@am__fastdepcc_true@ mv -f $(DEPDIR)/ev_calibrate-ev_calibrate.Tpo
$(DEPDIR)/ev_calibrate-ev_calibrate.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ev_calibrate.c'
object='ev_calibrate-ev_calibrate.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(ev_calibrate_CFLAGS) $(CFLAGS) -c -o
ev_calibrate-ev_calibrate.o `test -f 'ev_calibrate.c' || echo
'$(srcdir)/'`ev_calibrate.c
ev_calibrate-ev_calibrate.obj: ev_calibrate.c
-...@am__fastdepcc_true@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES)
$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ev_calibrate_CFLAGS) $(CFLAGS) -MT
ev_calibrate-ev_calibrate.obj -MD -MP -MF
"$(DEPDIR)/ev_calibrate-ev_calibrate.Tpo" -c -o ev_calibrate-ev_calibrate.obj
`if test -f 'ev_calibrate.c'; then $(CYGPATH_W) 'ev_calibrate.c'; else
$(CYGPATH_W) '$(srcdir)/ev_calibrate.c'; fi`; \
-...@am__fastdepcc_true@ then mv -f
"$(DEPDIR)/ev_calibrate-ev_calibrate.Tpo"
"$(DEPDIR)/ev_calibrate-ev_calibrate.Po"; else rm -f
"$(DEPDIR)/ev_calibrate-ev_calibrate.Tpo"; exit 1; fi
+...@am__fastdepcc_true@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(ev_calibrate_CFLAGS) $(CFLAGS) -MT
ev_calibrate-ev_calibrate.obj -MD -MP -MF
$(DEPDIR)/ev_calibrate-ev_calibrate.Tpo -c -o ev_calibrate-ev_calibrate.obj `if
test -f 'ev_calibrate.c'; then $(CYGPATH_W) 'ev_calibrate.c'; else $(CYGPATH_W)
'$(srcdir)/ev_calibrate.c'; fi`
+...@am__fastdepcc_true@ mv -f $(DEPDIR)/ev_calibrate-ev_calibrate.Tpo
$(DEPDIR)/ev_calibrate-ev_calibrate.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ev_calibrate.c'
object='ev_calibrate-ev_calibrate.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE)
$(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
$(AM_CPPFLAGS) $(CPPFLAGS) $(ev_calibrate_CFLAGS) $(CFLAGS) -c -o
ev_calibrate-ev_calibrate.obj `if test -f 'ev_calibrate.c'; then $(CYGPATH_W)
'ev_calibrate.c'; else $(CYGPATH_W) '$(srcdir)/ev_calibrate.c'; fi`
@@ -468,10 +473,9 @@ clean-libtool:
distclean-libtool:
-rm -f libtool
-uninstall-info-am:
install-pkgdataDATA: $(pkgdata_DATA)
@$(NORMAL_INSTALL)
- test -z "$(pkgdatadir)" || $(mkdir_p) "$(DESTDIR)$(pkgdatadir)"
+ test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
@list='$(pkgdata_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -488,7 +492,7 @@ uninstall-pkgdataDATA:
done
install-udevDATA: $(udev_DATA)
@$(NORMAL_INSTALL)
- test -z "$(udevdir)" || $(mkdir_p) "$(DESTDIR)$(udevdir)"
+ test -z "$(udevdir)" || $(MKDIR_P) "$(DESTDIR)$(udevdir)"
@list='$(udev_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -509,8 +513,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
@@ -522,8 +526,8 @@ TAGS: $(HEADERS) $(SOURCES) config.h.in
$(TAGS_DEPENDENCIES) \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -533,13 +537,12 @@ ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
- here=`pwd`; \
list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) ' { files[$$0] = 1; } \
- END { for (i in files) print i; }'`; \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in files) print i; }; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
@@ -554,23 +557,22 @@ distclean-tags:
distdir: $(DISTFILES)
$(am__remove_distdir)
- mkdir $(distdir)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
- list='$(DISTFILES)'; for file in $$list; do \
- case $$file in \
- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
- $(top_srcdir)/*) file=`echo "$$file" | sed
"s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
- esac; \
+ test -d $(distdir) || mkdir $(distdir)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- dir="/$$dir"; \
- $(mkdir_p) "$(distdir)$$dir"; \
- else \
- dir=''; \
- fi; \
if test -d $$d/$$file; then \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -584,7 +586,7 @@ distdir: $(DISTFILES)
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {}
\; \
+ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r $(distdir)
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c
>$(distdir).tar.gz
@@ -593,6 +595,10 @@ dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
+dist-lzma: distdir
+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+ $(am__remove_distdir)
+
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
@@ -620,6 +626,8 @@ distcheck: dist
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lzma*) \
+ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
@@ -659,7 +667,7 @@ distcheck: dist
$(am__remove_distdir)
@(echo "$(distdir) archives ready for distribution: "; \
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
- sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
distuninstallcheck:
@cd $(distuninstallcheck_dir) \
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
@@ -684,7 +692,7 @@ all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS)
$(DATA) \
$(HEADERS) config.h
installdirs:
for dir in "$(DESTDIR)$(@driver_n...@_drv_ladir)"
"$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(pkgdatadir)"
"$(DESTDIR)$(udevdir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
install-exec: install-exec-am
@@ -735,12 +743,20 @@ info-am:
install-data-am: insta...@driver_name@_drv_laLTLIBRARIES \
install-pkgdataDATA install-udevDATA
+install-dvi: install-dvi-am
+
install-exec-am: install-pkglibPROGRAMS install-pkglibSCRIPTS
+install-html: install-html-am
+
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -764,29 +780,31 @@ ps: ps-am
ps-am:
uninstall-am: uninsta...@driver_name@_drv_laLTLIBRARIES \
- uninstall-info-am uninstall-pkgdataDATA \
- uninstall-pkglibPROGRAMS uninstall-pkglibSCRIPTS \
- uninstall-udevDATA
+ uninstall-pkgdataDATA uninstall-pkglibPROGRAMS \
+ uninstall-pkglibSCRIPTS uninstall-udevDATA
+
+.MAKE: install-am install-strip
.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
cle...@driver_name@_drv_laLTLIBRARIES clean-generic \
clean-libtool clean-pkglibPROGRAMS ctags dist dist-all \
- dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip distcheck \
- distclean distclean-compile distclean-generic distclean-hdr \
- distclean-libtool distclean-tags distcleancheck distdir \
- distuninstallcheck dvi dvi-am html html-am info info-am \
- install insta...@driver_name@_drv_laLTLIBRARIES install-am \
- install-data install-data-am install-exec install-exec-am \
- install-info install-info-am install-man install-pkgdataDATA \
- install-pkglibPROGRAMS install-pkglibSCRIPTS install-strip \
- install-udevDATA installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags uninstall \
- uninsta...@driver_name@_drv_laLTLIBRARIES uninstall-am \
- uninstall-info-am uninstall-pkgdataDATA \
- uninstall-pkglibPROGRAMS uninstall-pkglibSCRIPTS \
- uninstall-udevDATA
+ dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ dist-zip \
+ distcheck distclean distclean-compile distclean-generic \
+ distclean-hdr distclean-libtool distclean-tags distcleancheck \
+ distdir distuninstallcheck dvi dvi-am html html-am info \
+ info-am install insta...@driver_name@_drv_laLTLIBRARIES \
+ install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-pkgdataDATA \
+ install-pkglibPROGRAMS install-pkglibSCRIPTS install-ps \
+ install-ps-am install-strip install-udevDATA installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags uninstall uninsta...@driver_name@_drv_laLTLIBRARIES \
+ uninstall-am uninstall-pkgdataDATA uninstall-pkglibPROGRAMS \
+ uninstall-pkglibSCRIPTS uninstall-udevDATA
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/aclocal.m4 b/aclocal.m4
index 317535d..bcc0ae3 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005 Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -11,103 +11,196 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
+m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+m4_if(AC_AUTOCONF_VERSION, [2.61],,
+[m4_warning([this file was generated for autoconf 2.61.
+You have another version of autoconf. It may work, but is not guaranteed to.
+If you have problems, you may need to regenerate the build system entirely.
+To do so, use the procedure documented by the package, typically
`autoreconf'.])])
+
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+#
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+# 2006, 2007, 2008 Free Software Foundation, Inc.
+# Written by Gordon Matzigkeit, 1996
+#
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+
+m4_define([_LT_COPYING], [dnl
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+# 2006, 2007, 2008 Free Software Foundation, Inc.
+# Written by Gordon Matzigkeit, 1996
+#
+# This file is part of GNU Libtool.
+#
+# GNU Libtool is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Libtool; see the file COPYING. If not, a copy
+# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
+# obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+])
-# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL
+# serial 56 LT_INIT
-# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-# -----------------------------------------------------------
-# If this macro is not defined by Autoconf, define it here.
-m4_ifdef([AC_PROVIDE_IFELSE],
- [],
- [m4_define([AC_PROVIDE_IFELSE],
- [m4_ifdef([AC_PROVIDE_$1],
- [$2], [$3])])])
+# LT_PREREQ(VERSION)
+# ------------------
+# Complain and exit if this libtool version is less that VERSION.
+m4_defun([LT_PREREQ],
+[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
+ [m4_default([$3],
+ [m4_fatal([Libtool version $1 or higher is required],
+ 63)])],
+ [$2])])
-# AC_PROG_LIBTOOL
-# ---------------
-AC_DEFUN([AC_PROG_LIBTOOL],
-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
- AC_PROVIDE_IFELSE([AC_PROG_CXX],
- [AC_LIBTOOL_CXX],
- [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
- ])])
-dnl And a similar setup for Fortran 77 support
- AC_PROVIDE_IFELSE([AC_PROG_F77],
- [AC_LIBTOOL_F77],
- [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
-])])
-
-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
- AC_PROVIDE_IFELSE([AC_PROG_GCJ],
- [AC_LIBTOOL_GCJ],
- [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
- [AC_LIBTOOL_GCJ],
- [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
- [AC_LIBTOOL_GCJ],
- [ifdef([AC_PROG_GCJ],
- [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
- ifdef([A][M_PROG_GCJ],
- [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
- ifdef([LT_AC_PROG_GCJ],
- [define([LT_AC_PROG_GCJ],
- defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
-])])# AC_PROG_LIBTOOL
-
-
-# _AC_PROG_LIBTOOL
-# ----------------
-AC_DEFUN([_AC_PROG_LIBTOOL],
-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
+# _LT_CHECK_BUILDDIR
+# ------------------
+# Complain if the absolute build directory name contains unusual characters
+m4_defun([_LT_CHECK_BUILDDIR],
+[case `pwd` in
+ *\ * | *\ *)
+ AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
+esac
+])
+
+
+# LT_INIT([OPTIONS])
+# ------------------
+AC_DEFUN([LT_INIT],
+[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
+AC_BEFORE([$0], [LT_LANG])dnl
+AC_BEFORE([$0], [LT_OUTPUT])dnl
+AC_BEFORE([$0], [LTDL_INIT])dnl
+m4_require([_LT_CHECK_BUILDDIR])dnl
+
+dnl Autoconf doesn't catch unexpanded LT_ macros by default:
+m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
+m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
+dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
+dnl unless we require an AC_DEFUNed macro:
+AC_REQUIRE([LTOPTIONS_VERSION])dnl
+AC_REQUIRE([LTSUGAR_VERSION])dnl
+AC_REQUIRE([LTVERSION_VERSION])dnl
+AC_REQUIRE([LTOBSOLETE_VERSION])dnl
+m4_require([_LT_PROG_LTMAIN])dnl
+
+dnl Parse OPTIONS
+_LT_SET_OPTIONS([$0], [$1])
# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+LIBTOOL_DEPS="$ltmain"
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
AC_SUBST(LIBTOOL)dnl
-# Prevent multiple expansion
-define([AC_PROG_LIBTOOL], [])
-])# _AC_PROG_LIBTOOL
+_LT_SETUP
+# Only expand once:
+m4_define([LT_INIT])
+])# LT_INIT
-# AC_LIBTOOL_SETUP
-# ----------------
-AC_DEFUN([AC_LIBTOOL_SETUP],
-[AC_PREREQ(2.50)dnl
-AC_REQUIRE([AC_ENABLE_SHARED])dnl
-AC_REQUIRE([AC_ENABLE_STATIC])dnl
-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
+# Old names:
+AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
+AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
+dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
+
+
+# _LT_CC_BASENAME(CC)
+# -------------------
+# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
+m4_defun([_LT_CC_BASENAME],
+[for cc_temp in $1""; do
+ case $cc_temp in
+ compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+ distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+ \-*) ;;
+ *) break;;
+ esac
+done
+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+])
+
+
+# _LT_FILEUTILS_DEFAULTS
+# ----------------------
+# It is okay to use these file commands and assume they have been set
+# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
+m4_defun([_LT_FILEUTILS_DEFAULTS],
+[: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+])# _LT_FILEUTILS_DEFAULTS
+
+
+# _LT_SETUP
+# ---------
+m4_defun([_LT_SETUP],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+_LT_DECL([], [host_alias], [0], [The host system])dnl
+_LT_DECL([], [host], [0])dnl
+_LT_DECL([], [host_os], [0])dnl
+dnl
+_LT_DECL([], [build_alias], [0], [The build system])dnl
+_LT_DECL([], [build], [0])dnl
+_LT_DECL([], [build_os], [0])dnl
+dnl
AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_LD])dnl
-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
-AC_REQUIRE([AC_PROG_NM])dnl
-
+AC_REQUIRE([LT_PATH_LD])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+dnl
AC_REQUIRE([AC_PROG_LN_S])dnl
-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-AC_REQUIRE([AC_OBJEXT])dnl
-AC_REQUIRE([AC_EXEEXT])dnl
+test -z "$LN_S" && LN_S="ln -s"
+_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
dnl
+AC_REQUIRE([LT_CMD_MAX_LEN])dnl
+_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
+_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
+dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_CMD_RELOAD])dnl
+m4_require([_LT_CHECK_MAGIC_METHOD])dnl
+m4_require([_LT_CMD_OLD_ARCHIVE])dnl
+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+
+_LT_CONFIG_LIBTOOL_INIT([
+# See if we are running on zsh, and set the options which allow our
+# commands through without removal of \ escapes INIT.
+if test -n "\${ZSH_VERSION+set}" ; then
+ setopt NO_GLOB_SUBST
+fi
+])
+if test -n "${ZSH_VERSION+set}" ; then
+ setopt NO_GLOB_SUBST
+fi
-AC_LIBTOOL_SYS_MAX_CMD_LEN
-AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-AC_LIBTOOL_OBJDIR
+_LT_CHECK_OBJDIR
-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-_LT_AC_PROG_ECHO_BACKSLASH
+m4_require([_LT_TAG_COMPILER])dnl
+_LT_PROG_ECHO_BACKSLASH
case $host_os in
aix3*)
@@ -123,114 +216,653 @@ esac
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
-Xsed='sed -e 1s/^X//'
-[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
# Same as above, but do not quote variable references.
-[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
+double_quote_subst='s/\([["`\\]]\)/\\\1/g'
# Sed substitution to delay expansion of an escaped shell variable in a
# double_quote_subst'ed string.
delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
# Sed substitution to avoid accidental globbing in evaled expressions
no_glob_subst='s/\*/\\\*/g'
-# Constants:
-rm="rm -f"
-
# Global variables:
-default_ofile=libtool
+ofile=libtool
can_build_shared=yes
# All known linkers require a `.a' archive for static linking (except MSVC,
# which needs '.lib').
libext=a
-ltmain="$ac_aux_dir/ltmain.sh"
-ofile="$default_ofile"
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-AC_CHECK_TOOL(AR, ar, false)
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-AC_CHECK_TOOL(STRIP, strip, :)
+with_gnu_ld="$lt_cv_prog_gnu_ld"
old_CC="$CC"
old_CFLAGS="$CFLAGS"
# Set sane defaults for various variables
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-test -z "$AS" && AS=as
test -z "$CC" && CC=cc
test -z "$LTCC" && LTCC=$CC
test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-test -z "$DLLTOOL" && DLLTOOL=dlltool
test -z "$LD" && LD=ld
-test -z "$LN_S" && LN_S="ln -s"
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-test -z "$NM" && NM=nm
-test -z "$SED" && SED=sed
-test -z "$OBJDUMP" && OBJDUMP=objdump
-test -z "$RANLIB" && RANLIB=:
-test -z "$STRIP" && STRIP=:
test -z "$ac_objext" && ac_objext=o
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
- case $host_os in
- openbsd*)
- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
- ;;
- *)
- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
- ;;
- esac
- old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-fi
-
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
