← Back to branch summary

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

« back to all changes in this revision

Viewing changes to hw/xfree86/dixmods/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/Makefile
68
68
libGLcore_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
69
69
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
70
70
        $(libGLcore_la_LDFLAGS) $(LDFLAGS) -o $@
71
 
am_libGLcore_la_rpath = -rpath $(extsmoduledir)
 
71
#am_libGLcore_la_rpath = -rpath $(extsmoduledir)
72
72
libafb_la_DEPENDENCIES = $(top_builddir)/afb/libafb.la
73
73
am_libafb_la_OBJECTS = afbmodule.lo
74
74
libafb_la_OBJECTS = $(am_libafb_la_OBJECTS)
122
122
libglx_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
123
123
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
124
124
        $(libglx_la_LDFLAGS) $(LDFLAGS) -o $@
125
 
am_libglx_la_rpath = -rpath $(extsmoduledir)
 
125
#am_libglx_la_rpath = -rpath $(extsmoduledir)
126
126
libmfb_la_DEPENDENCIES = $(top_builddir)/mfb/libmfb.la
127
127
am_libmfb_la_OBJECTS = mfbmodule.lo
128
128
libmfb_la_OBJECTS = $(am_libmfb_la_OBJECTS)
142
142
libshadow_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
143
143
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
144
144
        $(libshadow_la_LDFLAGS) $(LDFLAGS) -o $@
 
145
libtype1_la_LIBADD =
 
146
am_libtype1_la_OBJECTS = type1mod.lo
 
147
libtype1_la_OBJECTS = $(am_libtype1_la_OBJECTS)
 
148
libtype1_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 
149
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 
150
        $(libtype1_la_LDFLAGS) $(LDFLAGS) -o $@
145
151
libwfb_la_DEPENDENCIES = $(top_builddir)/fb/libwfb.la
146
152
am_libwfb_la_OBJECTS = libwfb_la-fbcmap_mi.lo libwfb_la-fbmodule.lo
147
153
libwfb_la_OBJECTS = $(am_libwfb_la_OBJECTS)
176
182
        $(libfb_la_SOURCES) $(libfreetype_la_SOURCES) \
177
183
        $(libglx_la_SOURCES) $(libmfb_la_SOURCES) \
178
184
        $(librecord_la_SOURCES) $(libshadow_la_SOURCES) \
179
 
        $(libwfb_la_SOURCES) $(libxorgxkb_la_SOURCES) \
180
 
        $(libxtrap_la_SOURCES)
 
185
        $(libtype1_la_SOURCES) $(libwfb_la_SOURCES) \
 
186
        $(libxorgxkb_la_SOURCES) $(libxtrap_la_SOURCES)
181
187
DIST_SOURCES = $(libGLcore_la_SOURCES) $(libafb_la_SOURCES) \
182
188
        $(libcfb_la_SOURCES) $(libcfb32_la_SOURCES) \
183
189
        $(libdbe_la_SOURCES) $(libdixmods_la_SOURCES) \
184
190
        $(libfb_la_SOURCES) $(libfreetype_la_SOURCES) \
185
191
        $(libglx_la_SOURCES) $(libmfb_la_SOURCES) \
186
192
        $(librecord_la_SOURCES) $(libshadow_la_SOURCES) \
187
 
        $(libwfb_la_SOURCES) $(libxorgxkb_la_SOURCES) \
188
 
        $(libxtrap_la_SOURCES)
 
193
        $(libtype1_la_SOURCES) $(libwfb_la_SOURCES) \
 
194
        $(libxorgxkb_la_SOURCES) $(libxtrap_la_SOURCES)
189
195
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
190
196
        html-recursive info-recursive install-data-recursive \
191
197
        install-dvi-recursive install-exec-recursive \
199
205
CTAGS = ctags
200
206
DIST_SUBDIRS = $(SUBDIRS)
201
207
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
202
 
ACLOCAL = ${SHELL} /home/david/debian/xorg/git/xserver/xorg-server/missing --run aclocal-1.10
 
208
ACLOCAL = ${SHELL} /tmp/tmpiQUR1i/xorg-server-1.4.1~git20080105/missing --run aclocal-1.10
203
209
ADMIN_MAN_DIR = $(mandir)/man$(ADMIN_MAN_SUFFIX)
204
210
ADMIN_MAN_SUFFIX = 8
205
211
ALLOCA = 
206
 
AMTAR = ${SHELL} /home/david/debian/xorg/git/xserver/xorg-server/missing --run tar
 
212
AMTAR = ${SHELL} /tmp/tmpiQUR1i/xorg-server-1.4.1~git20080105/missing --run tar
207
213
APPDEFAULTDIR = 
208
214
APPLE_APPLICATIONS_DIR = ${exec_prefix}/bin/Applications
209
215
APP_MAN_DIR = $(mandir)/man$(APP_MAN_SUFFIX)
210
216
APP_MAN_SUFFIX = 1
211
217
AR = ar
212
218
AS = as
213
 
AUTOCONF = ${SHELL} /home/david/debian/xorg/git/xserver/xorg-server/missing --run autoconf
214
 
AUTOHEADER = ${SHELL} /home/david/debian/xorg/git/xserver/xorg-server/missing --run autoheader
215
 
AUTOMAKE = ${SHELL} /home/david/debian/xorg/git/xserver/xorg-server/missing --run automake-1.10
 
219
AUTOCONF = ${SHELL} /tmp/tmpiQUR1i/xorg-server-1.4.1~git20080105/missing --run autoconf
 
220
AUTOHEADER = ${SHELL} /tmp/tmpiQUR1i/xorg-server-1.4.1~git20080105/missing --run autoheader
 
221
AUTOMAKE = ${SHELL} /tmp/tmpiQUR1i/xorg-server-1.4.1~git20080105/missing --run automake-1.10
216
222
AWK = gawk
217
 
BASE_FONT_PATH = /usr/share/fonts/X11
218
 
BUILD_DATE = 20071112
219
 
BUILD_TIME = 1220056
 
223
BASE_FONT_PATH = /usr/local/lib/X11/fonts
 
224
BUILD_DATE = 20080106
 
225
BUILD_TIME = 1171110
220
226
CC = gcc
221
227
CCAS = gcc
222
228
CCASDEPMODE = depmode=gcc3
223
229
CCASFLAGS = -g -O2
224
230
CCDEPMODE = depmode=gcc3
225
231
CFLAGS = -g -O2
226
 
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/
 
232
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/
227
233
CPP = gcc -E
228
234
CPPFLAGS = 
229
235
CXX = g++
235
241
DBUS_CFLAGS = -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include  
236
242
DBUS_LIBS = -ldbus-1  
237
243
DEFAULT_LIBRARY_PATH = /usr/local/lib
238
 
DEFAULT_LOGPREFIX = /var/log/Xorg.
 
244
DEFAULT_LOGPREFIX = /usr/local/var/log/Xorg.
239
245
DEFAULT_MODULE_PATH = /usr/local/lib/xorg/modules
240
246
DEFS = -DHAVE_CONFIG_H
241
247
DEPDIR = .deps
270
276
FREETYPE_CFLAGS = 
271
277
FREETYPE_LIBS = 
272
278
FREETYPE_REQUIRES = 
273
 
GLX_ARCH_DEFINES = 
274
279
GLX_DEFINES = 
275
280
GL_CFLAGS =  
276
281
GL_LIBS =  
303
308
LINUXDOC = /usr/bin/linuxdoc
304
309
LN_S = ln -s
305
310
LTLIBOBJS = 
306
 
MAINT = #
307
 
MAKEINFO = ${SHELL} /home/david/debian/xorg/git/xserver/xorg-server/missing --run makeinfo
308
 
MAKE_HTML = SGML_SEARCH_PATH=/usr/local/share/sgml /usr/bin/linuxdoc  -B html --split=0
 
311
MAINT = 
 
312
MAKEINFO = ${SHELL} /tmp/tmpiQUR1i/xorg-server-1.4.1~git20080105/missing --run makeinfo
 
313
MAKE_HTML = SGML_SEARCH_PATH=NONE/share/sgml /usr/bin/linuxdoc  -B html --split=0
309
314
MAKE_PDF = /usr/bin/ps2pdf
310
 
MAKE_PS = SGML_SEARCH_PATH=/usr/local/share/sgml /usr/bin/linuxdoc -B latex --papersize=letter --output=ps
311
 
MAKE_TEXT = SGML_SEARCH_PATH=/usr/local/share/sgml GROFF_NO_SGR=y /usr/bin/linuxdoc -B txt
312
 
MESA_SOURCE = /home/david/debian/xorg/git/lib/mesa
 
315
MAKE_PS = SGML_SEARCH_PATH=NONE/share/sgml /usr/bin/linuxdoc -B latex --papersize=letter --output=ps
 
316
MAKE_TEXT = SGML_SEARCH_PATH=NONE/share/sgml GROFF_NO_SGR=y /usr/bin/linuxdoc -B txt
 
317
MESA_SOURCE = 
313
318
MISC_MAN_DIR = $(mandir)/man$(MISC_MAN_SUFFIX)
314
319
MISC_MAN_SUFFIX = 7
315
320
MKDIR_P = /bin/mkdir -p
325
330
PACKAGE = xorg-server
326
331
PACKAGE_BUGREPORT = https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
327
332
PACKAGE_NAME = xorg-server
328
 
PACKAGE_STRING = xorg-server 1.4
 
333
PACKAGE_STRING = xorg-server 1.4.0.90
329
334
PACKAGE_TARNAME = xorg-server
330
 
PACKAGE_VERSION = 1.4
 
335
PACKAGE_VERSION = 1.4.0.90
331
336
PATH_SEPARATOR = :
332
337
PERL = /usr/bin/perl
333
338
PIXMAN_CFLAGS = -I/usr/include/pixman-1  
351
356
SYS_LIBS = 
352
357
TSLIB_CFLAGS = 
353
358
TSLIB_LIBS = 
354
 
VENDOR_MAN_VERSION = Version 1.4
 
359
VENDOR_MAN_VERSION = Version 1.4.0.90
355
360
VENDOR_NAME = The X.Org Foundation
356
361
VENDOR_NAME_SHORT = X.Org
357
 
VENDOR_RELEASE = (((1) * 10000000) + ((4) * 100000) + ((0) * 1000) + 0)
358
 
VERSION = 1.4
 
362
VENDOR_RELEASE = (((1) * 10000000) + ((4) * 100000) + ((0) * 1000) + 90)
 
363
VERSION = 1.4.0.90
359
364
X11EXAMPLES_DEP_CFLAGS = 
360
365
X11EXAMPLES_DEP_LIBS = 
361
366
XDMCP_CFLAGS =  
382
387
XGLX_LIBS = 
383
388
XGL_LIBS = 
384
389
XGL_MODULE_PATH = 
385
 
XKB_BASE_DIRECTORY = /usr/share/X11/xkb
 
390
XKB_BASE_DIRECTORY = /usr/local/share/X11/xkb
386
391
XKB_BIN_DIRECTORY = /usr/local/bin
387
 
XKB_COMPILED_DIR = /var/lib/xkb
388
 
XKM_OUTPUT_DIR = /var/lib/xkb/
389
 
XLIB_CFLAGS =  
390
 
XLIB_LIBS = -lX11  
 
392
XKB_COMPILED_DIR = /usr/local/share/X11/xkb/compiled
 
393
XKM_OUTPUT_DIR = /usr/local/share/X11/xkb/compiled/
 
394
XLIB_CFLAGS = 
 
395
XLIB_LIBS = 
391
396
XNESTMODULES_CFLAGS = -I/usr/include/freetype2  
392
397
XNESTMODULES_LIBS = -lXfont -lXext -lX11 -lXau -lXdmcp  
393
 
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
 
398
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
394
399
XORGCFG_DEP_CFLAGS = 
395
400
XORGCFG_DEP_LIBS = 
396
401
XORGCONFIG_DEP_CFLAGS =  
398
403
XORG_CFLAGS =  -DHAVE_XORG_CONFIG_H -DXF86PM  
399
404
XORG_CORE_LIBS = $(top_builddir)/dix/libdix.la $(top_builddir)/config/libconfig.a
400
405
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
401
 
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  
 
406
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  
402
407
XORG_MODULES_CFLAGS =  
403
408
XORG_MODULES_LIBS =  
404
409
XORG_OS = linux
418
423
XSERVER_LIBS = -lXfont -lXau -lfontenc -lpixman-1 -lhal -ldbus-1 -lXdmcp    -lm  -lrt
419
424
XTSTEXAMPLES_DEP_CFLAGS = 
420
425
XTSTEXAMPLES_DEP_LIBS = 
421
 
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
 
426
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
422
427
XWINMODULES_CFLAGS = 
423
428
XWINMODULES_LIBS = 
424
429
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 
427
432
YACC = bison -y
428
433
YFLAGS = 
429
434
__XCONFIGFILE__ = xorg.conf
430
 
abs_builddir = /home/david/debian/xorg/git/xserver/xorg-server/hw/xfree86/dixmods
431
 
abs_srcdir = /home/david/debian/xorg/git/xserver/xorg-server/hw/xfree86/dixmods
432
 
abs_top_builddir = /home/david/debian/xorg/git/xserver/xorg-server
433
 
abs_top_srcdir = /home/david/debian/xorg/git/xserver/xorg-server
 
435
abs_builddir = /tmp/tmpiQUR1i/xorg-server-1.4.1~git20080105/hw/xfree86/dixmods
 
436
abs_srcdir = /tmp/tmpiQUR1i/xorg-server-1.4.1~git20080105/hw/xfree86/dixmods
 
437
abs_top_builddir = /tmp/tmpiQUR1i/xorg-server-1.4.1~git20080105
 
438
abs_top_srcdir = /tmp/tmpiQUR1i/xorg-server-1.4.1~git20080105
434
439
ac_ct_CC = gcc
435
440
ac_ct_CXX = g++
436
441
ac_ct_F77 = g77
461
466
host_vendor = pc
462
467
htmldir = ${docdir}
463
468
includedir = ${prefix}/include
464
 
infodir = ${prefix}/share/info
465
 
install_sh = $(SHELL) /home/david/debian/xorg/git/xserver/xorg-server/install-sh
 
469
infodir = ${datarootdir}/info
 
470
install_sh = $(SHELL) /tmp/tmpiQUR1i/xorg-server-1.4.1~git20080105/install-sh
466
471
libdir = ${exec_prefix}/lib
467
472
libexecdir = ${exec_prefix}/libexec
468
473
localedir = ${datarootdir}/locale
469
 
localstatedir = /var
470
 
logdir = /var/log
471
 
mandir = ${prefix}/share/man
 
474
localstatedir = ${prefix}/var
 
475
logdir = ${prefix}/var/log
 
476
mandir = ${datarootdir}/man
472
477
mkdir_p = /bin/mkdir -p
473
478
moduledir = ${exec_prefix}/lib/xorg/modules
474
479
oldincludedir = /usr/include
480
485
sdkdir = ${prefix}/include/xorg
481
486
sharedstatedir = ${prefix}/com
482
487
srcdir = .
483
 
sysconfdir = /etc
 
488
sysconfdir = ${prefix}/etc
484
489
target_alias = 
485
490
top_builddir = ../../..
486
491
top_srcdir = ../../..
488
493
xpconfigdir = 
489
494
noinst_LTLIBRARIES = libdixmods.la libxorgxkb.la
490
495
SUBDIRS = extmod
491
 
GLXMODS = libglx.la libGLcore.la
 
496
#GLXMODS = libglx.la libGLcore.la
492
497
XTRAPMOD = libxtrap.la
493
498
DBEMOD = libdbe.la
494
499
AFBMOD = libafb.la
508
513
                         $(XTRAPMOD)
509
514
 
510
515
fontsmoduledir = $(moduledir)/fonts
511
 
fontsmodule_LTLIBRARIES = libfreetype.la
 
516
fontsmodule_LTLIBRARIES = libfreetype.la \
 
517
                          libtype1.la
 
518
 
512
519
AM_CFLAGS =  -DHAVE_XORG_CONFIG_H -DXF86PM   -DHAVE_DIX_CONFIG_H -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -fno-strict-aliasing -D_BSD_SOURCE -DHAS_FCHOWN -DHAS_STICKY_DIR_BIT -DDBUS_API_SUBJECT_TO_CHANGE -I/usr/include/freetype2 -I/usr/include/pixman-1 -I/usr/include/hal -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include   -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/Xext -I$(top_srcdir)/composite -I$(top_srcdir)/damageext -I$(top_srcdir)/xfixes -I$(top_srcdir)/Xi -I$(top_srcdir)/mi -I$(top_srcdir)/miext/shadow  -I$(top_srcdir)/miext/damage -I$(top_srcdir)/render -I$(top_srcdir)/randr -I$(top_srcdir)/fb
513
520
INCLUDES = -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 \
514
521
           -I$(top_srcdir)/dbe \
540
547
libwfb_la_SOURCES = $(top_builddir)/fb/fbcmap_mi.c fbmodule.c
541
548
libwfb_la_CFLAGS = $(AM_CFLAGS) -DFB_ACCESS_WRAPPER
542
549
libglx_la_LDFLAGS = -avoid-version
543
 
GLXDRI_LIBRARY = $(top_builddir)/GL/glx/libglxdri.la
 
550
#GLXDRI_LIBRARY = $(top_builddir)/GL/glx/libglxdri.la
544
551
libglx_la_LIBADD = \
545
552
        $(top_builddir)/GL/glx/libglx.la \
546
553
        $(GLXDRI_LIBRARY)
557
564
libshadow_la_SOURCES = shmodule.c
558
565
libfreetype_la_LDFLAGS = -avoid-version
559
566
libfreetype_la_SOURCES = ftmodule.c
 
567
libtype1_la_LDFLAGS = -avoid-version
 
568
libtype1_la_SOURCES = type1mod.c
560
569
libdixmods_la_SOURCES = $(top_srcdir)/mi/miinitext.c
561
570
libdixmods_la_CFLAGS = -DXFree86LOADER $(AM_CFLAGS)
562
571
libxorgxkb_la_SOURCES = xkbVT.c xkbPrivate.c xkbKillSrv.c
568
577
 
569
578
.SUFFIXES:
570
579
.SUFFIXES: .c .lo .o .obj
571
 
$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am  $(am__configure_deps)
 
580
$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
572
581
        @for dep in $?; do \
573
582
          case '$(am__configure_deps)' in \
574
583
            *$$dep*) \
593
602
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
594
603
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
595
604
 
596
 
$(top_srcdir)/configure: # $(am__configure_deps)
 
605
$(top_srcdir)/configure:  $(am__configure_deps)
597
606
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
598
 
$(ACLOCAL_M4): # $(am__aclocal_m4_deps)
 
607
$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
599
608
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
600
609
install-extsmoduleLTLIBRARIES: $(extsmodule_LTLIBRARIES)
601
610
        @$(NORMAL_INSTALL)
711
720
        $(librecord_la_LINK) -rpath $(extsmoduledir) $(librecord_la_OBJECTS) $(librecord_la_LIBADD) $(LIBS)
712
721
libshadow.la: $(libshadow_la_OBJECTS) $(libshadow_la_DEPENDENCIES) 
713
722
        $(libshadow_la_LINK) -rpath $(moduledir) $(libshadow_la_OBJECTS) $(libshadow_la_LIBADD) $(LIBS)
 
723
libtype1.la: $(libtype1_la_OBJECTS) $(libtype1_la_DEPENDENCIES) 
 
724
        $(libtype1_la_LINK) -rpath $(fontsmoduledir) $(libtype1_la_OBJECTS) $(libtype1_la_LIBADD) $(LIBS)
714
725
libwfb.la: $(libwfb_la_OBJECTS) $(libwfb_la_DEPENDENCIES) 
715
726
        $(libwfb_la_LINK) -rpath $(moduledir) $(libwfb_la_OBJECTS) $(libwfb_la_LIBADD) $(LIBS)
716
727
libxorgxkb.la: $(libxorgxkb_la_OBJECTS) $(libxorgxkb_la_DEPENDENCIES) 
739
750
include ./$(DEPDIR)/mfbmodule.Plo
740
751
include ./$(DEPDIR)/recordmod.Plo
741
752
include ./$(DEPDIR)/shmodule.Plo
 
753
include ./$(DEPDIR)/type1mod.Plo
742
754
include ./$(DEPDIR)/xf86XTrapModule.Plo
743
755
include ./$(DEPDIR)/xkbKillSrv.Plo
744
756
include ./$(DEPDIR)/xkbPrivate.Plo