Track linux-core symlinks in git.

diff --git a/.gitignore b/.gitignore
index 333bbad..4386f40 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,54 +1,54 @@
-*-core/linux
-*-core/drm.h
-*-core/drm_sarea.h
-*-core/i915_dma.c
-*-core/i915_drm.h
-*-core/i915_drv.h
-*-core/i915_irq.c
-*-core/i915_mem.c
-*-core/mach64_dma.c
-*-core/mach64_drm.h
-*-core/mach64_drv.h
-*-core/mach64_irq.c
-*-core/mach64_state.c
-*-core/mga_dma.c
-*-core/mga_drm.h
-*-core/mga_drv.h
-*-core/mga_irq.c
-*-core/mga_state.c
-*-core/mga_ucode.h
-*-core/mga_warp.c
-*-core/nv_drv.h
-*-core/r128_cce.c
-*-core/r128_drm.h
-*-core/r128_drv.h
-*-core/r128_irq.c
-*-core/r128_state.c
-*-core/r300_cmdbuf.c
-*-core/r300_reg.h
-*-core/radeon_cp.c
-*-core/radeon_drm.h
-*-core/radeon_drv.h
-*-core/radeon_irq.c
-*-core/radeon_mem.c
-*-core/radeon_state.c
-*-core/savage_bci.c
-*-core/savage_drm.h
-*-core/savage_drv.h
-*-core/savage_state.c
-*-core/sis_drm.h
-*-core/sis_drv.h
-*-core/tdfx_drv.h
-*-core/via_3d_reg.h
-*-core/via_dma.c
-*-core/via_drm.h
-*-core/via_drv.c
-*-core/via_drv.h
-*-core/via_irq.c
-*-core/via_map.c
-*-core/via_verifier.c
-*-core/via_verifier.h
-*-core/via_video.c
+bsd-core/linux
+bsd-core/drm.h
+bsd-core/drm_sarea.h
+bsd-core/i915_dma.c
+bsd-core/i915_drm.h
+bsd-core/i915_drv.h
+bsd-core/i915_irq.c
+bsd-core/i915_mem.c
+bsd-core/mach64_dma.c
+bsd-core/mach64_drm.h
+bsd-core/mach64_drv.h
+bsd-core/mach64_irq.c
+bsd-core/mach64_state.c
+bsd-core/mga_dma.c
+bsd-core/mga_drm.h
+bsd-core/mga_drv.h
+bsd-core/mga_irq.c
+bsd-core/mga_state.c
+bsd-core/mga_ucode.h
+bsd-core/mga_warp.c
+bsd-core/nv_drv.h
+bsd-core/r128_cce.c
+bsd-core/r128_drm.h
+bsd-core/r128_drv.h
+bsd-core/r128_irq.c
+bsd-core/r128_state.c
+bsd-core/r300_cmdbuf.c
+bsd-core/r300_reg.h
+bsd-core/radeon_cp.c
+bsd-core/radeon_drm.h
+bsd-core/radeon_drv.h
+bsd-core/radeon_irq.c
+bsd-core/radeon_mem.c
+bsd-core/radeon_state.c
+bsd-core/savage_bci.c
+bsd-core/savage_drm.h
+bsd-core/savage_drv.h
+bsd-core/savage_state.c
+bsd-core/sis_drm.h
+bsd-core/sis_drv.h
+bsd-core/tdfx_drv.h
+bsd-core/via_3d_reg.h
+bsd-core/via_dma.c
+bsd-core/via_drm.h
+bsd-core/via_drv.c
+bsd-core/via_drv.h
+bsd-core/via_irq.c
+bsd-core/via_map.c
+bsd-core/via_verifier.c
+bsd-core/via_verifier.h
+bsd-core/via_video.c
 *.flags
 *.ko
 *.ko.cmd

diff --git a/linux-core/Makefile b/linux-core/Makefile
index 3aecec4..b4cff78 100644 (file)
--- a/linux-core/Makefile
+++ b/linux-core/Makefile
@@ -75,45 +75,26 @@ DRM_MODULES ?= $(MODULE_LIST)
 
 # These definitions are for handling dependencies in the out of kernel build.
 
-DRMSHARED =     drm.h drm_sarea.h drm_drawable.c
 DRMHEADERS =    drmP.h drm_compat.h drm_os_linux.h drm.h drm_sarea.h
 COREHEADERS =   drm_core.h drm_sman.h drm_hashtab.h 
 
 TDFXHEADERS =   tdfx_drv.h $(DRMHEADERS)
-TDFXSHARED =    tdfx_drv.h
 R128HEADERS =   r128_drv.h r128_drm.h $(DRMHEADERS)
-R128SHARED =    r128_drv.h r128_drm.h r128_cce.c r128_state.c r128_irq.c
 RADEONHEADERS = radeon_drv.h radeon_drm.h r300_reg.h $(DRMHEADERS)
-RADEONSHARED =  radeon_drv.h radeon_drm.h radeon_cp.c radeon_irq.c \
-                radeon_mem.c radeon_state.c r300_cmdbuf.c r300_reg.h
 MGAHEADERS =    mga_drv.h mga_drm.h mga_ucode.h $(DRMHEADERS)
-MGASHARED =     mga_dma.c mga_drm.h mga_drv.h mga_irq.c mga_state.c \
-                mga_ucode.h mga_warp.c
 I810HEADERS =   i810_drv.h i810_drm.h $(DRMHEADERS)
 I830HEADERS =   i830_drv.h i830_drm.h $(DRMHEADERS)
 I915HEADERS =   i915_drv.h i915_drm.h $(DRMHEADERS)
-I915SHARED  =   i915_drv.h i915_drm.h i915_irq.c i915_mem.c i915_dma.c
 SISHEADERS=     sis_drv.h sis_drm.h drm_hashtab.h drm_sman.h $(DRMHEADERS)
-SISSHARED=      sis_drv.h sis_drm.h
 SAVAGEHEADERS=  savage_drv.h savage_drm.h $(DRMHEADERS)
-SAVAGESHARED=  savage_drv.h savage_drm.h savage_bci.c savage_state.c
 VIAHEADERS =   via_drm.h via_drv.h via_3d_reg.h via_verifier.h $(DRMHEADERS)
-VIASHARED      = via_drm.h via_drv.h via_3d_reg.h via_drv.c via_irq.c via_map.c \
-               via_dma.c via_verifier.c via_verifier.h via_video.c
 MACH64HEADERS = mach64_drv.h mach64_drm.h $(DRMHEADERS)
-MACH64SHARED =         mach64_drv.h mach64_drm.h mach64_dma.c \
-               mach64_irq.c mach64_state.c
 NVHEADERS =     nv_drv.h $(DRMHEADERS)
-NVSHARED  =     nv_drv.h
 FFBHEADERS =   ffb_drv.h $(DRMHEADERS)
 
-SHAREDSRC = $(DRMSHARED) $(MGASHARED) $(R128SHARED) $(RADEONSHARED) \
-       $(SISSHARED) $(TDFXSHARED) $(VIASHARED) $(MACH64SHARED) \
-       $(I915SHARED) $(SAVAGESHARED) $(NVSHARED)
-
 PROGS = dristat drmstat
 
-CLEANFILES = *.o *.ko $(PROGS) .depend .*.flags .*.d .*.cmd *.mod.c linux drm_pciids.h .tmp_versions
+CLEANFILES = *.o *.ko $(PROGS) .depend .*.flags .*.d .*.cmd *.mod.c drm_pciids.h .tmp_versions
 
 # VERSION is not defined from the initial invocation.  It is defined when
 # this Makefile is invoked from the kernel's root Makefile.
@@ -226,27 +207,13 @@ endif
 
 SHAREDDIR := ../shared-core
 
-HASSHARED := $(shell if [ -d $(SHAREDDIR) ]; then echo y; fi)
-
-ifeq ($(HASSHARED),y)
-includes:: $(SHAREDSRC) drm_pciids.h
+ifeq ($(shell if [ -d $(SHAREDDIR) ]; then echo y; fi),y)
+includes::  drm_pciids.h
 
 drm_pciids.h: $(SHAREDDIR)/drm_pciids.txt
        sh ../scripts/create_linux_pci_lists.sh < $(SHAREDDIR)/drm_pciids.txt
-
-$(SHAREDSRC):
-       @if [ -r $(SHAREDDIR)/$@ ]; then \
-               (rm -f $@; set -x; ln -s $(SHAREDDIR)/$@ $@); fi
-
-CLEANFILES += $(SHAREDSRC)
 endif
 
-includes:: linux
-
-linux:
-       rm -f linux
-       ln -s . linux
-
 clean cleandir:
        rm -rf $(CLEANFILES)
 

diff --git a/linux-core/drm.h b/linux-core/drm.h
new file mode 120000 (symlink)
index 0000000..2963669
--- /dev/null
+++ b/linux-core/drm.h
@@ -0,0 +1 @@
+../shared-core/drm.h
\ No newline at end of file

diff --git a/linux-core/drm_drawable.c b/linux-core/drm_drawable.c
new file mode 120000 (symlink)
index 0000000..d64bbe1
--- /dev/null
+++ b/linux-core/drm_drawable.c
@@ -0,0 +1 @@
+../shared-core/drm_drawable.c
\ No newline at end of file

diff --git a/linux-core/drm_sarea.h b/linux-core/drm_sarea.h
new file mode 120000 (symlink)
index 0000000..fd428f4
--- /dev/null
+++ b/linux-core/drm_sarea.h
@@ -0,0 +1 @@
+../shared-core/drm_sarea.h
\ No newline at end of file

diff --git a/linux-core/i915_dma.c b/linux-core/i915_dma.c
new file mode 120000 (symlink)
index 0000000..c61d967
--- /dev/null
+++ b/linux-core/i915_dma.c
@@ -0,0 +1 @@
+../shared-core/i915_dma.c
\ No newline at end of file

diff --git a/linux-core/i915_drm.h b/linux-core/i915_drm.h
new file mode 120000 (symlink)
index 0000000..ed53f01
--- /dev/null
+++ b/linux-core/i915_drm.h
@@ -0,0 +1 @@
+../shared-core/i915_drm.h
\ No newline at end of file

diff --git a/linux-core/i915_drv.h b/linux-core/i915_drv.h
new file mode 120000 (symlink)
index 0000000..085558c
--- /dev/null
+++ b/linux-core/i915_drv.h
@@ -0,0 +1 @@
+../shared-core/i915_drv.h
\ No newline at end of file

diff --git a/linux-core/i915_irq.c b/linux-core/i915_irq.c
new file mode 120000 (symlink)
index 0000000..2058a2e
--- /dev/null
+++ b/linux-core/i915_irq.c
@@ -0,0 +1 @@
+../shared-core/i915_irq.c
\ No newline at end of file

diff --git a/linux-core/i915_mem.c b/linux-core/i915_mem.c
new file mode 120000 (symlink)
index 0000000..e8e5655
--- /dev/null
+++ b/linux-core/i915_mem.c
@@ -0,0 +1 @@
+../shared-core/i915_mem.c
\ No newline at end of file

diff --git a/linux-core/linux b/linux-core/linux
new file mode 120000 (symlink)
index 0000000..945c9b4
--- /dev/null
+++ b/linux-core/linux
@@ -0,0 +1 @@
+.
\ No newline at end of file

diff --git a/linux-core/mach64_dma.c b/linux-core/mach64_dma.c
new file mode 120000 (symlink)
index 0000000..e5c2897
--- /dev/null
+++ b/linux-core/mach64_dma.c
@@ -0,0 +1 @@
+../shared-core/mach64_dma.c
\ No newline at end of file

diff --git a/linux-core/mach64_drm.h b/linux-core/mach64_drm.h
new file mode 120000 (symlink)
index 0000000..136ea93
--- /dev/null
+++ b/linux-core/mach64_drm.h
@@ -0,0 +1 @@
+../shared-core/mach64_drm.h
\ No newline at end of file

diff --git a/linux-core/mach64_drv.h b/linux-core/mach64_drv.h
new file mode 120000 (symlink)
index 0000000..85222cc
--- /dev/null
+++ b/linux-core/mach64_drv.h
@@ -0,0 +1 @@
+../shared-core/mach64_drv.h
\ No newline at end of file

diff --git a/linux-core/mach64_irq.c b/linux-core/mach64_irq.c
new file mode 120000 (symlink)
index 0000000..a1235d5
--- /dev/null
+++ b/linux-core/mach64_irq.c
@@ -0,0 +1 @@
+../shared-core/mach64_irq.c
\ No newline at end of file

diff --git a/linux-core/mach64_state.c b/linux-core/mach64_state.c
new file mode 120000 (symlink)
index 0000000..b11f202
--- /dev/null
+++ b/linux-core/mach64_state.c
@@ -0,0 +1 @@
+../shared-core/mach64_state.c
\ No newline at end of file

diff --git a/linux-core/mga_dma.c b/linux-core/mga_dma.c
new file mode 120000 (symlink)
index 0000000..f290be9
--- /dev/null
+++ b/linux-core/mga_dma.c
@@ -0,0 +1 @@
+../shared-core/mga_dma.c
\ No newline at end of file

diff --git a/linux-core/mga_drm.h b/linux-core/mga_drm.h
new file mode 120000 (symlink)
index 0000000..1c87036
--- /dev/null
+++ b/linux-core/mga_drm.h
@@ -0,0 +1 @@
+../shared-core/mga_drm.h
\ No newline at end of file

diff --git a/linux-core/mga_drv.h b/linux-core/mga_drv.h
new file mode 120000 (symlink)
index 0000000..cb0c9e1
--- /dev/null
+++ b/linux-core/mga_drv.h
@@ -0,0 +1 @@
+../shared-core/mga_drv.h
\ No newline at end of file

diff --git a/linux-core/mga_irq.c b/linux-core/mga_irq.c
new file mode 120000 (symlink)
index 0000000..cf521d2
--- /dev/null
+++ b/linux-core/mga_irq.c
@@ -0,0 +1 @@
+../shared-core/mga_irq.c
\ No newline at end of file

diff --git a/linux-core/mga_state.c b/linux-core/mga_state.c
new file mode 120000 (symlink)
index 0000000..8bda8ba
--- /dev/null
+++ b/linux-core/mga_state.c
@@ -0,0 +1 @@
+../shared-core/mga_state.c
\ No newline at end of file

diff --git a/linux-core/mga_ucode.h b/linux-core/mga_ucode.h
new file mode 120000 (symlink)
index 0000000..728b9ac
--- /dev/null
+++ b/linux-core/mga_ucode.h
@@ -0,0 +1 @@
+../shared-core/mga_ucode.h
\ No newline at end of file

diff --git a/linux-core/mga_warp.c b/linux-core/mga_warp.c
new file mode 120000 (symlink)
index 0000000..d35b325
--- /dev/null
+++ b/linux-core/mga_warp.c
@@ -0,0 +1 @@
+../shared-core/mga_warp.c
\ No newline at end of file

diff --git a/linux-core/nv_drv.h b/linux-core/nv_drv.h
new file mode 120000 (symlink)
index 0000000..c961780
--- /dev/null
+++ b/linux-core/nv_drv.h
@@ -0,0 +1 @@
+../shared-core/nv_drv.h
\ No newline at end of file

diff --git a/linux-core/r128_cce.c b/linux-core/r128_cce.c
new file mode 120000 (symlink)
index 0000000..0c1d659
--- /dev/null
+++ b/linux-core/r128_cce.c
@@ -0,0 +1 @@
+../shared-core/r128_cce.c
\ No newline at end of file

diff --git a/linux-core/r128_drm.h b/linux-core/r128_drm.h
new file mode 120000 (symlink)
index 0000000..363852c
--- /dev/null
+++ b/linux-core/r128_drm.h
@@ -0,0 +1 @@
+../shared-core/r128_drm.h
\ No newline at end of file

diff --git a/linux-core/r128_drv.h b/linux-core/r128_drv.h
new file mode 120000 (symlink)
index 0000000..4f7e822
--- /dev/null
+++ b/linux-core/r128_drv.h
@@ -0,0 +1 @@
+../shared-core/r128_drv.h
\ No newline at end of file

diff --git a/linux-core/r128_irq.c b/linux-core/r128_irq.c
new file mode 120000 (symlink)
index 0000000..66d28b0
--- /dev/null
+++ b/linux-core/r128_irq.c
@@ -0,0 +1 @@
+../shared-core/r128_irq.c
\ No newline at end of file

diff --git a/linux-core/r128_state.c b/linux-core/r128_state.c
new file mode 120000 (symlink)
index 0000000..e83d84b
--- /dev/null
+++ b/linux-core/r128_state.c
@@ -0,0 +1 @@
+../shared-core/r128_state.c
\ No newline at end of file

diff --git a/linux-core/r300_cmdbuf.c b/linux-core/r300_cmdbuf.c
new file mode 120000 (symlink)
index 0000000..6674d05
--- /dev/null
+++ b/linux-core/r300_cmdbuf.c
@@ -0,0 +1 @@
+../shared-core/r300_cmdbuf.c
\ No newline at end of file

diff --git a/linux-core/r300_reg.h b/linux-core/r300_reg.h
new file mode 120000 (symlink)
index 0000000..ef54eba
--- /dev/null
+++ b/linux-core/r300_reg.h
@@ -0,0 +1 @@
+../shared-core/r300_reg.h
\ No newline at end of file

diff --git a/linux-core/radeon_cp.c b/linux-core/radeon_cp.c
new file mode 120000 (symlink)
index 0000000..ee86094
--- /dev/null
+++ b/linux-core/radeon_cp.c
@@ -0,0 +1 @@
+../shared-core/radeon_cp.c
\ No newline at end of file

diff --git a/linux-core/radeon_drm.h b/linux-core/radeon_drm.h
new file mode 120000 (symlink)
index 0000000..54f595a
--- /dev/null
+++ b/linux-core/radeon_drm.h
@@ -0,0 +1 @@
+../shared-core/radeon_drm.h
\ No newline at end of file

diff --git a/linux-core/radeon_drv.h b/linux-core/radeon_drv.h
new file mode 120000 (symlink)
index 0000000..5b415ea
--- /dev/null
+++ b/linux-core/radeon_drv.h
@@ -0,0 +1 @@
+../shared-core/radeon_drv.h
\ No newline at end of file

diff --git a/linux-core/radeon_irq.c b/linux-core/radeon_irq.c
new file mode 120000 (symlink)
index 0000000..2f394a5
--- /dev/null
+++ b/linux-core/radeon_irq.c
@@ -0,0 +1 @@
+../shared-core/radeon_irq.c
\ No newline at end of file

diff --git a/linux-core/radeon_mem.c b/linux-core/radeon_mem.c
new file mode 120000 (symlink)
index 0000000..8cc2798
--- /dev/null
+++ b/linux-core/radeon_mem.c
@@ -0,0 +1 @@
+../shared-core/radeon_mem.c
\ No newline at end of file

diff --git a/linux-core/radeon_state.c b/linux-core/radeon_state.c
new file mode 120000 (symlink)
index 0000000..ccee876
--- /dev/null
+++ b/linux-core/radeon_state.c
@@ -0,0 +1 @@
+../shared-core/radeon_state.c
\ No newline at end of file

diff --git a/linux-core/savage_bci.c b/linux-core/savage_bci.c
new file mode 120000 (symlink)
index 0000000..b843671
--- /dev/null
+++ b/linux-core/savage_bci.c
@@ -0,0 +1 @@
+../shared-core/savage_bci.c
\ No newline at end of file

diff --git a/linux-core/savage_drm.h b/linux-core/savage_drm.h
new file mode 120000 (symlink)
index 0000000..0dab2e3
--- /dev/null
+++ b/linux-core/savage_drm.h
@@ -0,0 +1 @@
+../shared-core/savage_drm.h
\ No newline at end of file

diff --git a/linux-core/savage_drv.h b/linux-core/savage_drv.h
new file mode 120000 (symlink)
index 0000000..8397009
--- /dev/null
+++ b/linux-core/savage_drv.h
@@ -0,0 +1 @@
+../shared-core/savage_drv.h
\ No newline at end of file

diff --git a/linux-core/savage_state.c b/linux-core/savage_state.c
new file mode 120000 (symlink)
index 0000000..e55dc5d
--- /dev/null
+++ b/linux-core/savage_state.c
@@ -0,0 +1 @@
+../shared-core/savage_state.c
\ No newline at end of file

diff --git a/linux-core/sis_drm.h b/linux-core/sis_drm.h
new file mode 120000 (symlink)
index 0000000..36c77aa
--- /dev/null
+++ b/linux-core/sis_drm.h
@@ -0,0 +1 @@
+../shared-core/sis_drm.h
\ No newline at end of file

diff --git a/linux-core/sis_drv.h b/linux-core/sis_drv.h
new file mode 120000 (symlink)
index 0000000..3fddfda
--- /dev/null
+++ b/linux-core/sis_drv.h
@@ -0,0 +1 @@
+../shared-core/sis_drv.h
\ No newline at end of file

diff --git a/linux-core/tdfx_drv.h b/linux-core/tdfx_drv.h
new file mode 120000 (symlink)
index 0000000..8df7032
--- /dev/null
+++ b/linux-core/tdfx_drv.h
@@ -0,0 +1 @@
+../shared-core/tdfx_drv.h
\ No newline at end of file

diff --git a/linux-core/via_3d_reg.h b/linux-core/via_3d_reg.h
new file mode 120000 (symlink)
index 0000000..90d238e
--- /dev/null
+++ b/linux-core/via_3d_reg.h
@@ -0,0 +1 @@
+../shared-core/via_3d_reg.h
\ No newline at end of file

diff --git a/linux-core/via_dma.c b/linux-core/via_dma.c
new file mode 120000 (symlink)
index 0000000..1f4d920
--- /dev/null
+++ b/linux-core/via_dma.c
@@ -0,0 +1 @@
+../shared-core/via_dma.c
\ No newline at end of file

diff --git a/linux-core/via_drm.h b/linux-core/via_drm.h
new file mode 120000 (symlink)
index 0000000..7cd175d
--- /dev/null
+++ b/linux-core/via_drm.h
@@ -0,0 +1 @@
+../shared-core/via_drm.h
\ No newline at end of file

diff --git a/linux-core/via_drv.c b/linux-core/via_drv.c
new file mode 120000 (symlink)
index 0000000..b6ff160
--- /dev/null
+++ b/linux-core/via_drv.c
@@ -0,0 +1 @@
+../shared-core/via_drv.c
\ No newline at end of file

diff --git a/linux-core/via_drv.h b/linux-core/via_drv.h
new file mode 120000 (symlink)
index 0000000..8954fe8
--- /dev/null
+++ b/linux-core/via_drv.h
@@ -0,0 +1 @@
+../shared-core/via_drv.h
\ No newline at end of file

diff --git a/linux-core/via_irq.c b/linux-core/via_irq.c
new file mode 120000 (symlink)
index 0000000..f615af8
--- /dev/null
+++ b/linux-core/via_irq.c
@@ -0,0 +1 @@
+../shared-core/via_irq.c
\ No newline at end of file

diff --git a/linux-core/via_map.c b/linux-core/via_map.c
new file mode 120000 (symlink)
index 0000000..b505663
--- /dev/null
+++ b/linux-core/via_map.c
@@ -0,0 +1 @@
+../shared-core/via_map.c
\ No newline at end of file

diff --git a/linux-core/via_verifier.c b/linux-core/via_verifier.c
new file mode 120000 (symlink)
index 0000000..00b411b
--- /dev/null
+++ b/linux-core/via_verifier.c
@@ -0,0 +1 @@
+../shared-core/via_verifier.c
\ No newline at end of file

diff --git a/linux-core/via_verifier.h b/linux-core/via_verifier.h
new file mode 120000 (symlink)
index 0000000..62d3e28
--- /dev/null
+++ b/linux-core/via_verifier.h
@@ -0,0 +1 @@
+../shared-core/via_verifier.h
\ No newline at end of file

diff --git a/linux-core/via_video.c b/linux-core/via_video.c
new file mode 120000 (symlink)
index 0000000..a6d2794
--- /dev/null
+++ b/linux-core/via_video.c
@@ -0,0 +1 @@
+../shared-core/via_video.c
\ No newline at end of file