diff options
| author | Keith Packard <keithp@keithp.com> | 2003-11-02 19:56:10 +0000 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2003-11-02 19:56:10 +0000 |
| commit | 5378236aa647ec9a723a3e5fbd2a57eb286a1938 (patch) | |
| tree | b178d5f95a4882d617dbbdab8cb5e0b40003a704 /hw/kdrive/mach64/Makefile.am | |
| parent | 9e94665cf9cf0f74dff5b3cdaa4cde99e234fa45 (diff) | |
merge xfixes_2_branch back to HEAD
Diffstat (limited to 'hw/kdrive/mach64/Makefile.am')
| -rw-r--r-- | hw/kdrive/mach64/Makefile.am | 43 |
1 files changed, 12 insertions, 31 deletions
diff --git a/hw/kdrive/mach64/Makefile.am b/hw/kdrive/mach64/Makefile.am index 2a960ec5f..ff9282e60 100644 --- a/hw/kdrive/mach64/Makefile.am +++ b/hw/kdrive/mach64/Makefile.am @@ -1,14 +1,7 @@ INCLUDES = \ - -I$(top_srcdir)/fb \ - -I$(top_srcdir)/hw/kdrive/src \ - -I$(top_srcdir)/hw/kdrive/linux \ + @KDRIVE_INCS@ \ -I$(top_srcdir)/hw/kdrive/vesa \ - -I$(top_srcdir)/mi \ - -I$(top_srcdir)/miext/layer \ - -I$(top_srcdir)/miext/shadow \ - -I$(top_srcdir)/randr \ - -I$(top_srcdir)/render \ - $(XSERVER_CFLAGS) + @XSERVER_CFLAGS@ bin_PROGRAMS = Xmach64 @@ -22,28 +15,16 @@ libmach64_a_SOURCES = \ mach64.h \ mach64draw.h - Xmach64_SOURCES = \ mach64stub.c -Xmach64_LDADD = \ - 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)/xfixes/libxfixes.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)/xfixes/libxfixes.a \ - $(top_builddir)/dix/libxpstubs.a \ - $(XSERVER_LIBS) \ - -lm -lz +MACH64_LIBS = \ + libmach64.a \ + $(top_builddir)/hw/kdrive/vesa/libvesa.a + +Xmach64_LDADD = \ + $(MACH64_LIBS) \ + @KDRIVE_LIBS@ \ + @XSERVER_LIBS@ + +Xmach64_DEPENDENCIES = $(MACH64_LIBS) @KDRIVE_LIBS@ |