~jderose/ubuntu/raring/xserver-xorg-input-synaptics/clickpad

« back to all changes in this revision

Viewing changes to src/Makefile.in

  • Committer: Bazaar Package Importer
  • Author(s): Christopher James Halse Rogers, Cyril Brulebois, Christopher James Halse Rogers
  • Date: 2011-01-25 20:01:58 UTC
  • mfrom: (1.2.2 upstream) (2.1.4 experimental)
  • Revision ID: james.westby@ubuntu.com-20110125200158-9qpvmzuexogs7a5n
Tags: 1.3.99+git20110116.0e27ce3a-0ubuntu1
[ Cyril Brulebois ]
* Switch to Architecture: any, adding armhf support (Closes: #604672).

[ Christopher James Halse Rogers ]
* Merge from (unreleased) Debian experimental.  Remaining Ubuntu changes:
  - Split out our synaptics quirks into 51-synaptics-quirks.conf
  - Add the udev rule back for tagging specific machines to be quirked
  - Trigger udev in postinst to pick up udev rules
  - add Depend: on udev
  - 103_enable_cornertapping.patch: Enable right/middle clicks by
    tapping in the bottom- and top-right corners.
  - 104_always_enable_tapping.patch: Enable tapping regardless of the
    presence of physical buttons.
  - 106_always_enable_vert_edge_scroll.patch: Enable vertical edge
    tapping by default even if we enable two-finger scrolling as well.
  - 114_jumpy_cursor_first_part.patch: Adds a property to enable filtering
    jumpy cursor problems on some machines.
  - Specify ‘ubuntu’ branch in gbp.conf
  - 115_evdev_only.patch: Only bind to /dev/input/event* evdev devices
    (LP 624985)
* Update to git snapshot to fix build against Xserver 1.10 input API
* debian/patches/01-synaptics-dont-grab-if-not-on-current-VT.patch:
  - Refresh for new upstream.
* debian/patches/114_jumpy_cursor_first_part.patch:
  - Refresh for new upstream.  Drop the multi-touch chunk of the quirk,
    as that is handled by upstream commit a6ca4d25.
  

Show diffs side-by-side

added added

removed removed

Lines of Context:
58
58
@BUILD_EVENTCOMM_TRUE@  eventcomm.c eventcomm.h
59
59
 
60
60
@BUILD_PSMCOMM_TRUE@am__append_2 = \
61
 
@BUILD_PSMCOMM_TRUE@    psmcomm.c psmcomm.h
 
61
@BUILD_PSMCOMM_TRUE@    psmcomm.c
62
62
 
63
63
subdir = src
64
64
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
96
96
@DRIVER_NAME@_drv_la_LIBADD =
97
97
am__@DRIVER_NAME@_drv_la_SOURCES_DIST = @DRIVER_NAME@.c synapticsstr.h \
98
98
        alpscomm.c alpscomm.h ps2comm.c ps2comm.h synproto.h \
99
 
        properties.c eventcomm.c eventcomm.h psmcomm.c psmcomm.h
 
99
        properties.c eventcomm.c eventcomm.h psmcomm.c
100
100
@BUILD_EVENTCOMM_TRUE@am__objects_1 = eventcomm.lo
101
101
@BUILD_PSMCOMM_TRUE@am__objects_2 = psmcomm.lo
102
102
am_@DRIVER_NAME@_drv_la_OBJECTS = @DRIVER_NAME@.lo alpscomm.lo \
152
152
AUTOHEADER = @AUTOHEADER@
153
153
AUTOMAKE = @AUTOMAKE@
154
154
AWK = @AWK@
155
 
BUILD_TOOLS = @BUILD_TOOLS@
156
155
CC = @CC@
157
156
CCDEPMODE = @CCDEPMODE@
158
157
CFLAGS = @CFLAGS@
177
176
FILE_MAN_DIR = @FILE_MAN_DIR@
178
177
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
179
178
GREP = @GREP@
180
 
HAVE_PROPERTIES = @HAVE_PROPERTIES@
181
179
INSTALL = @INSTALL@
182
180
INSTALL_CMD = @INSTALL_CMD@
183
181
INSTALL_DATA = @INSTALL_DATA@
196
194
LTLIBOBJS = @LTLIBOBJS@
197
195
MAINT = @MAINT@
198
196
MAKEINFO = @MAKEINFO@
 
197
MAN_SUBSTS = @MAN_SUBSTS@
199
198
MISC_MAN_DIR = @MISC_MAN_DIR@
200
199
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
201
200
MKDIR_P = @MKDIR_P@
210
209
PACKAGE_NAME = @PACKAGE_NAME@
211
210
PACKAGE_STRING = @PACKAGE_STRING@
212
211
PACKAGE_TARNAME = @PACKAGE_TARNAME@
 
212
PACKAGE_URL = @PACKAGE_URL@
213
213
PACKAGE_VERSION = @PACKAGE_VERSION@
214
214
PATH_SEPARATOR = @PATH_SEPARATOR@
215
215
PKG_CONFIG = @PKG_CONFIG@
 
216
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
 
217
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
216
218
RANLIB = @RANLIB@
217
 
RECORDPROTO_1_13_CFLAGS = @RECORDPROTO_1_13_CFLAGS@
218
 
RECORDPROTO_1_13_LIBS = @RECORDPROTO_1_13_LIBS@
219
219
SED = @SED@
220
220
SET_MAKE = @SET_MAKE@
221
221
SHELL = @SHELL@
223
223
VERSION = @VERSION@
224
224
XI_CFLAGS = @XI_CFLAGS@
225
225
XI_LIBS = @XI_LIBS@
226
 
XORG16_CFLAGS = @XORG16_CFLAGS@
227
 
XORG16_LIBS = @XORG16_LIBS@
228
226
XORG_CFLAGS = @XORG_CFLAGS@
229
227
XORG_LIBS = @XORG_LIBS@
230
 
XTST_1_1_CFLAGS = @XTST_1_1_CFLAGS@
231
 
XTST_1_1_LIBS = @XTST_1_1_LIBS@
 
228
XORG_MAN_PAGE = @XORG_MAN_PAGE@
 
229
XTST_CFLAGS = @XTST_CFLAGS@
 
230
XTST_LIBS = @XTST_LIBS@
232
231
abs_builddir = @abs_builddir@
233
232
abs_srcdir = @abs_srcdir@
234
233
abs_top_builddir = @abs_top_builddir@
247
246
build_os = @build_os@
248
247
build_vendor = @build_vendor@
249
248
builddir = @builddir@
 
249
configdir = @configdir@
250
250
datadir = @datadir@
251
251
datarootdir = @datarootdir@
252
252
docdir = @docdir@
292
292
@DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la
293
293
@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version
294
294
@DRIVER_NAME@_drv_ladir = @inputdir@
295
 
INCLUDES = -I$(top_srcdir)/include/
 
295
AM_CPPFLAGS = -I$(top_srcdir)/include
 
296
AM_CFLAGS = $(XORG_CFLAGS)
296
297
@DRIVER_NAME@_drv_la_SOURCES = @DRIVER_NAME@.c synapticsstr.h \
297
298
        alpscomm.c alpscomm.h ps2comm.c ps2comm.h synproto.h \
298
299
        properties.c $(am__append_1) $(am__append_2)
309
310
              exit 1;; \
310
311
          esac; \
311
312
        done; \
312
 
        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
 
313
        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
313
314
        $(am__cd) $(top_srcdir) && \
314
 
          $(AUTOMAKE) --gnu src/Makefile
 
315
          $(AUTOMAKE) --foreign src/Makefile
315
316
.PRECIOUS: Makefile
316
317
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
317
318
        @case '$?' in \