summaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2004-03-10 11:49:11 +0000
committerDaniel Stone <daniel@fooishbar.org>2004-03-10 11:49:11 +0000
commit45b638b87f0daf94f9fce566179775fb2889c663 (patch)
tree5ffd81c7658fadfba8b6b1f38e5f5b3d30795086 /hw
parent47c9395969593a4e897e8c8110d5f2414e47b06a (diff)
Twenty link errors for Xizzle now - count 'em. 20.
Get rid of all references to SCO. Change SDK include dir to $(includedir)/xizzle. Add SDK libs where necessary. Reformat to be nicer and easier to shuffle around; also, fix lib ordering so we get so much closer to the elusive final link. Shuffle common/xf86Init.c into libxizzle.a. Fix a couple of early snafus - s/BUILDXI/XINPUT/, et al; make the SDK stuff conditional as needed; fix the SBus includes. Name library os-support/libxizzleos.a, not os-support/foo/libxizzlefoo.a. Clean up ARCH_SOURCES so it's always initialised to something. Move linked libraries to _LIBADD, which somehow escaped my attention. Make inclusion of drm/libxizzlelinuxdrm.a dependent on DRI. s/VERSION/VBE_VERSION/; Axe this redundant dir. All Xizzle-specific: axe hw/xizzle/Xi, shuffle link order, fix list of required modules to be vaguely sane, add some pertinent libs/incs.
Diffstat (limited to 'hw')
-rw-r--r--hw/kdrive/Makefile.am4
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/kdrive/Makefile.am b/hw/kdrive/Makefile.am
index 89da28b46..cb6e95d2b 100644
--- a/hw/kdrive/Makefile.am
+++ b/hw/kdrive/Makefile.am
@@ -6,7 +6,9 @@ if KDRIVEFBDEV
FBDEV_SUBDIRS = fbdev
endif
-XSDL_SUBDIRS=@XSDL_DIRS@
+if XSDLSERVER
+XSDL_SUBDIRS=sdl
+endif
SUBDIRS = \
src \