← Back to branch summary

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

« back to all changes in this revision

Viewing changes to hw/xfree86/os-support/bus/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/os-support/bus/Makefile
108
108
ETAGS = etags
109
109
CTAGS = ctags
110
110
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
111
 
ACLOCAL = ${SHELL} /home/david/debian/xorg/git/xserver/xorg-server/missing --run aclocal-1.10
 
111
ACLOCAL = ${SHELL} /tmp/tmpiQUR1i/xorg-server-1.4.1~git20080105/missing --run aclocal-1.10
112
112
ADMIN_MAN_DIR = $(mandir)/man$(ADMIN_MAN_SUFFIX)
113
113
ADMIN_MAN_SUFFIX = 8
114
114
ALLOCA = 
115
 
AMTAR = ${SHELL} /home/david/debian/xorg/git/xserver/xorg-server/missing --run tar
 
115
AMTAR = ${SHELL} /tmp/tmpiQUR1i/xorg-server-1.4.1~git20080105/missing --run tar
116
116
APPDEFAULTDIR = 
117
117
APPLE_APPLICATIONS_DIR = ${exec_prefix}/bin/Applications
118
118
APP_MAN_DIR = $(mandir)/man$(APP_MAN_SUFFIX)
119
119
APP_MAN_SUFFIX = 1
120
120
AR = ar
121
121
AS = as
122
 
AUTOCONF = ${SHELL} /home/david/debian/xorg/git/xserver/xorg-server/missing --run autoconf
123
 
AUTOHEADER = ${SHELL} /home/david/debian/xorg/git/xserver/xorg-server/missing --run autoheader
124
 
AUTOMAKE = ${SHELL} /home/david/debian/xorg/git/xserver/xorg-server/missing --run automake-1.10
 
122
AUTOCONF = ${SHELL} /tmp/tmpiQUR1i/xorg-server-1.4.1~git20080105/missing --run autoconf
 
123
AUTOHEADER = ${SHELL} /tmp/tmpiQUR1i/xorg-server-1.4.1~git20080105/missing --run autoheader
 
124
AUTOMAKE = ${SHELL} /tmp/tmpiQUR1i/xorg-server-1.4.1~git20080105/missing --run automake-1.10
125
125
AWK = gawk
126
 
BASE_FONT_PATH = /usr/share/fonts/X11
127
 
BUILD_DATE = 20071112
128
 
BUILD_TIME = 1220056
 
126
BASE_FONT_PATH = /usr/local/lib/X11/fonts
 
127
BUILD_DATE = 20080106
 
128
BUILD_TIME = 1171110
129
129
CC = gcc
130
130
CCAS = gcc
131
131
CCASDEPMODE = depmode=gcc3
132
132
CCASFLAGS = -g -O2
133
133
CCDEPMODE = depmode=gcc3
134
134
CFLAGS = -g -O2
135
 
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/
 
135
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/
136
136
CPP = gcc -E
137
137
CPPFLAGS = 
138
138
CXX = g++
144
144
DBUS_CFLAGS = -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include  
145
145
DBUS_LIBS = -ldbus-1  
146
146
DEFAULT_LIBRARY_PATH = /usr/local/lib
147
 
DEFAULT_LOGPREFIX = /var/log/Xorg.
 
147
DEFAULT_LOGPREFIX = /usr/local/var/log/Xorg.
148
148
DEFAULT_MODULE_PATH = /usr/local/lib/xorg/modules
149
149
DEFS = -DHAVE_CONFIG_H
150
150
DEPDIR = .deps
179
179
FREETYPE_CFLAGS = 
180
180
FREETYPE_LIBS = 
181
181
FREETYPE_REQUIRES = 
182
 
GLX_ARCH_DEFINES = 
183
182
GLX_DEFINES = 
184
183
GL_CFLAGS =  
185
184
GL_LIBS =  
212
211
LINUXDOC = /usr/bin/linuxdoc
213
212
LN_S = ln -s
214
213
LTLIBOBJS = 
215
 
MAINT = #
216
 
MAKEINFO = ${SHELL} /home/david/debian/xorg/git/xserver/xorg-server/missing --run makeinfo
217
 
MAKE_HTML = SGML_SEARCH_PATH=/usr/local/share/sgml /usr/bin/linuxdoc  -B html --split=0
 
214
MAINT = 
 
215
MAKEINFO = ${SHELL} /tmp/tmpiQUR1i/xorg-server-1.4.1~git20080105/missing --run makeinfo
 
216
MAKE_HTML = SGML_SEARCH_PATH=NONE/share/sgml /usr/bin/linuxdoc  -B html --split=0
218
217
MAKE_PDF = /usr/bin/ps2pdf
219
 
MAKE_PS = SGML_SEARCH_PATH=/usr/local/share/sgml /usr/bin/linuxdoc -B latex --papersize=letter --output=ps
220
 
MAKE_TEXT = SGML_SEARCH_PATH=/usr/local/share/sgml GROFF_NO_SGR=y /usr/bin/linuxdoc -B txt
221
 
MESA_SOURCE = /home/david/debian/xorg/git/lib/mesa
 
218
MAKE_PS = SGML_SEARCH_PATH=NONE/share/sgml /usr/bin/linuxdoc -B latex --papersize=letter --output=ps
 
219
MAKE_TEXT = SGML_SEARCH_PATH=NONE/share/sgml GROFF_NO_SGR=y /usr/bin/linuxdoc -B txt
 
220
MESA_SOURCE = 
222
221
MISC_MAN_DIR = $(mandir)/man$(MISC_MAN_SUFFIX)
223
222
MISC_MAN_SUFFIX = 7
224
223
MKDIR_P = /bin/mkdir -p
234
233
PACKAGE = xorg-server
235
234
PACKAGE_BUGREPORT = https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
236
235
PACKAGE_NAME = xorg-server
237
 
PACKAGE_STRING = xorg-server 1.4
 
236
PACKAGE_STRING = xorg-server 1.4.0.90
238
237
PACKAGE_TARNAME = xorg-server
239
 
PACKAGE_VERSION = 1.4
 
238
PACKAGE_VERSION = 1.4.0.90
240
239
PATH_SEPARATOR = :
241
240
PERL = /usr/bin/perl
242
241
PIXMAN_CFLAGS = -I/usr/include/pixman-1  
260
259
SYS_LIBS = 
261
260
TSLIB_CFLAGS = 
262
261
TSLIB_LIBS = 
263
 
VENDOR_MAN_VERSION = Version 1.4
 
262
VENDOR_MAN_VERSION = Version 1.4.0.90
264
263
VENDOR_NAME = The X.Org Foundation
265
264
VENDOR_NAME_SHORT = X.Org
266
 
VENDOR_RELEASE = (((1) * 10000000) + ((4) * 100000) + ((0) * 1000) + 0)
267
 
VERSION = 1.4
 
265
VENDOR_RELEASE = (((1) * 10000000) + ((4) * 100000) + ((0) * 1000) + 90)
 
266
VERSION = 1.4.0.90
268
267
X11EXAMPLES_DEP_CFLAGS = 
269
268
X11EXAMPLES_DEP_LIBS = 
270
269
XDMCP_CFLAGS =  
291
290
XGLX_LIBS = 
292
291
XGL_LIBS = 
293
292
XGL_MODULE_PATH = 
294
 
XKB_BASE_DIRECTORY = /usr/share/X11/xkb
 
293
XKB_BASE_DIRECTORY = /usr/local/share/X11/xkb
295
294
XKB_BIN_DIRECTORY = /usr/local/bin
296
 
XKB_COMPILED_DIR = /var/lib/xkb
297
 
XKM_OUTPUT_DIR = /var/lib/xkb/
298
 
XLIB_CFLAGS =  
299
 
XLIB_LIBS = -lX11  
 
295
XKB_COMPILED_DIR = /usr/local/share/X11/xkb/compiled
 
296
XKM_OUTPUT_DIR = /usr/local/share/X11/xkb/compiled/
 
297
XLIB_CFLAGS = 
 
298
XLIB_LIBS = 
300
299
XNESTMODULES_CFLAGS = -I/usr/include/freetype2  
301
300
XNESTMODULES_LIBS = -lXfont -lXext -lX11 -lXau -lXdmcp  
302
 
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
 
301
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
303
302
XORGCFG_DEP_CFLAGS = 
304
303
XORGCFG_DEP_LIBS = 
305
304
XORGCONFIG_DEP_CFLAGS =  
307
306
XORG_CFLAGS =  -DHAVE_XORG_CONFIG_H -DXF86PM  
308
307
XORG_CORE_LIBS = $(top_builddir)/dix/libdix.la $(top_builddir)/config/libconfig.a
309
308
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
310
 
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  
 
309
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  
311
310
XORG_MODULES_CFLAGS =  
312
311
XORG_MODULES_LIBS =  
313
312
XORG_OS = linux
327
326
XSERVER_LIBS = -lXfont -lXau -lfontenc -lpixman-1 -lhal -ldbus-1 -lXdmcp    -lm  -lrt
328
327
XTSTEXAMPLES_DEP_CFLAGS = 
329
328
XTSTEXAMPLES_DEP_LIBS = 
330
 
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
 
329
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
331
330
XWINMODULES_CFLAGS = 
332
331
XWINMODULES_LIBS = 
333
332
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 
336
335
YACC = bison -y
337
336
YFLAGS = 
338
337
__XCONFIGFILE__ = xorg.conf
339
 
abs_builddir = /home/david/debian/xorg/git/xserver/xorg-server/hw/xfree86/os-support/bus
340
 
abs_srcdir = /home/david/debian/xorg/git/xserver/xorg-server/hw/xfree86/os-support/bus
341
 
abs_top_builddir = /home/david/debian/xorg/git/xserver/xorg-server
342
 
abs_top_srcdir = /home/david/debian/xorg/git/xserver/xorg-server
 
338
abs_builddir = /tmp/tmpiQUR1i/xorg-server-1.4.1~git20080105/hw/xfree86/os-support/bus
 
339
abs_srcdir = /tmp/tmpiQUR1i/xorg-server-1.4.1~git20080105/hw/xfree86/os-support/bus
 
340
abs_top_builddir = /tmp/tmpiQUR1i/xorg-server-1.4.1~git20080105
 
341
abs_top_srcdir = /tmp/tmpiQUR1i/xorg-server-1.4.1~git20080105
343
342
ac_ct_CC = gcc
344
343
ac_ct_CXX = g++
345
344
ac_ct_F77 = g77
370
369
host_vendor = pc
371
370
htmldir = ${docdir}
372
371
includedir = ${prefix}/include
373
 
infodir = ${prefix}/share/info
374
 
install_sh = $(SHELL) /home/david/debian/xorg/git/xserver/xorg-server/install-sh
 
372
infodir = ${datarootdir}/info
 
373
install_sh = $(SHELL) /tmp/tmpiQUR1i/xorg-server-1.4.1~git20080105/install-sh
375
374
libdir = ${exec_prefix}/lib
376
375
libexecdir = ${exec_prefix}/libexec
377
376
localedir = ${datarootdir}/locale
378
 
localstatedir = /var
379
 
logdir = /var/log
380
 
mandir = ${prefix}/share/man
 
377
localstatedir = ${prefix}/var
 
378
logdir = ${prefix}/var/log
 
379
mandir = ${datarootdir}/man
381
380
mkdir_p = /bin/mkdir -p
382
381
moduledir = ${exec_prefix}/lib/xorg/modules
383
382
oldincludedir = /usr/include
389
388
sdkdir = ${prefix}/include/xorg
390
389
sharedstatedir = ${prefix}/com
391
390
srcdir = .
392
 
sysconfdir = /etc
 
391
sysconfdir = ${prefix}/etc
393
392
target_alias = 
394
393
top_builddir = ../../../..
395
394
top_srcdir = ../../../..
421
420
 
422
421
.SUFFIXES:
423
422
.SUFFIXES: .c .lo .o .obj
424
 
$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am  $(am__configure_deps)
 
423
$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
425
424
        @for dep in $?; do \
426
425
          case '$(am__configure_deps)' in \
427
426
            *$$dep*) \
446
445
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
447
446
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
448
447
 
449
 
$(top_srcdir)/configure: # $(am__configure_deps)
 
448
$(top_srcdir)/configure:  $(am__configure_deps)
450
449
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
451
 
$(ACLOCAL_M4): # $(am__aclocal_m4_deps)
 
450
$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
452
451
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
453
452
 
454
453
clean-noinstLTLIBRARIES: