Commit a42384e9 authored by Keith Packard's avatar Keith Packard

Use other freedesktop.org packages to build the server

parent 6a098a88
......@@ -6,37 +6,35 @@ INCLUDES = \
-I$(top_srcdir)/miext/layer \
-I$(top_srcdir)/miext/shadow \
-I$(top_srcdir)/randr \
-I$(top_srcdir)/render
-I$(top_srcdir)/render \
$(XSERVER_CFLAGS)
bin_PROGRAMS = Xfbdev
noinst_LTLIBRARIES = libfbdev.la
noinst_LIBRARIES = libfbdev.a
libfbdev_la_SOURCES = \
libfbdev_a_SOURCES = \
fbdev.c
Xfbdev_SOURCES = \
fbinit.c
Xfbdev_LDADD = \
$(top_builddir)/hw/kdrive/fbdev/libfbdev.la \
$(top_builddir)/dix/libdix.la \
$(top_builddir)/os/libos.la \
$(top_builddir)/miext/layer/liblayer.la \
$(top_builddir)/hw/kdrive/src/libkdrive.la \
$(top_builddir)/hw/kdrive/linux/liblinux.la \
$(top_builddir)/miext/shadow/libshadow.la \
$(top_builddir)/randr/librandr.la \
$(top_builddir)/render/librender.la \
$(top_builddir)/fb/libfb.la \
$(top_builddir)/mi/libmi.la \
$(top_builddir)/Xext/libXext.la \
$(top_builddir)/randr/librandr.la \
$(top_builddir)/render/librender.la \
$(top_builddir)/xtrans/libxtrans.la \
@XFONT_LIBS@ \
$(X_LIBS) -lXau -lXdmcp \
$(top_builddir)/dix/libxpstubs.la \
-lfreetype -lm -lz
$(top_builddir)/hw/kdrive/fbdev/libfbdev.a \
$(top_builddir)/dix/libdix.a \
$(top_builddir)/os/libos.a \
$(top_builddir)/miext/layer/liblayer.a \
$(top_builddir)/hw/kdrive/src/libkdrive.a \
$(top_builddir)/hw/kdrive/linux/liblinux.a \
$(top_builddir)/miext/shadow/libshadow.a \
$(top_builddir)/randr/librandr.a \
$(top_builddir)/render/librender.a \
$(top_builddir)/fb/libfb.a \
$(top_builddir)/mi/libmi.a \
$(top_builddir)/Xext/libXext.a \
$(top_builddir)/randr/librandr.a \
$(top_builddir)/render/librender.a \
$(top_builddir)/dix/libxpstubs.a \
$(XSERVER_LIBS) \
-lm -lz
INCLUDES = \
$(X_CFLAGS) \
-I$(top_srcdir)/hw/kdrive/src \
-I$(top_srcdir)/include \
-I$(top_srcdir)/mi \
......@@ -7,12 +6,13 @@ INCLUDES = \
-I$(top_srcdir)/miext/layer \
-I$(top_srcdir)/miext/shadow \
-I$(top_srcdir)/randr \
-I$(top_srcdir)/render
-I$(top_srcdir)/render \
$(XSERVER_CFLAGS)
noinst_LTLIBRARIES = liblinux.la
noinst_LIBRARIES = liblinux.a
liblinux_la_SOURCES = \
liblinux_a_SOURCES = \
agp.c \
bus.c \
keyboard.c \
......
......@@ -7,14 +7,14 @@ INCLUDES = \
-I$(top_srcdir)/miext/layer \
-I$(top_srcdir)/miext/shadow \
-I$(top_srcdir)/randr \
-I$(top_srcdir)/render
-I$(top_srcdir)/render \
$(XSERVER_CFLAGS)
bin_PROGRAMS = Xmach64
noinst_LTLIBRARIES = libmach64.la
noinst_LIBRARIES = libmach64.a
libmach64_la_SOURCES = \
libmach64_a_SOURCES = \
mach64.c \
mach64draw.c \
mach64video.c \
......@@ -27,23 +27,21 @@ Xmach64_SOURCES = \
mach64stub.c
Xmach64_LDADD = \
$(top_builddir)/hw/kdrive/mach64/libmach64.la \
$(top_builddir)/hw/kdrive/vesa/libvesa.la \
$(top_builddir)/dix/libdix.la \
$(top_builddir)/os/libos.la \
$(top_builddir)/miext/layer/liblayer.la \
$(top_builddir)/hw/kdrive/src/libkdrive.la \
$(top_builddir)/hw/kdrive/linux/liblinux.la \
$(top_builddir)/miext/shadow/libshadow.la \
$(top_builddir)/randr/librandr.la \
$(top_builddir)/render/librender.la \
$(top_builddir)/fb/libfb.la \
$(top_builddir)/mi/libmi.la \
$(top_builddir)/Xext/libXext.la \
$(top_builddir)/randr/librandr.la \
$(top_builddir)/render/librender.la \
$(top_builddir)/xtrans/libxtrans.la \
@XFONT_LIBS@ \
$(X_LIBS) -lXau -lXdmcp \
$(top_builddir)/dix/libxpstubs.la \
-lfreetype -lm -lz
$(top_builddir)/hw/kdrive/mach64/libmach64.a \
$(top_builddir)/hw/kdrive/vesa/libvesa.a \
$(top_builddir)/dix/libdix.a \
$(top_builddir)/os/libos.a \
$(top_builddir)/miext/layer/liblayer.a \
$(top_builddir)/hw/kdrive/src/libkdrive.a \
$(top_builddir)/hw/kdrive/linux/liblinux.a \
$(top_builddir)/miext/shadow/libshadow.a \
$(top_builddir)/randr/librandr.a \
$(top_builddir)/render/librender.a \
$(top_builddir)/fb/libfb.a \
$(top_builddir)/mi/libmi.a \
$(top_builddir)/Xext/libXext.a \
$(top_builddir)/randr/librandr.a \
$(top_builddir)/render/librender.a \
$(top_builddir)/dix/libxpstubs.a \
$(XSERVER_LIBS) \
-lm -lz
......@@ -7,14 +7,14 @@ INCLUDES = \
-I$(top_srcdir)/miext/layer \
-I$(top_srcdir)/miext/shadow \
-I$(top_srcdir)/randr \
-I$(top_srcdir)/render
-I$(top_srcdir)/render \
$(XSERVER_CFLAGS)
bin_PROGRAMS = Xmga
noinst_LTLIBRARIES = libmga.la
noinst_LIBRARIES = libmga.a
libmga_la_SOURCES = \
libmga_a_SOURCES = \
mgadraw.c \
mga.c \
mga.h
......@@ -23,23 +23,21 @@ Xmga_SOURCES = \
mgastub.c
Xmga_LDADD = \
$(top_builddir)/hw/kdrive/mga/libmga.la \
$(top_builddir)/hw/kdrive/vesa/libvesa.la \
$(top_builddir)/dix/libdix.la \
$(top_builddir)/os/libos.la \
$(top_builddir)/miext/layer/liblayer.la \
$(top_builddir)/hw/kdrive/src/libkdrive.la \
$(top_builddir)/hw/kdrive/linux/liblinux.la \
$(top_builddir)/miext/shadow/libshadow.la \
$(top_builddir)/randr/librandr.la \
$(top_builddir)/render/librender.la \
$(top_builddir)/fb/libfb.la \
$(top_builddir)/mi/libmi.la \
$(top_builddir)/Xext/libXext.la \
$(top_builddir)/randr/librandr.la \
$(top_builddir)/render/librender.la \
$(top_builddir)/xtrans/libxtrans.la \
@XFONT_LIBS@ \
$(X_LIBS) -lXau -lXdmcp \
$(top_builddir)/dix/libxpstubs.la \
-lfreetype -lm -lz
$(top_builddir)/hw/kdrive/mga/libmga.a \
$(top_builddir)/hw/kdrive/vesa/libvesa.a \
$(top_builddir)/dix/libdix.a \
$(top_builddir)/os/libos.a \
$(top_builddir)/miext/layer/liblayer.a \
$(top_builddir)/hw/kdrive/src/libkdrive.a \
$(top_builddir)/hw/kdrive/linux/liblinux.a \
$(top_builddir)/miext/shadow/libshadow.a \
$(top_builddir)/randr/librandr.a \
$(top_builddir)/render/librender.a \
$(top_builddir)/fb/libfb.a \
$(top_builddir)/mi/libmi.a \
$(top_builddir)/Xext/libXext.a \
$(top_builddir)/randr/librandr.a \
$(top_builddir)/render/librender.a \
$(top_builddir)/dix/libxpstubs.a \
$(XSERVER_LIBS) \
-lm -lz
......@@ -4,12 +4,12 @@ INCLUDES = \
-I$(top_srcdir)/mi \
-I$(top_srcdir)/miext/shadow \
-I$(top_srcdir)/randr \
-I$(top_srcdir)/render
-I$(top_srcdir)/render \
$(XSERVER_CFLAGS)
noinst_LIBRARIES = libkdrive.a
noinst_LTLIBRARIES = libkdrive.la
libkdrive_la_SOURCES = \
libkdrive_a_SOURCES = \
kaa.c \
kasync.c \
kcmap.c \
......
......@@ -6,14 +6,14 @@ INCLUDES = \
-I$(top_srcdir)/miext/layer \
-I$(top_srcdir)/miext/shadow \
-I$(top_srcdir)/randr \
-I$(top_srcdir)/render
-I$(top_srcdir)/render \
$(XSERVER_CFLAGS)
bin_PROGRAMS = Xvesa
noinst_LTLIBRARIES = libvesa.la
noinst_LIBRARIES = libvesa.a
libvesa_la_SOURCES = \
libvesa_a_SOURCES = \
vesa.c \
vbe.c \
vga.c \
......@@ -23,22 +23,19 @@ Xvesa_SOURCES = \
vesainit.c
Xvesa_LDADD = \
$(top_builddir)/hw/kdrive/vesa/libvesa.la \
$(top_builddir)/dix/libdix.la \
$(top_builddir)/os/libos.la \
$(top_builddir)/miext/layer/liblayer.la \
$(top_builddir)/hw/kdrive/src/libkdrive.la \
$(top_builddir)/hw/kdrive/linux/liblinux.la \
$(top_builddir)/miext/shadow/libshadow.la \
$(top_builddir)/randr/librandr.la \
$(top_builddir)/render/librender.la \
$(top_builddir)/fb/libfb.la \
$(top_builddir)/mi/libmi.la \
$(top_builddir)/Xext/libXext.la \
$(top_builddir)/randr/librandr.la \
$(top_builddir)/render/librender.la \
$(top_builddir)/xtrans/libxtrans.la \
@XFONT_LIBS@ \
$(X_LIBS) -lXau -lXdmcp \
$(top_builddir)/dix/libxpstubs.la \
-lfreetype -lm -lz
$(top_builddir)/hw/kdrive/vesa/libvesa.a \
$(top_builddir)/dix/libdix.a \
$(top_builddir)/os/libos.a \
$(top_builddir)/miext/layer/liblayer.a \
$(top_builddir)/hw/kdrive/src/libkdrive.a \
$(top_builddir)/hw/kdrive/linux/liblinux.a \
$(top_builddir)/miext/shadow/libshadow.a \
$(top_builddir)/randr/librandr.a \
$(top_builddir)/render/librender.a \
$(top_builddir)/fb/libfb.a \
$(top_builddir)/mi/libmi.a \
$(top_builddir)/Xext/libXext.a \
$(top_builddir)/randr/librandr.a \
$(top_builddir)/render/librender.a \
$(top_builddir)/dix/libxpstubs.a \
$(XSERVER_LIBS)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment