diff options
8 files changed, 110 insertions, 108 deletions
diff --git a/programs/Xserver/hw/xfree86/os-support/Imakefile b/programs/Xserver/hw/xfree86/os-support/Imakefile index a91581309..f899bf300 100644 --- a/programs/Xserver/hw/xfree86/os-support/Imakefile +++ b/programs/Xserver/hw/xfree86/os-support/Imakefile @@ -1,5 +1,5 @@ XCOMM $XConsortium: Imakefile,v 1.1 94/03/28 21:27:13 dpw Exp $ -XCOMM $XFree86$ +XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/os-support/Imakefile,v 3.0 1994/05/08 05:23:31 dawes Exp $ #include <Server.tmpl> #define IHaveSubdirs @@ -24,20 +24,8 @@ OS_SUBDIR = sysv OS_SUBDIR = linux #endif -/* - * This would be "cleaner", but I don't understand all of the BSD stuff yet - * -#if defined(BSD386Architecture) -OS_SUBDIR = bsdi -#endif - -#if defined(BSDArchitecture) -OS_SUBDIR = bsd -#endif -*/ - #if defined(i386BsdArchitecture) -# if defined(i386Bsdi) +# if defined(BSD386Architecture) OS_SUBDIR = bsdi # else OS_SUBDIR = bsd diff --git a/programs/Xserver/hw/xfree86/vga16/drivers/Imakefile b/programs/Xserver/hw/xfree86/vga16/drivers/Imakefile index aaaf11e60..b5f0021a5 100644 --- a/programs/Xserver/hw/xfree86/vga16/drivers/Imakefile +++ b/programs/Xserver/hw/xfree86/vga16/drivers/Imakefile @@ -1,4 +1,5 @@ XCOMM $XConsortium: Imakefile,v 1.1 94/03/28 21:33:46 dpw Exp $ +XCOMM $XFree86$ #include <Server.tmpl> #define IHaveSubdirs @@ -8,7 +9,7 @@ SRCS = */?*.c OBJS = */?*_drv.o -all:: subdirs libdriver16.a +all:: libdriver16.a NormalLibraryObjectRule() @@ -16,12 +17,12 @@ NamedMakeSubdirs(subdirs,$(SUBDIRS)) InstallLinkKitLibrary(driver16,$(LINKKITDIR)/drivers) -NormalDepLibraryTarget(driver16,$(SUBDIRS),$(OBJS)) +NormalDepLibraryTarget(driver16,subdirs,$(OBJS)) DependSubdirs($(SUBDIRS)) InstallLinkKitNonExecFile(Imakefile,$(LINKKITDIR)/drivers/vga16) -#if XFF6LinkKit +#if XF86LinkKit #include <LinkKit.tmpl> #endif diff --git a/programs/Xserver/hw/xfree86/vga16/drivers/generic/Imakefile b/programs/Xserver/hw/xfree86/vga16/drivers/generic/Imakefile index df90b9936..89d4210d2 100644 --- a/programs/Xserver/hw/xfree86/vga16/drivers/generic/Imakefile +++ b/programs/Xserver/hw/xfree86/vga16/drivers/generic/Imakefile @@ -1,9 +1,10 @@ XCOMM $XConsortium: Imakefile,v 1.1 94/03/28 21:33:58 dpw Exp $ +XCOMM $XFree86$ #include <Server.tmpl> -SRCS = drivergen.c +SRCS = gen_driver.c -OBJS = drivergen.o +OBJS = gen_driver.o #if XF86LinkKit VGA2DIR = ../../vga2 @@ -14,11 +15,13 @@ INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86HWSRC) -I$(XF86OSSRC) \ VGA2DIR = ../../../vga2/drivers #endif +DEFINES = -DXF86VGA16 + NormalLibraryObjectRule() NormalRelocatableTarget(gen_drv, $(OBJS)) -ObjectFromSpecialSource(drivergen,$(VGA2DIR)/generic/gen_driver,-DXF86VGA16) +LinkSourceFile(gen_driver.c,$(VGA2DIR)/generic) InstallLinkKitNonExecFile(Imakefile,$(LINKKITDIR)/drivers/vga16/generic) diff --git a/programs/Xserver/hw/xfree86/vga16/mfb/Imakefile b/programs/Xserver/hw/xfree86/vga16/mfb/Imakefile index 21722b6a8..798104d8d 100644 --- a/programs/Xserver/hw/xfree86/vga16/mfb/Imakefile +++ b/programs/Xserver/hw/xfree86/vga16/mfb/Imakefile @@ -1,5 +1,5 @@ XCOMM $XConsortium: Imakefile,v 1.1 94/03/28 21:40:43 dpw Exp $ -XCOMM $XFree86$ +XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga16/mfb/Imakefile,v 3.0 1994/05/04 15:04:15 dawes Exp $ #include <Server.tmpl> SRCS1 = mfbgc.c mfbwindow.c mfbfont.c \ @@ -32,44 +32,53 @@ OBJS = mfbgc.o mfbwindow.o mfbfont.o \ INCLUDES = -I$(SERVERSRC)/mfb -I$(SERVERSRC)/mi -I$(SERVERSRC)/include \ -I$(INCLUDESRC) -I$(FONTINCSRC) +LINTDEFS = -DMFBPOLYGLYPHBLT=mfbPolyGlyphBltWhite \ + -DMFBIMAGEGLYPHBLT=mfbImageGlyphBltWhite \ + -DEQWHOLEWORD=\=\~0 -DOPEQ=\|= +LINTLIBS = $(SERVERSRC)/dix/llib-ldix.ln $(SERVERSRC)/os/llib-los.ln \ + $(SERVERSRC)/mi/llib-lmi.ln + DEFINES = -DXF86VGA16 SubdirLibraryRule($(OBJS)) NormalLibraryObjectRule() - -ObjectFromSpecialSource(maskbits,$(SERVERSRC)/mfb/maskbits,/**/) -ObjectFromSpecialSource(mfbbitblt,$(SERVERSRC)/mfb/mfbbitblt,/**/) -ObjectFromSpecialSource(mfbblt,$(SERVERSRC)/mfb/mfbblt,/**/) -ObjectFromSpecialSource(mfbbres,$(SERVERSRC)/mfb/mfbbres,/**/) -ObjectFromSpecialSource(mfbbresd,$(SERVERSRC)/mfb/mfbbresd,/**/) -ObjectFromSpecialSource(mfbbstore,$(SERVERSRC)/mfb/mfbbstore,/**/) -ObjectFromSpecialSource(mfbclip,$(SERVERSRC)/mfb/mfbclip,/**/) -ObjectFromSpecialSource(mfbcmap,$(SERVERSRC)/mfb/mfbcmap,/**/) -ObjectFromSpecialSource(mfbfillarc,$(SERVERSRC)/mfb/mfbfillarc,/**/) -ObjectFromSpecialSource(mfbfillrct,$(SERVERSRC)/mfb/mfbfillrct,/**/) -ObjectFromSpecialSource(mfbfillsp,$(SERVERSRC)/mfb/mfbfillsp,/**/) -ObjectFromSpecialSource(mfbfont,$(SERVERSRC)/mfb/mfbfont,/**/) -ObjectFromSpecialSource(mfbgc,$(SERVERSRC)/mfb/mfbgc,/**/) -ObjectFromSpecialSource(mfbgetsp,$(SERVERSRC)/mfb/mfbgetsp,/**/) -ObjectFromSpecialSource(mfbhrzvert,$(SERVERSRC)/mfb/mfbhrzvert,/**/) -ObjectFromSpecialSource(mfbimage,$(SERVERSRC)/mfb/mfbimage,/**/) -ObjectFromSpecialSource(mfbimggblt,$(SERVERSRC)/mfb/mfbimggblt,/**/) -ObjectFromSpecialSource(mfbline,$(SERVERSRC)/mfb/mfbline,/**/) -ObjectFromSpecialSource(mfbmisc,$(SERVERSRC)/mfb/mfbmisc,/**/) -ObjectFromSpecialSource(mfbpixmap,$(SERVERSRC)/mfb/mfbpixmap,/**/) -ObjectFromSpecialSource(mfbplygblt,$(SERVERSRC)/mfb/mfbplygblt,/**/) -ObjectFromSpecialSource(mfbply1rct,$(SERVERSRC)/mfb/mfbply1rct,/**/) -ObjectFromSpecialSource(mfbpntarea,$(SERVERSRC)/mfb/mfbpntarea,/**/) -ObjectFromSpecialSource(mfbpntwin,$(SERVERSRC)/mfb/mfbpntwin,/**/) -ObjectFromSpecialSource(mfbpolypnt,$(SERVERSRC)/mfb/mfbpolypnt,/**/) -ObjectFromSpecialSource(mfbpushpxl,$(SERVERSRC)/mfb/mfbpushpxl,/**/) -ObjectFromSpecialSource(mfbscrclse,$(SERVERSRC)/mfb/mfbscrclse,/**/) -ObjectFromSpecialSource(mfbscrinit,$(SERVERSRC)/mfb/mfbscrinit,/**/) -ObjectFromSpecialSource(mfbsetsp,$(SERVERSRC)/mfb/mfbsetsp,/**/) -ObjectFromSpecialSource(mfbtegblt,$(SERVERSRC)/mfb/mfbtegblt,/**/) -ObjectFromSpecialSource(mfbtile,$(SERVERSRC)/mfb/mfbtile,/**/) -ObjectFromSpecialSource(mfbwindow,$(SERVERSRC)/mfb/mfbwindow,/**/) -ObjectFromSpecialSource(mfbzerarc,$(SERVERSRC)/mfb/mfbzerarc,/**/) +NormalLintTarget($(LINTDEFS) $(SRCS1)) + +#define MfbSourceDir $(SERVERSRC)/mfb + +LinkSourceFile(maskbits.c,MfbSourceDir) +LinkSourceFile(mfbbitblt.c,MfbSourceDir) +LinkSourceFile(mfbblt.c,MfbSourceDir) +LinkSourceFile(mfbbres.c,MfbSourceDir) +LinkSourceFile(mfbbresd.c,MfbSourceDir) +LinkSourceFile(mfbbstore.c,MfbSourceDir) +LinkSourceFile(mfbclip.c,MfbSourceDir) +LinkSourceFile(mfbcmap.c,MfbSourceDir) +LinkSourceFile(mfbfillarc.c,MfbSourceDir) +LinkSourceFile(mfbfillrct.c,MfbSourceDir) +LinkSourceFile(mfbfillsp.c,MfbSourceDir) +LinkSourceFile(mfbfont.c,MfbSourceDir) +LinkSourceFile(mfbgc.c,MfbSourceDir) +LinkSourceFile(mfbgetsp.c,MfbSourceDir) +LinkSourceFile(mfbhrzvert.c,MfbSourceDir) +LinkSourceFile(mfbimage.c,MfbSourceDir) +LinkSourceFile(mfbimggblt.c,MfbSourceDir) +LinkSourceFile(mfbline.c,MfbSourceDir) +LinkSourceFile(mfbmisc.c,MfbSourceDir) +LinkSourceFile(mfbpixmap.c,MfbSourceDir) +LinkSourceFile(mfbply1rct.c,MfbSourceDir) +LinkSourceFile(mfbplygblt.c,MfbSourceDir) +LinkSourceFile(mfbpntarea.c,MfbSourceDir) +LinkSourceFile(mfbpntwin.c,MfbSourceDir) +LinkSourceFile(mfbpolypnt.c,MfbSourceDir) +LinkSourceFile(mfbpushpxl.c,MfbSourceDir) +LinkSourceFile(mfbscrclse.c,MfbSourceDir) +LinkSourceFile(mfbscrinit.c,MfbSourceDir) +LinkSourceFile(mfbsetsp.c,MfbSourceDir) +LinkSourceFile(mfbtegblt.c,MfbSourceDir) +LinkSourceFile(mfbtile.c,MfbSourceDir) +LinkSourceFile(mfbwindow.c,MfbSourceDir) +LinkSourceFile(mfbzerarc.c,MfbSourceDir) ObjectFromSpecialSource(mfbseg,mfbline,-DPOLYSEGMENT) diff --git a/programs/Xserver/hw/xfree86/vga2/drivers/Imakefile b/programs/Xserver/hw/xfree86/vga2/drivers/Imakefile index 2eba5374d..e9b4eefec 100644 --- a/programs/Xserver/hw/xfree86/vga2/drivers/Imakefile +++ b/programs/Xserver/hw/xfree86/vga2/drivers/Imakefile @@ -1,4 +1,5 @@ XCOMM $XConsortium: Imakefile,v 1.1 94/03/28 21:41:20 dpw Exp $ +XCOMM $XFree86$ #include <Server.tmpl> #define IHaveSubdirs @@ -8,7 +9,7 @@ SRCS = */?*.c OBJS = */?*_drv.o -all:: subdirs libdriver2.a +all:: libdriver2.a NormalLibraryObjectRule() @@ -16,7 +17,7 @@ NamedMakeSubdirs(subdirs,$(SUBDIRS)) InstallLinkKitLibrary(driver2,$(LINKKITDIR)/drivers) -NormalDepLibraryTarget(driver2,$(SUBDIRS),$(OBJS)) +NormalDepLibraryTarget(driver2,subdirs,$(OBJS)) DependSubdirs($(SUBDIRS)) diff --git a/programs/Xserver/hw/xfree86/vga2/mfb/Imakefile b/programs/Xserver/hw/xfree86/vga2/mfb/Imakefile index e826a5732..1d2191a42 100644 --- a/programs/Xserver/hw/xfree86/vga2/mfb/Imakefile +++ b/programs/Xserver/hw/xfree86/vga2/mfb/Imakefile @@ -1,5 +1,5 @@ XCOMM $XConsortium: Imakefile,v 1.1 94/03/28 21:42:30 dpw Exp $ -XCOMM $XFree86$ +XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/vga2/mfb/Imakefile,v 3.0 1994/05/08 05:24:28 dawes Exp $ #include <Server.tmpl> SRCS1 = mfbgc.c mfbwindow.c mfbfont.c \ @@ -32,44 +32,53 @@ OBJS = mfbgc.o mfbwindow.o mfbfont.o \ INCLUDES = -I$(SERVERSRC)/mfb -I$(SERVERSRC)/mi -I$(SERVERSRC)/include \ -I$(INCLUDESRC) -I$(FONTINCSRC) +LINTDEFS = -DMFBPOLYGLYPHBLT=mfbPolyGlyphBltWhite \ + -DMFBIMAGEGLYPHBLT=mfbImageGlyphBltWhite \ + -DEQWHOLEWORD=\=\~0 -DOPEQ=\|= +LINTLIBS = $(SERVERSRC)/dix/llib-ldix.ln $(SERVERSRC)/os/llib-los.ln \ + $(SERVERSRC)/mi/llib-lmi.ln + DEFINES = -DXF86MONOVGA SubdirLibraryRule($(OBJS)) NormalLibraryObjectRule() - -ObjectFromSpecialSource(maskbits,$(SERVERSRC)/mfb/maskbits,/**/) -ObjectFromSpecialSource(mfbbitblt,$(SERVERSRC)/mfb/mfbbitblt,/**/) -ObjectFromSpecialSource(mfbblt,$(SERVERSRC)/mfb/mfbblt,/**/) -ObjectFromSpecialSource(mfbbres,$(SERVERSRC)/mfb/mfbbres,/**/) -ObjectFromSpecialSource(mfbbresd,$(SERVERSRC)/mfb/mfbbresd,/**/) -ObjectFromSpecialSource(mfbbstore,$(SERVERSRC)/mfb/mfbbstore,/**/) -ObjectFromSpecialSource(mfbclip,$(SERVERSRC)/mfb/mfbclip,/**/) -ObjectFromSpecialSource(mfbcmap,$(SERVERSRC)/mfb/mfbcmap,/**/) -ObjectFromSpecialSource(mfbfillarc,$(SERVERSRC)/mfb/mfbfillarc,/**/) -ObjectFromSpecialSource(mfbfillrct,$(SERVERSRC)/mfb/mfbfillrct,/**/) -ObjectFromSpecialSource(mfbfillsp,$(SERVERSRC)/mfb/mfbfillsp,/**/) -ObjectFromSpecialSource(mfbfont,$(SERVERSRC)/mfb/mfbfont,/**/) -ObjectFromSpecialSource(mfbgc,$(SERVERSRC)/mfb/mfbgc,/**/) -ObjectFromSpecialSource(mfbgetsp,$(SERVERSRC)/mfb/mfbgetsp,/**/) -ObjectFromSpecialSource(mfbhrzvert,$(SERVERSRC)/mfb/mfbhrzvert,/**/) -ObjectFromSpecialSource(mfbimage,$(SERVERSRC)/mfb/mfbimage,/**/) -ObjectFromSpecialSource(mfbimggblt,$(SERVERSRC)/mfb/mfbimggblt,/**/) -ObjectFromSpecialSource(mfbline,$(SERVERSRC)/mfb/mfbline,/**/) -ObjectFromSpecialSource(mfbmisc,$(SERVERSRC)/mfb/mfbmisc,/**/) -ObjectFromSpecialSource(mfbpixmap,$(SERVERSRC)/mfb/mfbpixmap,/**/) -ObjectFromSpecialSource(mfbplygblt,$(SERVERSRC)/mfb/mfbplygblt,/**/) -ObjectFromSpecialSource(mfbpntarea,$(SERVERSRC)/mfb/mfbpntarea,/**/) -ObjectFromSpecialSource(mfbpntwin,$(SERVERSRC)/mfb/mfbpntwin,/**/) -ObjectFromSpecialSource(mfbpolypnt,$(SERVERSRC)/mfb/mfbpolypnt,/**/) -ObjectFromSpecialSource(mfbpushpxl,$(SERVERSRC)/mfb/mfbpushpxl,/**/) -ObjectFromSpecialSource(mfbscrclse,$(SERVERSRC)/mfb/mfbscrclse,/**/) -ObjectFromSpecialSource(mfbscrinit,$(SERVERSRC)/mfb/mfbscrinit,/**/) -ObjectFromSpecialSource(mfbsetsp,$(SERVERSRC)/mfb/mfbsetsp,/**/) -ObjectFromSpecialSource(mfbtegblt,$(SERVERSRC)/mfb/mfbtegblt,/**/) -ObjectFromSpecialSource(mfbtile,$(SERVERSRC)/mfb/mfbtile,/**/) -ObjectFromSpecialSource(mfbwindow,$(SERVERSRC)/mfb/mfbwindow,/**/) -ObjectFromSpecialSource(mfbzerarc,$(SERVERSRC)/mfb/mfbzerarc,/**/) -ObjectFromSpecialSource(mfbply1rct,$(SERVERSRC)/mfb/mfbply1rct,/**/) +NormalLintTarget($(LINTDEFS) $(SRCS1)) + +#define MfbSourceDir $(SERVERSRC)/mfb + +LinkSourceFile(maskbits.c,MfbSourceDir) +LinkSourceFile(mfbbitblt.c,MfbSourceDir) +LinkSourceFile(mfbblt.c,MfbSourceDir) +LinkSourceFile(mfbbres.c,MfbSourceDir) +LinkSourceFile(mfbbresd.c,MfbSourceDir) +LinkSourceFile(mfbbstore.c,MfbSourceDir) +LinkSourceFile(mfbclip.c,MfbSourceDir) +LinkSourceFile(mfbcmap.c,MfbSourceDir) +LinkSourceFile(mfbfillarc.c,MfbSourceDir) +LinkSourceFile(mfbfillrct.c,MfbSourceDir) +LinkSourceFile(mfbfillsp.c,MfbSourceDir) +LinkSourceFile(mfbfont.c,MfbSourceDir) +LinkSourceFile(mfbgc.c,MfbSourceDir) +LinkSourceFile(mfbgetsp.c,MfbSourceDir) +LinkSourceFile(mfbhrzvert.c,MfbSourceDir) +LinkSourceFile(mfbimage.c,MfbSourceDir) +LinkSourceFile(mfbimggblt.c,MfbSourceDir) +LinkSourceFile(mfbline.c,MfbSourceDir) +LinkSourceFile(mfbmisc.c,MfbSourceDir) +LinkSourceFile(mfbpixmap.c,MfbSourceDir) +LinkSourceFile(mfbply1rct.c,MfbSourceDir) +LinkSourceFile(mfbplygblt.c,MfbSourceDir) +LinkSourceFile(mfbpntarea.c,MfbSourceDir) +LinkSourceFile(mfbpntwin.c,MfbSourceDir) +LinkSourceFile(mfbpolypnt.c,MfbSourceDir) +LinkSourceFile(mfbpushpxl.c,MfbSourceDir) +LinkSourceFile(mfbscrclse.c,MfbSourceDir) +LinkSourceFile(mfbscrinit.c,MfbSourceDir) +LinkSourceFile(mfbsetsp.c,MfbSourceDir) +LinkSourceFile(mfbtegblt.c,MfbSourceDir) +LinkSourceFile(mfbtile.c,MfbSourceDir) +LinkSourceFile(mfbwindow.c,MfbSourceDir) +LinkSourceFile(mfbzerarc.c,MfbSourceDir) ObjectFromSpecialSource(mfbseg,mfbline,-DPOLYSEGMENT) diff --git a/programs/Xserver/hw/xfree86/vga256/drivers/Imakefile b/programs/Xserver/hw/xfree86/vga256/drivers/Imakefile index 8cf6336fd..167e27808 100644 --- a/programs/Xserver/hw/xfree86/vga256/drivers/Imakefile +++ b/programs/Xserver/hw/xfree86/vga256/drivers/Imakefile @@ -1,4 +1,5 @@ XCOMM $XConsortium: Imakefile,v 1.1 94/03/28 21:47:31 dpw Exp $ +XCOMM $XFree86$ #include <Server.tmpl> #define IHaveSubdirs @@ -9,7 +10,7 @@ SRCS = */?*.c OBJS = */?*_drv.o -all:: subdirs libdriver256.a +all:: libdriver256.a NormalLibraryObjectRule() @@ -17,7 +18,7 @@ NamedMakeSubdirs(subdirs,$(SUBDIRS)) InstallLinkKitLibrary(driver256,$(LINKKITDIR)/drivers) -NormalDepLibraryTarget(driver256,$(SUBDIRS),$(OBJS)) +NormalDepLibraryTarget(driver256,subdirs,$(OBJS)) DependSubdirs($(SUBDIRS)) diff --git a/programs/Xserver/hw/xfree86/vga256/drivers/et4000/Imakefile b/programs/Xserver/hw/xfree86/vga256/drivers/et4000/Imakefile index 931d8e867..5dba886b3 100644 --- a/programs/Xserver/hw/xfree86/vga256/drivers/et4000/Imakefile +++ b/programs/Xserver/hw/xfree86/vga256/drivers/et4000/Imakefile @@ -1,17 +1,10 @@ XCOMM $XConsortium: Imakefile,v 1.1 94/03/28 21:50:53 dpw Exp $ +XCOMM $XFree86$ #include <Server.tmpl> -#if i386Mach -SRCS = et4_driver.c -#else -SRCS = et4_driver.c bank.s -#endif +SRCS = et4_driver.c et4_bank.s -#if defined(i386BsdArchitecture) -OBJS = driver4.o bank4.o -#else -OBJS = et4_driver.o bank.o -#endif +OBJS = et4_driver.o et4_bank.o #if XF86LinkKit INCLUDES = -I. -I../../../include -I../.. @@ -25,10 +18,7 @@ NormalAsmObjectRule() NormalRelocatableTarget(et4_drv, $(OBJS)) -#if defined(i386BsdArchitecture) -ObjectFromSpecialAsmSource(bank4,bank,NullParameter) -ObjectFromSpecialSource(driver4,et4_driver,NullParameter) -#endif +ObjectFromSpecialAsmSource(et4_bank,bank,NullParameter) InstallLinkKitNonExecFile(et4_driver.c,$(LINKKITDIR)/drivers/vga256/et4000) InstallLinkKitNonExecFile(bank.s,$(LINKKITDIR)/drivers/vga256/et4000) |