← Back to branch summary

~ubuntu-branches/ubuntu/hardy/xorg-server/hardy

« back to all changes in this revision

Viewing changes to hw/xfree86/dixmods/extmod/Makefile

  • Committer: Bazaar Package Importer
  • Author(s): Timo Aaltonen
  • Date: 2008-01-08 18:05:21 UTC
  • mfrom: (1.1.11 upstream)
  • Revision ID: james.westby@ubuntu.com-20080108180521-1kfbqij56jkaiqn1
Tags: 2:1.4.1~git20080105-1ubuntu1
* Merge with Debian unstable, remaining changes:
* debian/control:
  - Change maintainer address.
  - set Conflicts: xkb-data (<< 0.9), since xkb-path is
    different compared to Dapper.
  - xvfb Depends on xauth, xfonts-base.
* debian/patches:
  - 100_avoid_acpi_insanity.diff
    Don't send a configuration change event just because somebody's pressed
    a brightness key.
  - 101_fedora-apm-typedefs.patch:
    Temporary hack from Fedora for broken kernels that don't publish the
    /dev/apm_bios types.
  - 102_ubuntu_sharevts_load_cpu.patch:
    Close console fd only when using --sharevts.
  - 104_fedora_init_origins_fix.patch
    Multihead initialization.
  - 106_ubuntu_fpic_libxf86config.patch
    Add -fPIC to makefiles for xfree86/parser.
  - 107_fedora_dont_backfill_bg_none.patch
    Disable backfilling of windows created with bg=none, which
    otherwise would force a framebuffer readback.
  - 110_fedora_no_move_damage.patch
    Disable damage notifications on move for manually redirected windows.
  - 120_fedora_xserver-xaa-evict-pixmaps.patch:
    New version of the hack to copy textures from video memory. Shouldn't
    break EXA anymore.
  - 121_only_switch_vt_when_active.diff
    Add a check to prevent the X server from changing the VT when
    killing GDM from the console.
  - 123_no_composite_for_xvfb_run.patch
    Use "-extension Composite" to fix xvfb-run crashing.
  - 133_psb_auto.patch
    Add automatic detection of Poulsbo hardware when running
    without a Device definition.
  - 138_fedora_xserver-1.3.0-default-dpi.patch
    Changes default dpi to 96.
  - 139_fedora_xserver-1.3.0-document-fontpath-correctly.patch
    Fixes document fontpaths shown in the man page.
  - 142_fedora_xserver-1.3.0-no-pseudocolor-composite.patch
    Composite on 8bpp pseudocolor root windows appears to fail, so just
    disable it on anything pseudocolor for safety.
  - 144_fedora_xserver-1.3.0-xnest-exposures.patch:
    Only collect xnest exposures for xexposes with non-zero height and width.
* debian/patches/103_fedora_openchrome.patch:
  - Patch from Fedora to use openchrome instead of via.

Show diffs side-by-side

added added

removed removed

Lines of Context:
hw/xfree86/dixmods/extmod/Makefile
93
93
ETAGS = etags
94
94
CTAGS = ctags
95
95
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
96
 
ACLOCAL = ${SHELL} /home/david/debian/xorg/git/xserver/xorg-server/missing --run aclocal-1.10
 
96
ACLOCAL = ${SHELL} /tmp/tmpiQUR1i/xorg-server-1.4.1~git20080105/missing --run aclocal-1.10
97
97
ADMIN_MAN_DIR = $(mandir)/man$(ADMIN_MAN_SUFFIX)
98
98
ADMIN_MAN_SUFFIX = 8
99
99
ALLOCA = 
100
 
AMTAR = ${SHELL} /home/david/debian/xorg/git/xserver/xorg-server/missing --run tar
 
100
AMTAR = ${SHELL} /tmp/tmpiQUR1i/xorg-server-1.4.1~git20080105/missing --run tar
101
101
APPDEFAULTDIR = 
102
102
APPLE_APPLICATIONS_DIR = ${exec_prefix}/bin/Applications
103
103
APP_MAN_DIR = $(mandir)/man$(APP_MAN_SUFFIX)
104
104
APP_MAN_SUFFIX = 1
105
105
AR = ar
106
106
AS = as
107
 
AUTOCONF = ${SHELL} /home/david/debian/xorg/git/xserver/xorg-server/missing --run autoconf
108
 
AUTOHEADER = ${SHELL} /home/david/debian/xorg/git/xserver/xorg-server/missing --run autoheader
109
 
AUTOMAKE = ${SHELL} /home/david/debian/xorg/git/xserver/xorg-server/missing --run automake-1.10
 
107
AUTOCONF = ${SHELL} /tmp/tmpiQUR1i/xorg-server-1.4.1~git20080105/missing --run autoconf
 
108
AUTOHEADER = ${SHELL} /tmp/tmpiQUR1i/xorg-server-1.4.1~git20080105/missing --run autoheader
 
109
AUTOMAKE = ${SHELL} /tmp/tmpiQUR1i/xorg-server-1.4.1~git20080105/missing --run automake-1.10
110
110
AWK = gawk
111
 
BASE_FONT_PATH = /usr/share/fonts/X11
112
 
BUILD_DATE = 20071112
113
 
BUILD_TIME = 1220056
 
111
BASE_FONT_PATH = /usr/local/lib/X11/fonts
 
112
BUILD_DATE = 20080106
 
113
BUILD_TIME = 1171110
114
114
CC = gcc
115
115
CCAS = gcc
116
116
CCASDEPMODE = depmode=gcc3
117
117
CCASFLAGS = -g -O2
118
118
CCDEPMODE = depmode=gcc3
119
119
CFLAGS = -g -O2
120
 
COMPILEDDEFAULTFONTPATH = /usr/share/fonts/X11/misc/,/usr/share/fonts/X11/TTF/,/usr/share/fonts/X11/OTF,/usr/share/fonts/X11/Type1/,/usr/share/fonts/X11/100dpi/,/usr/share/fonts/X11/75dpi/
 
120
COMPILEDDEFAULTFONTPATH = /usr/local/lib/X11/fonts/misc/,/usr/local/lib/X11/fonts/TTF/,/usr/local/lib/X11/fonts/OTF,/usr/local/lib/X11/fonts/Type1/,/usr/local/lib/X11/fonts/100dpi/,/usr/local/lib/X11/fonts/75dpi/
121
121
CPP = gcc -E
122
122
CPPFLAGS = 
123
123
CXX = g++
129
129
DBUS_CFLAGS = -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include  
130
130
DBUS_LIBS = -ldbus-1  
131
131
DEFAULT_LIBRARY_PATH = /usr/local/lib
132
 
DEFAULT_LOGPREFIX = /var/log/Xorg.
 
132
DEFAULT_LOGPREFIX = /usr/local/var/log/Xorg.
133
133
DEFAULT_MODULE_PATH = /usr/local/lib/xorg/modules
134
134
DEFS = -DHAVE_CONFIG_H
135
135
DEPDIR = .deps
164
164
FREETYPE_CFLAGS = 
165
165
FREETYPE_LIBS = 
166
166
FREETYPE_REQUIRES = 
167
 
GLX_ARCH_DEFINES = 
168
167
GLX_DEFINES = 
169
168
GL_CFLAGS =  
170
169
GL_LIBS =  
197
196
LINUXDOC = /usr/bin/linuxdoc
198
197
LN_S = ln -s
199
198
LTLIBOBJS = 
200
 
MAINT = #
201
 
MAKEINFO = ${SHELL} /home/david/debian/xorg/git/xserver/xorg-server/missing --run makeinfo
202
 
MAKE_HTML = SGML_SEARCH_PATH=/usr/local/share/sgml /usr/bin/linuxdoc  -B html --split=0
 
199
MAINT = 
 
200
MAKEINFO = ${SHELL} /tmp/tmpiQUR1i/xorg-server-1.4.1~git20080105/missing --run makeinfo
 
201
MAKE_HTML = SGML_SEARCH_PATH=NONE/share/sgml /usr/bin/linuxdoc  -B html --split=0
203
202
MAKE_PDF = /usr/bin/ps2pdf
204
 
MAKE_PS = SGML_SEARCH_PATH=/usr/local/share/sgml /usr/bin/linuxdoc -B latex --papersize=letter --output=ps
205
 
MAKE_TEXT = SGML_SEARCH_PATH=/usr/local/share/sgml GROFF_NO_SGR=y /usr/bin/linuxdoc -B txt
206
 
MESA_SOURCE = /home/david/debian/xorg/git/lib/mesa
 
203
MAKE_PS = SGML_SEARCH_PATH=NONE/share/sgml /usr/bin/linuxdoc -B latex --papersize=letter --output=ps
 
204
MAKE_TEXT = SGML_SEARCH_PATH=NONE/share/sgml GROFF_NO_SGR=y /usr/bin/linuxdoc -B txt
 
205
MESA_SOURCE = 
207
206
MISC_MAN_DIR = $(mandir)/man$(MISC_MAN_SUFFIX)
208
207
MISC_MAN_SUFFIX = 7
209
208
MKDIR_P = /bin/mkdir -p
219
218
PACKAGE = xorg-server
220
219
PACKAGE_BUGREPORT = https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
221
220
PACKAGE_NAME = xorg-server
222
 
PACKAGE_STRING = xorg-server 1.4
 
221
PACKAGE_STRING = xorg-server 1.4.0.90
223
222
PACKAGE_TARNAME = xorg-server
224
 
PACKAGE_VERSION = 1.4
 
223
PACKAGE_VERSION = 1.4.0.90
225
224
PATH_SEPARATOR = :
226
225
PERL = /usr/bin/perl
227
226
PIXMAN_CFLAGS = -I/usr/include/pixman-1  
245
244
SYS_LIBS = 
246
245
TSLIB_CFLAGS = 
247
246
TSLIB_LIBS = 
248
 
VENDOR_MAN_VERSION = Version 1.4
 
247
VENDOR_MAN_VERSION = Version 1.4.0.90
249
248
VENDOR_NAME = The X.Org Foundation
250
249
VENDOR_NAME_SHORT = X.Org
251
 
VENDOR_RELEASE = (((1) * 10000000) + ((4) * 100000) + ((0) * 1000) + 0)
252
 
VERSION = 1.4
 
250
VENDOR_RELEASE = (((1) * 10000000) + ((4) * 100000) + ((0) * 1000) + 90)
 
251
VERSION = 1.4.0.90
253
252
X11EXAMPLES_DEP_CFLAGS = 
254
253
X11EXAMPLES_DEP_LIBS = 
255
254
XDMCP_CFLAGS =  
276
275
XGLX_LIBS = 
277
276
XGL_LIBS = 
278
277
XGL_MODULE_PATH = 
279
 
XKB_BASE_DIRECTORY = /usr/share/X11/xkb
 
278
XKB_BASE_DIRECTORY = /usr/local/share/X11/xkb
280
279
XKB_BIN_DIRECTORY = /usr/local/bin
281
 
XKB_COMPILED_DIR = /var/lib/xkb
282
 
XKM_OUTPUT_DIR = /var/lib/xkb/
283
 
XLIB_CFLAGS =  
284
 
XLIB_LIBS = -lX11  
 
280
XKB_COMPILED_DIR = /usr/local/share/X11/xkb/compiled
 
281
XKM_OUTPUT_DIR = /usr/local/share/X11/xkb/compiled/
 
282
XLIB_CFLAGS = 
 
283
XLIB_LIBS = 
285
284
XNESTMODULES_CFLAGS = -I/usr/include/freetype2  
286
285
XNESTMODULES_LIBS = -lXfont -lXext -lX11 -lXau -lXdmcp  
287
 
XNEST_LIBS = $(top_builddir)/mi/libmi.la $(top_builddir)/config/libconfig.a -lXfont -lXau -lfontenc -lpixman-1 -lhal -ldbus-1 -lXdmcp    -lm  -lrt $(top_builddir)/fb/libfb.la $(top_builddir)/xfixes/libxfixes.la $(top_builddir)/Xext/libXext.la $(top_builddir)/dbe/libdbe.la $(top_builddir)/XTrap/libxtrap.la $(top_builddir)/record/librecord.la $(top_builddir)/GL/glx/libglx.la $(top_builddir)/GL/mesa/libGLcore.la $(top_builddir)/render/librender.la $(top_builddir)/randr/librandr.la $(top_builddir)/damageext/libdamageext.la $(top_builddir)/miext/damage/libdamage.la $(top_builddir)/miext/shadow/libshadow.la $(top_builddir)/Xi/libXi.la $(top_builddir)/xkb/libxkb.la $(top_builddir)/xkb/libxkbstubs.la $(top_builddir)/composite/libcomposite.la $(top_builddir)/dix/libxpstubs.la $(top_builddir)/os/libcwrapper.la $(top_builddir)/os/libos.la -lm  -lrt
 
286
XNEST_LIBS = $(top_builddir)/mi/libmi.la $(top_builddir)/config/libconfig.a -lXfont -lXau -lfontenc -lpixman-1 -lhal -ldbus-1 -lXdmcp    -lm  -lrt $(top_builddir)/fb/libfb.la $(top_builddir)/xfixes/libxfixes.la $(top_builddir)/Xext/libXext.la $(top_builddir)/dbe/libdbe.la $(top_builddir)/XTrap/libxtrap.la $(top_builddir)/record/librecord.la  $(top_builddir)/render/librender.la $(top_builddir)/randr/librandr.la $(top_builddir)/damageext/libdamageext.la $(top_builddir)/miext/damage/libdamage.la $(top_builddir)/miext/shadow/libshadow.la $(top_builddir)/Xi/libXi.la $(top_builddir)/xkb/libxkb.la $(top_builddir)/xkb/libxkbstubs.la $(top_builddir)/composite/libcomposite.la $(top_builddir)/dix/libxpstubs.la $(top_builddir)/os/libcwrapper.la $(top_builddir)/os/libos.la -lm  -lrt
288
287
XORGCFG_DEP_CFLAGS = 
289
288
XORGCFG_DEP_LIBS = 
290
289
XORGCONFIG_DEP_CFLAGS =  
292
291
XORG_CFLAGS =  -DHAVE_XORG_CONFIG_H -DXF86PM  
293
292
XORG_CORE_LIBS = $(top_builddir)/dix/libdix.la $(top_builddir)/config/libconfig.a
294
293
XORG_INCS = -I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common -I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os
295
 
XORG_LIBS = $(top_builddir)/composite/libcomposite.la $(top_builddir)/mi/libmi.la $(top_builddir)/xfixes/libxfixes.la $(top_builddir)/Xext/libXextbuiltin.la $(top_builddir)/GL/glx/libglx.la $(top_builddir)/GL/mesa/libGLcore.la $(top_builddir)/render/librender.la $(top_builddir)/randr/librandr.la $(top_builddir)/damageext/libdamageext.la $(top_builddir)/miext/damage/libdamage.la $(top_builddir)/miext/shadow/libshadow.la $(top_builddir)/Xi/libXi.la $(top_builddir)/xkb/libxkb.la $(top_builddir)/dix/libxpstubs.la $(top_builddir)/os/libos.la -ldl  
 
294
XORG_LIBS = $(top_builddir)/composite/libcomposite.la $(top_builddir)/mi/libmi.la $(top_builddir)/xfixes/libxfixes.la $(top_builddir)/Xext/libXextbuiltin.la  $(top_builddir)/render/librender.la $(top_builddir)/randr/librandr.la $(top_builddir)/damageext/libdamageext.la $(top_builddir)/miext/damage/libdamage.la $(top_builddir)/miext/shadow/libshadow.la $(top_builddir)/Xi/libXi.la $(top_builddir)/xkb/libxkb.la $(top_builddir)/dix/libxpstubs.la $(top_builddir)/os/libos.la -ldl  
296
295
XORG_MODULES_CFLAGS =  
297
296
XORG_MODULES_LIBS =  
298
297
XORG_OS = linux
312
311
XSERVER_LIBS = -lXfont -lXau -lfontenc -lpixman-1 -lhal -ldbus-1 -lXdmcp    -lm  -lrt
313
312
XTSTEXAMPLES_DEP_CFLAGS = 
314
313
XTSTEXAMPLES_DEP_LIBS = 
315
 
XVFB_LIBS = $(top_builddir)/fb/libfb.la $(top_builddir)/mi/libmi.la $(top_builddir)/xfixes/libxfixes.la $(top_builddir)/Xext/libXext.la $(top_builddir)/config/libconfig.a $(top_builddir)/dbe/libdbe.la $(top_builddir)/XTrap/libxtrap.la $(top_builddir)/record/librecord.la $(top_builddir)/GL/glx/libglx.la $(top_builddir)/GL/mesa/libGLcore.la $(top_builddir)/render/librender.la $(top_builddir)/randr/librandr.la $(top_builddir)/damageext/libdamageext.la $(top_builddir)/miext/damage/libdamage.la $(top_builddir)/miext/shadow/libshadow.la $(top_builddir)/Xi/libXi.la $(top_builddir)/xkb/libxkb.la $(top_builddir)/xkb/libxkbstubs.la $(top_builddir)/composite/libcomposite.la $(top_builddir)/dix/libxpstubs.la $(top_builddir)/os/libcwrapper.la $(top_builddir)/os/libos.la -lm  -lrt
 
314
XVFB_LIBS = $(top_builddir)/fb/libfb.la $(top_builddir)/mi/libmi.la $(top_builddir)/xfixes/libxfixes.la $(top_builddir)/Xext/libXext.la $(top_builddir)/config/libconfig.a $(top_builddir)/dbe/libdbe.la $(top_builddir)/XTrap/libxtrap.la $(top_builddir)/record/librecord.la  $(top_builddir)/render/librender.la $(top_builddir)/randr/librandr.la $(top_builddir)/damageext/libdamageext.la $(top_builddir)/miext/damage/libdamage.la $(top_builddir)/miext/shadow/libshadow.la $(top_builddir)/Xi/libXi.la $(top_builddir)/xkb/libxkb.la $(top_builddir)/xkb/libxkbstubs.la $(top_builddir)/composite/libcomposite.la $(top_builddir)/dix/libxpstubs.la $(top_builddir)/os/libcwrapper.la $(top_builddir)/os/libos.la -lm  -lrt
316
315
XWINMODULES_CFLAGS = 
317
316
XWINMODULES_LIBS = 
318
317
XWIN_LIBS = $(top_builddir)/fb/libfb.la $(top_builddir)/mi/libmi.la $(top_builddir)/Xext/libXext.la $(top_builddir)/config/libconfig.a $(top_builddir)/Xi/libXi.la $(top_builddir)/xkb/libxkb.la $(top_builddir)/xkb/libxkbstubs.la $(top_builddir)/composite/libcomposite.la $(top_builddir)/damageext/libdamageext.la  $(top_builddir)/dix/libxpstubs.la $(top_builddir)/os/libos.la 
321
320
YACC = bison -y
322
321
YFLAGS = 
323
322
__XCONFIGFILE__ = xorg.conf
324
 
abs_builddir = /home/david/debian/xorg/git/xserver/xorg-server/hw/xfree86/dixmods/extmod
325
 
abs_srcdir = /home/david/debian/xorg/git/xserver/xorg-server/hw/xfree86/dixmods/extmod
326
 
abs_top_builddir = /home/david/debian/xorg/git/xserver/xorg-server
327
 
abs_top_srcdir = /home/david/debian/xorg/git/xserver/xorg-server
 
323
abs_builddir = /tmp/tmpiQUR1i/xorg-server-1.4.1~git20080105/hw/xfree86/dixmods/extmod
 
324
abs_srcdir = /tmp/tmpiQUR1i/xorg-server-1.4.1~git20080105/hw/xfree86/dixmods/extmod
 
325
abs_top_builddir = /tmp/tmpiQUR1i/xorg-server-1.4.1~git20080105
 
326
abs_top_srcdir = /tmp/tmpiQUR1i/xorg-server-1.4.1~git20080105
328
327
ac_ct_CC = gcc
329
328
ac_ct_CXX = g++
330
329
ac_ct_F77 = g77
355
354
host_vendor = pc
356
355
htmldir = ${docdir}
357
356
includedir = ${prefix}/include
358
 
infodir = ${prefix}/share/info
359
 
install_sh = $(SHELL) /home/david/debian/xorg/git/xserver/xorg-server/install-sh
 
357
infodir = ${datarootdir}/info
 
358
install_sh = $(SHELL) /tmp/tmpiQUR1i/xorg-server-1.4.1~git20080105/install-sh
360
359
libdir = ${exec_prefix}/lib
361
360
libexecdir = ${exec_prefix}/libexec
362
361
localedir = ${datarootdir}/locale
363
 
localstatedir = /var
364
 
logdir = /var/log
365
 
mandir = ${prefix}/share/man
 
362
localstatedir = ${prefix}/var
 
363
logdir = ${prefix}/var/log
 
364
mandir = ${datarootdir}/man
366
365
mkdir_p = /bin/mkdir -p
367
366
moduledir = ${exec_prefix}/lib/xorg/modules
368
367
oldincludedir = /usr/include
374
373
sdkdir = ${prefix}/include/xorg
375
374
sharedstatedir = ${prefix}/com
376
375
srcdir = .
377
 
sysconfdir = /etc
 
376
sysconfdir = ${prefix}/etc
378
377
target_alias = 
379
378
top_builddir = ../../../..
380
379
top_srcdir = ../../../..
409
408
 
410
409
.SUFFIXES:
411
410
.SUFFIXES: .c .lo .o .obj
412
 
$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am  $(am__configure_deps)
 
411
$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
413
412
        @for dep in $?; do \
414
413
          case '$(am__configure_deps)' in \
415
414
            *$$dep*) \
434
433
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
435
434
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
436
435
 
437
 
$(top_srcdir)/configure: # $(am__configure_deps)
 
436
$(top_srcdir)/configure:  $(am__configure_deps)
438
437
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
439
 
$(ACLOCAL_M4): # $(am__aclocal_m4_deps)
 
438
$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
440
439
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
441
440
install-extsmoduleLTLIBRARIES: $(extsmodule_LTLIBRARIES)
442
441
        @$(NORMAL_INSTALL)