- Link in shared files as necessary and clean them up.

- Generate drm_pciids.h automatically.

diff --git a/bsd-core/Makefile b/bsd-core/Makefile
index 3b678e1..4ab1c27 100644 (file)
--- a/bsd-core/Makefile
+++ b/bsd-core/Makefile
@@ -1,4 +1,62 @@
-# i810, i830 & sis are not complete
-SUBDIR = mga r128 radeon tdfx sis # i810 i830 gamma
+SHARED=                ../shared
+SHAREDFILES=   drm.h \
+               drm_sarea.h \
+               mach64.h \
+               mach64_dma.c \
+               mach64_drm.h \
+               mach64_drv.h \
+               mach64_irq.c \
+               mach64_state.c \
+               mga.h \
+               mga_dma.c \
+               mga_drm.h \
+               mga_drv.h \
+               mga_irq.c \
+               mga_state.c \
+               mga_ucode.h \
+               mga_warp.c \
+               r128.h \
+               r128_cce.c \
+               r128_drm.h \
+               r128_drv.h \
+               r128_irq.c \
+               r128_state.c \
+               radeon.h \
+               radeon_cp.c \
+               radeon_drm.h \
+               radeon_drv.h \
+               radeon_irq.c \
+               radeon_mem.c \
+               radeon_state.c \
+               sis.h \
+               sis_drm.h \
+               sis_drv.h \
+               sis_ds.c \
+               sis_ds.h \
+               sis_mm.c \
+               tdfx.h \
+               via.h \
+               via_drm.h \
+               via_drv.c \
+               via_drv.h \
+               via_ds.c \
+               via_ds.h \
+               via_irq.c \
+               via_map.c \
+               via_mm.c \
+               via_mm.h
+
+SUBDIR = mga r128 radeon tdfx sis
+
+CLEANFILES+= ${SHAREDFILES}
+
+.include <bsd.obj.mk>
+
+all: drm_pciids.h ${SHAREDFILES}
+
+drm_pciids.h: ${SHARED}/drm_pciids.txt
+       sh ../scripts/create_bsd_pci_lists.sh < ${SHARED}/drm_pciids.txt
+
+${SHAREDFILES}:
+       ln -sf ${SHARED}/$@ $@
 
-.include <bsd.subdir.mk>

diff --git a/bsd/Makefile b/bsd/Makefile
index 3b678e1..4ab1c27 100644 (file)
--- a/bsd/Makefile
+++ b/bsd/Makefile
@@ -1,4 +1,62 @@
-# i810, i830 & sis are not complete
-SUBDIR = mga r128 radeon tdfx sis # i810 i830 gamma
+SHARED=                ../shared
+SHAREDFILES=   drm.h \
+               drm_sarea.h \
+               mach64.h \
+               mach64_dma.c \
+               mach64_drm.h \
+               mach64_drv.h \
+               mach64_irq.c \
+               mach64_state.c \
+               mga.h \
+               mga_dma.c \
+               mga_drm.h \
+               mga_drv.h \
+               mga_irq.c \
+               mga_state.c \
+               mga_ucode.h \
+               mga_warp.c \
+               r128.h \
+               r128_cce.c \
+               r128_drm.h \
+               r128_drv.h \
+               r128_irq.c \
+               r128_state.c \
+               radeon.h \
+               radeon_cp.c \
+               radeon_drm.h \
+               radeon_drv.h \
+               radeon_irq.c \
+               radeon_mem.c \
+               radeon_state.c \
+               sis.h \
+               sis_drm.h \
+               sis_drv.h \
+               sis_ds.c \
+               sis_ds.h \
+               sis_mm.c \
+               tdfx.h \
+               via.h \
+               via_drm.h \
+               via_drv.c \
+               via_drv.h \
+               via_ds.c \
+               via_ds.h \
+               via_irq.c \
+               via_map.c \
+               via_mm.c \
+               via_mm.h
+
+SUBDIR = mga r128 radeon tdfx sis
+
+CLEANFILES+= ${SHAREDFILES}
+
+.include <bsd.obj.mk>
+
+all: drm_pciids.h ${SHAREDFILES}
+
+drm_pciids.h: ${SHARED}/drm_pciids.txt
+       sh ../scripts/create_bsd_pci_lists.sh < ${SHARED}/drm_pciids.txt
+
+${SHAREDFILES}:
+       ln -sf ${SHARED}/$@ $@
 
-.include <bsd.subdir.mk>