diff options
| author | Jeff Hartmann <jhartmann@valinux.com> | 2000-04-04 22:08:14 +0000 |
|---|---|---|
| committer | Jeff Hartmann <jhartmann@valinux.com> | 2000-04-04 22:08:14 +0000 |
| commit | ba1b1ae3806490cce16a9c8957b52cd74967f463 (patch) | |
| tree | ec80e9e61fac3a0f1a0eafaedef239c419a89403 /linux-core/Makefile.kernel | |
| parent | 7d715d1800031ccbd37db7f88896464c0e838f10 (diff) | |
Merged mga branch with trunk
Diffstat (limited to 'linux-core/Makefile.kernel')
| -rw-r--r-- | linux-core/Makefile.kernel | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/linux-core/Makefile.kernel b/linux-core/Makefile.kernel index 44d75c48..2ea6c721 100644 --- a/linux-core/Makefile.kernel +++ b/linux-core/Makefile.kernel @@ -14,7 +14,8 @@ L_TARGET := libdrm.a L_OBJS := init.o memory.o proc.o auth.o context.o drawable.o bufs.o \ - lists.o lock.o ioctl.o fops.o vm.o dma.o + lists.o lock.o ioctl.o fops.o vm.o dma.o ctxbitmap.o \ + agpsupport.o M_OBJS := @@ -26,6 +27,14 @@ ifdef CONFIG_DRM_TDFX M_OBJS += tdfx.o endif +ifdef CONFIG_DRM_MGA +M_OBJS += mga.o +endif + +ifdef CONFIG_DRM_R128 +M_OBJS += r128.o +endif + include $(TOPDIR)/Rules.make gamma.o: gamma_drv.o gamma_dma.o $(L_TARGET) @@ -33,3 +42,10 @@ gamma.o: gamma_drv.o gamma_dma.o $(L_TARGET) tdfx.o: tdfx_drv.o tdfx_context.o $(L_TARGET) $(LD) $(LD_RFLAG) -r -o $@ tdfx_drv.o tdfx_context.o -L. -ldrm + +i810.o: i810_drv.o i810_context.o $(L_TARGET) + $(LD) $(LD_RFLAG) -r -o $@ i810_drv.o i810_bufs.o i810_dma.o i810_context.o -L. -ldrm + +mga.o: mga_drv.o mga_context.o mga_dma.o mga_bufs.o $(L_TARGET) + $(LD) $(LD_RFLAG) -r -o $@ mga_drv.o mga_bufs.o mga_dma.o mga_context.o mga_state.o -L. -ldrm + |