diff options
| author | David Dawes <dawes@xfree86.org> | 2002-01-27 20:05:42 +0000 |
|---|---|---|
| committer | David Dawes <dawes@xfree86.org> | 2002-01-27 20:05:42 +0000 |
| commit | 44aa4d6297874022a4f5a49ea24f2d052584d3dc (patch) | |
| tree | a3b8646dd51527d2fb246dbc11a124f4fd60968a /bsd/Imakefile | |
| parent | 14945ada16218e9f918c24e0d702979fae9b07f6 (diff) | |
First pass merge of XFree86 4.2.0 import.X_4_2_0-20020128-merge
Diffstat (limited to 'bsd/Imakefile')
| -rw-r--r-- | bsd/Imakefile | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/bsd/Imakefile b/bsd/Imakefile index 0e11ec50..d18f1873 100644 --- a/bsd/Imakefile +++ b/bsd/Imakefile @@ -1,28 +1,4 @@ -XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/Imakefile,v 1.6 2001/04/18 14:52:43 dawes Exp $ - -#include <Server.tmpl> - -#if 0 -LinkSourceFile(xf86drm.c,..) -LinkSourceFile(xf86drmHash.c,..) -LinkSourceFile(xf86drmRandom.c,..) -LinkSourceFile(xf86drmSL.c,..) -LinkSourceFile(xf86drm.h,$(XF86OSSRC)) -LinkSourceFile(xf86_OSproc.h,$(XF86OSSRC)) -LinkSourceFile(sigio.c,$(XF86OSSRC)/shared) -#endif - -XCOMM Try to use the Linux version of the DRM headers. This avoids skew -XCOMM and missing headers. If there's a need to break them out, they -XCOMM can be re-added later. If not, they can be moved to somewhere more -XCOMM OS-independent and referenced from there. -LinkSourceFile(drm.h,$(XF86OSSRC)/linux/drm/kernel) -LinkSourceFile(i810_drm.h,$(XF86OSSRC)/linux/drm/kernel) -LinkSourceFile(mga_drm.h,$(XF86OSSRC)/linux/drm/kernel) -LinkSourceFile(r128_drm.h,$(XF86OSSRC)/linux/drm/kernel) -LinkSourceFile(radeon_drm.h,$(XF86OSSRC)/linux/drm/kernel) -LinkSourceFile(sis_drm.h,$(XF86OSSRC)/linux/drm/kernel) - +XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/kernel/Imakefile,v 1.8 2001/12/13 00:24:45 alanh Exp $ XCOMM This is a kludge until we determine how best to build the XCOMM kernel-specific device driver. This allows us to continue @@ -37,7 +13,7 @@ install:: $(MAKE) -f Makefile.bsd install #else all:: - @echo 'Use "make -f Makefile.bsd" to manually build drm.o' + @echo 'Use "make -f Makefile.bsd" to manually build the modules' #endif clean:: |