← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/xserver-xorg-video-intel/oneiric

« back to all changes in this revision

Viewing changes to src/xvmc/shader/Makefile.in

  • Committer: Bazaar Package Importer
  • Author(s): Christopher James Halse Rogers, Robert Hooker, Christopher James Halse Rogers
  • Date: 2011-08-09 10:10:02 UTC
  • mfrom: (0.1.21 experimental)
  • Revision ID: james.westby@ubuntu.com-20110809101002-pguc3kc6pzh1cp5h
Tags: 2:2.15.901-1ubuntu1
[ Robert Hooker ]
* Merge from debian-experimental, remaining changes:
  - 101_copy-fb.patch
    + Plymouth integration patch
  - 120_check_privates.patch
    + Check for null privates pointer on render_dest_picture.
  - debian/xserver-xorg-video-intel.preinst.in:
  - debian/xserver-xorg-video-intel.postinst.in:
    + Remove obsolete /etc/modprobe.d/i915-kms.conf file on upgrades.
      KMS is the kernel default.
* Dropped patches:
  - 121_fdo-28798-fix.patch (upstream)

[ Christopher James Halse Rogers ]
* Refresh 101_copy-fb.patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/xvmc/shader/Makefile.in
117
117
CYGPATH_W = @CYGPATH_W@
118
118
DEFS = @DEFS@
119
119
DEPDIR = @DEPDIR@
 
120
DLLTOOL = @DLLTOOL@
 
121
DRI2_CFLAGS = @DRI2_CFLAGS@
 
122
DRI2_LIBS = @DRI2_LIBS@
120
123
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
121
124
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
122
125
DRIVER_NAME = @DRIVER_NAME@
155
158
LTLIBOBJS = @LTLIBOBJS@
156
159
MAINT = @MAINT@
157
160
MAKEINFO = @MAKEINFO@
 
161
MANIFEST_TOOL = @MANIFEST_TOOL@
158
162
MAN_SUBSTS = @MAN_SUBSTS@
159
163
MISC_MAN_DIR = @MISC_MAN_DIR@
160
164
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
182
186
SED = @SED@
183
187
SET_MAKE = @SET_MAKE@
184
188
SHELL = @SHELL@
 
189
STRICT_CFLAGS = @STRICT_CFLAGS@
185
190
STRIP = @STRIP@
186
191
UDEV_CFLAGS = @UDEV_CFLAGS@
187
192
UDEV_LIBS = @UDEV_LIBS@
188
193
VERSION = @VERSION@
 
194
X11_CFLAGS = @X11_CFLAGS@
 
195
X11_LIBS = @X11_LIBS@
189
196
XORG_CFLAGS = @XORG_CFLAGS@
190
197
XORG_LIBS = @XORG_LIBS@
191
198
XORG_MAN_PAGE = @XORG_MAN_PAGE@
195
202
abs_srcdir = @abs_srcdir@
196
203
abs_top_builddir = @abs_top_builddir@
197
204
abs_top_srcdir = @abs_top_srcdir@
 
205
ac_ct_AR = @ac_ct_AR@
198
206
ac_ct_CC = @ac_ct_CC@
199
207
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
200
208
am__include = @am__include@
227
235
libexecdir = @libexecdir@
228
236
localedir = @localedir@
229
237
localstatedir = @localstatedir@
230
 
lt_ECHO = @lt_ECHO@
231
238
mandir = @mandir@
232
239
mkdir_p = @mkdir_p@
233
240
moduledir = @moduledir@