From 0994e635b2f002c8e9f177037a46c26ccd98c59d Mon Sep 17 00:00:00 2001
From: Kevin E Martin <kem@kem.org>
Date: Fri, 5 Jan 2001 22:57:55 +0000
Subject: Merged ati-5-0-0

---
 linux/Makefile.linux | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

(limited to 'linux/Makefile.linux')

diff --git a/linux/Makefile.linux b/linux/Makefile.linux
index 1dca5ad2..d6c2f67e 100644
--- a/linux/Makefile.linux
+++ b/linux/Makefile.linux
@@ -47,7 +47,7 @@
 
 # **** End of SMP/MODVERSIONS detection
 
-MODS=           gamma.o tdfx.o r128.o
+MODS=           gamma.o tdfx.o r128.o radeon.o
 LIBS=           libdrm.a
 
 DRMOBJS=	init.o memory.o proc.o auth.o context.o drawable.o bufs.o \
@@ -60,9 +60,6 @@ GAMMAHEADERS=   gamma_drv.h $(DRMHEADERS)
 TDFXOBJS=       tdfx_drv.o tdfx_context.o
 TDFXHEADERS=    tdfx_drv.h $(DRMHEADERS)
 
-R128OBJS=	r128_drv.o r128_cce.o r128_bufs.o r128_state.o r128_context.o
-R128HEADERS=	r128_drv.h r128_drm.h $(DRMHEADERS)
-
 INC=		/usr/include
 
 CFLAGS=		-O2 $(WARNINGS)
@@ -138,11 +135,18 @@ MODS += i810.o
 endif
 
 
-MGAOBJS=	mga_drv.o mga_dma.o mga_bufs.o mga_state.o mga_context.o
+MGAOBJS=	mga_drv.o mga_dma.o mga_bufs.o mga_context.o mga_state.o
 MGAHEADERS=	mga_drv.h $(DRMHEADERS)
 
 I810OBJS=	i810_drv.o i810_dma.o i810_bufs.o i810_context.o
 I810HEADERS=	i810_drv.h $(DRMHEADERS)
+
+R128OBJS=	r128_drv.o r128_cce.o r128_bufs.o r128_context.o r128_state.o
+R128HEADERS=	r128_drv.h r128_drm.h $(DRMHEADERS)
+
+RADEONOBJS=	radeon_drv.o radeon_cp.o radeon_bufs.o radeon_context.o \
+		radeon_state.o
+RADEONHEADERS=	radeon_drv.h radeon_drm.h $(DRMHEADERS)
 endif
 
 ifeq ($(SIS),1)
@@ -203,11 +207,6 @@ tdfx_drv.o: tdfx_drv.c
 tdfx.o: $(TDFXOBJS) $(LIBS)
 	$(LD) -r $^ -o $@
 
-r128_drv.o: r128_drv.c
-	$(CC) $(MODCFLAGS) -DEXPORT_SYMTAB -I$(TREE) -c $< -o $@
-r128.o: $(R128OBJS) $(LIBS)
-	$(LD) -r $^ -o $@
-
 sis.o: $(SISOBJS) $(LIBS)
 	$(LD) -r $^ -o $@
 
@@ -221,6 +220,16 @@ i810_drv.o: i810_drv.c
 	$(CC) $(MODCFLAGS) -DEXPORT_SYMTAB -I$(TREE) -c $< -o $@
 i810.o: $(I810OBJS) $(LIBS)
 	$(LD) -r $^ -o $@
+
+r128_drv.o: r128_drv.c
+	$(CC) $(MODCFLAGS) -DEXPORT_SYMTAB -I$(TREE) -c $< -o $@
+r128.o: $(R128OBJS) $(LIBS)
+	$(LD) -r $^ -o $@
+
+radeon_drv.o: radeon_drv.c
+	$(CC) $(MODCFLAGS) -DEXPORT_SYMTAB -I$(TREE) -c $< -o $@
+radeon.o: $(RADEONOBJS) $(LIBS)
+	$(LD) -r $^ -o $@
 endif
 
 .PHONY: ChangeLog
@@ -239,10 +248,11 @@ ChangeLog:
 $(DRMOBJS): $(DRMHEADERS)
 $(GAMMAOBJS): $(GAMMAHEADERS)
 $(TDFXOBJS): $(TDFXHEADERS)
-$(R128OBJS): $(R128HEADERS)
 ifeq ($(AGP),1)
 $(MGAOBJS): $(MGAHEADERS)
 $(I810OBJS): $(I810HEADERS)
+$(R128OBJS): $(R128HEADERS)
+$(RADEONOBJS): $(RADEONHEADERS)
 endif
 
 clean:
-- 
cgit v1.2.3