diff options
| author | Keith Packard <keithp@keithp.com> | 2003-09-29 01:42:40 +0000 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2003-09-29 01:42:40 +0000 |
| commit | a42384e9356ec79510682bacf08410e87d7102ff (patch) | |
| tree | d900a1f70f21fc094d9f5cff8d87050a3c54a738 /hw/kdrive/vesa | |
| parent | 6a098a88af174db1674662c09e2385b4e6e0bb4e (diff) | |
Use other freedesktop.org packages to build the server
Diffstat (limited to 'hw/kdrive/vesa')
| -rw-r--r-- | hw/kdrive/vesa/Makefile.am | 43 |
1 files changed, 20 insertions, 23 deletions
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) |