diff options
| author | Jeff Hartmann <jhartmann@valinux.com> | 2001-07-20 20:31:30 +0000 |
|---|---|---|
| committer | Jeff Hartmann <jhartmann@valinux.com> | 2001-07-20 20:31:30 +0000 |
| commit | ae5b4effc05cd5ac44ab44c5c733c6599652f1eb (patch) | |
| tree | 1559f558990341ec9e62ca68e804616291bf1d0a /linux | |
| parent | 4eafeec960c29369982a9b15c24681a3072f491d (diff) | |
Remove module name hacks because we aren't going to implement this anymore
because of Linus' comments
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/Makefile.linux | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/linux/Makefile.linux b/linux/Makefile.linux index e796c8fb..cb48028f 100644 --- a/linux/Makefile.linux +++ b/linux/Makefile.linux @@ -47,9 +47,7 @@ # **** End of SMP/MODVERSIONS detection -XFREE86VERSION = 4_1_0 -MODS = gamma-$(XFREE86VERSION).o tdfx.o \ - r128-$(XFREE86VERSION).o radeon-$(XFREE86VERSION).o +MODS = gamma.o tdfx.o r128.o radeon.o LIBS = DRMTEMPLATES = drm_auth.h drm_bufs.h drm_context.h drm_dma.h drm_drawable.h \ @@ -148,12 +146,12 @@ ifeq ($(AGP),1) MODCFLAGS += -DCONFIG_AGP -DCONFIG_AGP_MODULE DRMTEMPLATES += drm_agpsupport.h DRMHEADERS += agpsupport-pre24.h -MODS += mga-$(XFREE86VERSION).o +MODS += mga.o ifeq ($(MACHINE),i386) -MODS += i810-$(XFREE86VERSION).o +MODS += i810.o endif ifeq ($(MACHINE),i686) -MODS += i810-$(XFREE86VERSION).o +MODS += i810.o endif MGAOBJS = mga_drv.o mga_dma.o mga_state.o mga_warp.o @@ -223,7 +221,7 @@ DRIsetup: DRIsetup.c gamma_drv.o: gamma_drv.c $(CC) $(MODCFLAGS) -DEXPORT_SYMTAB -I$(TREE) -c $< -o $@ -gamma-$(XFREE86VERSION).o: $(GAMMAOBJS) +gamma.o: $(GAMMAOBJS) $(LD) -r $^ -o $@ tdfx_drv.o: tdfx_drv.c @@ -231,28 +229,28 @@ tdfx_drv.o: tdfx_drv.c tdfx.o: $(TDFXOBJS) $(LIBS) $(LD) -r $^ -o $@ -sis-$(XFREE86VERSION).o: $(SISOBJS) $(LIBS) +sis.o: $(SISOBJS) $(LIBS) $(LD) -r $^ -o $@ r128_drv.o: r128_drv.c $(CC) $(MODCFLAGS) -DEXPORT_SYMTAB -I$(TREE) -c $< -o $@ -r128-$(XFREE86VERSION).o: $(R128OBJS) $(LIBS) +r128.o: $(R128OBJS) $(LIBS) $(LD) -r $^ -o $@ radeon_drv.o: radeon_drv.c $(CC) $(MODCFLAGS) -DEXPORT_SYMTAB -I$(TREE) -c $< -o $@ -radeon-$(XFREE86VERSION).o: $(RADEONOBJS) $(LIBS) +radeon.o: $(RADEONOBJS) $(LIBS) $(LD) -r $^ -o $@ ifeq ($(AGP),1) mga_drv.o: mga_drv.c $(CC) $(MODCFLAGS) -DEXPORT_SYMTAB -I$(TREE) -c $< -o $@ -mga-$(XFREE86VERSION).o: $(MGAOBJS) +mga.o: $(MGAOBJS) $(LD) -r $^ -o $@ i810_drv.o: i810_drv.c $(CC) $(MODCFLAGS) -DEXPORT_SYMTAB -I$(TREE) -c $< -o $@ -i810-$(XFREE86VERSION).o: $(I810OBJS) $(LIBS) +i810.o: $(I810OBJS) $(LIBS) $(LD) -r $^ -o $@ endif |