From 4eafeec960c29369982a9b15c24681a3072f491d Mon Sep 17 00:00:00 2001 From: Jeff Hartmann Date: Wed, 18 Jul 2001 21:02:58 +0000 Subject: Add module version name at a lower layer of the code, allows things to be more flexible and allow older module versions to still work. Might not be final code if we move over to DRI kernel module version, but will be if we use XFree86 version. + Only build tdfx.o instead of tdfx-4_1_0.o since tdfx.o has never changed its API. --- linux/Makefile.linux | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'linux/Makefile.linux') diff --git a/linux/Makefile.linux b/linux/Makefile.linux index 9aa523d7..e796c8fb 100644 --- a/linux/Makefile.linux +++ b/linux/Makefile.linux @@ -48,7 +48,7 @@ # **** End of SMP/MODVERSIONS detection XFREE86VERSION = 4_1_0 -MODS = gamma-$(XFREE86VERSION).o tdfx-$(XFREE86VERSION).o \ +MODS = gamma-$(XFREE86VERSION).o tdfx.o \ r128-$(XFREE86VERSION).o radeon-$(XFREE86VERSION).o LIBS = @@ -228,7 +228,7 @@ gamma-$(XFREE86VERSION).o: $(GAMMAOBJS) tdfx_drv.o: tdfx_drv.c $(CC) $(MODCFLAGS) -DEXPORT_SYMTAB -I$(TREE) -c $< -o $@ -tdfx-$(XFREE86VERSION).o: $(TDFXOBJS) $(LIBS) +tdfx.o: $(TDFXOBJS) $(LIBS) $(LD) -r $^ -o $@ sis-$(XFREE86VERSION).o: $(SISOBJS) $(LIBS) -- cgit v1.2.3