Use other freedesktop.org packages to build the server

6 files changed, 93 insertions, 102 deletions

diff --git a/hw/kdrive/fbdev/Makefile.am b/hw/kdrive/fbdev/Makefile.am
index f4849dac5..c0884d3d6 100644
--- a/hw/kdrive/fbdev/Makefile.am
+++ b/hw/kdrive/fbdev/Makefile.am
@@ -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
 
diff --git a/hw/kdrive/linux/Makefile.am b/hw/kdrive/linux/Makefile.am
index a0e8c33e2..7b95bd7fe 100644
--- a/hw/kdrive/linux/Makefile.am
+++ b/hw/kdrive/linux/Makefile.am
@@ -1,5 +1,4 @@
 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	\
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
diff --git a/hw/kdrive/mga/Makefile.am b/hw/kdrive/mga/Makefile.am
index dfccbc286..2e6403660 100644
--- a/hw/kdrive/mga/Makefile.am
+++ b/hw/kdrive/mga/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 = 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
diff --git a/hw/kdrive/src/Makefile.am b/hw/kdrive/src/Makefile.am
index 83ee461b4..44f3701a0 100644
--- a/hw/kdrive/src/Makefile.am
+++ b/hw/kdrive/src/Makefile.am
@@ -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		\
diff --git a/hw/kdrive/vesa/Makefile.am b/hw/kdrive/vesa/Makefile.am
index bf9788b55..9b4bcbe85 100644
--- a/hw/kdrive/vesa/Makefile.am
+++ b/hw/kdrive/vesa/Makefile.am
@@ -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)