summaryrefslogtreecommitdiff
path: root/hw/kdrive/mach64/Makefile.am
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2003-09-29 01:42:40 +0000
committerKeith Packard <keithp@keithp.com>2003-09-29 01:42:40 +0000
commita42384e9356ec79510682bacf08410e87d7102ff (patch)
treed900a1f70f21fc094d9f5cff8d87050a3c54a738 /hw/kdrive/mach64/Makefile.am
parent6a098a88af174db1674662c09e2385b4e6e0bb4e (diff)
Use other freedesktop.org packages to build the server
Diffstat (limited to 'hw/kdrive/mach64/Makefile.am')
-rw-r--r--hw/kdrive/mach64/Makefile.am46
1 files changed, 22 insertions, 24 deletions
diff --git a/hw/kdrive/mach64/Makefile.am b/hw/kdrive/mach64/Makefile.am
index bb2bd2440..b437463dd 100644
--- a/hw/kdrive/mach64/Makefile.am
+++ b/hw/kdrive/mach64/Makefile.am
@@ -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