From 45b638b87f0daf94f9fce566179775fb2889c663 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Wed, 10 Mar 2004 11:49:11 +0000 Subject: 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. --- hw/kdrive/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'hw') 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 \ -- cgit v1.2.3