← Back to branch summary

~peter-pearse/ubuntu/oneiric/xorg-server/prop001

« back to all changes in this revision

Viewing changes to hw/xfree86/i2c/Makefile.in

  • Committer: Bazaar Package Importer
  • Author(s): Timo Aaltonen
  • Date: 2011-04-11 09:51:56 UTC
  • mfrom: (1.1.41 upstream) (0.1.26 experimental)
  • Revision ID: james.westby@ubuntu.com-20110411095156-ymlp7gnfsoplroug
Tags: 2:1.10.0.902-1ubuntu1
* Merge from Debian experimental.
  - dropped patches, included upstream:
    213_xichangehierarchy-check-oom.patch
    216_fix_sdksyms_build.diff, included upstream.
    218_getValuatorEvents_cleanup.patch
    219_xi1_handle_noncontinuous_valuator_data.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
hw/xfree86/i2c/Makefile.in
40
40
        $(srcdir)/Makefile.in
41
41
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
42
42
am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
43
 
        $(top_srcdir)/m4/ax_tls.m4 $(top_srcdir)/m4/libtool.m4 \
44
 
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
45
 
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
46
 
        $(top_srcdir)/configure.ac
 
43
        $(top_srcdir)/m4/ax_tls.m4 $(top_srcdir)/configure.ac
47
44
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
48
45
        $(ACLOCAL_M4)
49
46
mkinstalldirs = $(install_sh) -d
299
296
MAINT = @MAINT@
300
297
MAIN_LIB = @MAIN_LIB@
301
298
MAKEINFO = @MAKEINFO@
 
299
MANIFEST_TOOL = @MANIFEST_TOOL@
302
300
MAN_SUBSTS = @MAN_SUBSTS@
303
301
MISC_MAN_DIR = @MISC_MAN_DIR@
304
302
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
433
431
abs_srcdir = @abs_srcdir@
434
432
abs_top_builddir = @abs_top_builddir@
435
433
abs_top_srcdir = @abs_top_srcdir@
 
434
ac_ct_AR = @ac_ct_AR@
436
435
ac_ct_CC = @ac_ct_CC@
437
436
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
438
437
am__include = @am__include@
468
467
localedir = @localedir@
469
468
localstatedir = @localstatedir@
470
469
logdir = @logdir@
471
 
lt_ECHO = @lt_ECHO@
472
470
mandir = @mandir@
473
471
mkdir_p = @mkdir_p@
474
472
moduledir = @moduledir@