Index: xc/ChangeLog =================================================================== RCS file: /cvs/xorg/xc/ChangeLog,v retrieving revision 1.799 diff -u -2 -0 -r1.799 ChangeLog --- xc/ChangeLog 7 Mar 2005 19:00:10 -0000 1.799 +++ xc/ChangeLog 7 Mar 2005 19:19:26 -0000 @@ -1,21 +1,102 @@ 2005-03-07 Roland Mainz + * xc/config/cf/Imake.rules + * xc/programs/Xserver/hw/xfree86/Imakefile + * xc/programs/Xserver/hw/xfree86/drivers/apm/Imakefile + * xc/programs/Xserver/hw/xfree86/drivers/ark/Imakefile + * xc/programs/Xserver/hw/xfree86/drivers/ati/Imakefile + * xc/programs/Xserver/hw/xfree86/drivers/chips/Imakefile + * xc/programs/Xserver/hw/xfree86/drivers/cirrus/Imakefile + * xc/programs/Xserver/hw/xfree86/drivers/cyrix/Imakefile + * xc/programs/Xserver/hw/xfree86/drivers/dummy/Imakefile + * xc/programs/Xserver/hw/xfree86/drivers/fbdev/Imakefile + * xc/programs/Xserver/hw/xfree86/drivers/glide/Imakefile + * xc/programs/Xserver/hw/xfree86/drivers/glint/Imakefile + * xc/programs/Xserver/hw/xfree86/drivers/i128/Imakefile + * xc/programs/Xserver/hw/xfree86/drivers/i2c/Imakefile + * xc/programs/Xserver/hw/xfree86/drivers/i740/Imakefile + * xc/programs/Xserver/hw/xfree86/drivers/i810/Imakefile + * xc/programs/Xserver/hw/xfree86/drivers/imstt/Imakefile + * xc/programs/Xserver/hw/xfree86/drivers/mga/Imakefile + * xc/programs/Xserver/hw/xfree86/drivers/neomagic/Imakefile + * xc/programs/Xserver/hw/xfree86/drivers/newport/Imakefile + * xc/programs/Xserver/hw/xfree86/drivers/nsc/Imakefile + * xc/programs/Xserver/hw/xfree86/drivers/nv/Imakefile + * xc/programs/Xserver/hw/xfree86/drivers/rendition/Imakefile + * xc/programs/Xserver/hw/xfree86/drivers/s3/Imakefile + * xc/programs/Xserver/hw/xfree86/drivers/s3virge/Imakefile + * xc/programs/Xserver/hw/xfree86/drivers/savage/Imakefile + * xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/Imakefile + * xc/programs/Xserver/hw/xfree86/drivers/sis/Imakefile + * xc/programs/Xserver/hw/xfree86/drivers/sisusb/Imakefile + * xc/programs/Xserver/hw/xfree86/drivers/sunbw2/Imakefile + * xc/programs/Xserver/hw/xfree86/drivers/suncg14/Imakefile + * xc/programs/Xserver/hw/xfree86/drivers/suncg3/Imakefile + * xc/programs/Xserver/hw/xfree86/drivers/suncg6/Imakefile + * xc/programs/Xserver/hw/xfree86/drivers/sunffb/Imakefile + * xc/programs/Xserver/hw/xfree86/drivers/sunleo/Imakefile + * xc/programs/Xserver/hw/xfree86/drivers/suntcx/Imakefile + * xc/programs/Xserver/hw/xfree86/drivers/tdfx/Imakefile + * xc/programs/Xserver/hw/xfree86/drivers/tga/Imakefile + * xc/programs/Xserver/hw/xfree86/drivers/trident/Imakefile + * xc/programs/Xserver/hw/xfree86/drivers/tseng/Imakefile + * xc/programs/Xserver/hw/xfree86/drivers/v4l/Imakefile + * xc/programs/Xserver/hw/xfree86/drivers/vesa/Imakefile + * xc/programs/Xserver/hw/xfree86/drivers/vga/Imakefile + * xc/programs/Xserver/hw/xfree86/drivers/via/Imakefile + * xc/programs/Xserver/hw/xfree86/drivers/vmware/Imakefile + * xc/programs/Xserver/hw/xfree86/drivers/voodoo/Imakefile + * xc/programs/Xserver/hw/xfree86/drivers/wsfb/Imakefile + * xc/programs/Xserver/hw/xfree86/input/acecad/Imakefile + * xc/programs/Xserver/hw/xfree86/input/aiptek/Imakefile + * xc/programs/Xserver/hw/xfree86/input/calcomp/Imakefile + * xc/programs/Xserver/hw/xfree86/input/citron/Imakefile + * xc/programs/Xserver/hw/xfree86/input/digitaledge/Imakefile + * xc/programs/Xserver/hw/xfree86/input/dmc/Imakefile + * xc/programs/Xserver/hw/xfree86/input/dynapro/Imakefile + * xc/programs/Xserver/hw/xfree86/input/elo2300/Imakefile + * xc/programs/Xserver/hw/xfree86/input/elographics/Imakefile + * xc/programs/Xserver/hw/xfree86/input/evdev/Imakefile + * xc/programs/Xserver/hw/xfree86/input/fpit/Imakefile + * xc/programs/Xserver/hw/xfree86/input/hyperpen/Imakefile + * xc/programs/Xserver/hw/xfree86/input/jamstudio/Imakefile + * xc/programs/Xserver/hw/xfree86/input/joystick/Imakefile + * xc/programs/Xserver/hw/xfree86/input/keyboard/Imakefile + * xc/programs/Xserver/hw/xfree86/input/magellan/Imakefile + * xc/programs/Xserver/hw/xfree86/input/magictouch/Imakefile + * xc/programs/Xserver/hw/xfree86/input/microtouch/Imakefile + * xc/programs/Xserver/hw/xfree86/input/mouse/Imakefile + * xc/programs/Xserver/hw/xfree86/input/mutouch/Imakefile + * xc/programs/Xserver/hw/xfree86/input/palmax/Imakefile + * xc/programs/Xserver/hw/xfree86/input/penmount/Imakefile + * xc/programs/Xserver/hw/xfree86/input/sample/Imakefile + * xc/programs/Xserver/hw/xfree86/input/spaceorb/Imakefile + * xc/programs/Xserver/hw/xfree86/input/summa/Imakefile + * xc/programs/Xserver/hw/xfree86/input/tek4957/Imakefile + * xc/programs/Xserver/hw/xfree86/input/ur98/Imakefile + * xc/programs/Xserver/hw/xfree86/input/void/Imakefile + * xc/programs/Xserver/hw/xfree86/input/wacom/Imakefile + Bugzilla #2663 (https://bugs.freedesktop.org/show_bug.cgi?id=2663) + attachment #xxx (https://bugs.freedesktop.org/attachment.cgi?id=xxx): + Cleanup Xorg server module installation. + +2005-03-07 Roland Mainz * xc/config/cf/X11.tmpl * xc/extras/freetype2/ChangeLog * xc/extras/freetype2/Jamfile * xc/extras/freetype2/README * xc/extras/freetype2/builds/freetype.mk * xc/extras/freetype2/builds/unix/configure * xc/extras/freetype2/builds/unix/configure.ac * xc/extras/freetype2/builds/win32/visualc/freetype.dsp * xc/extras/freetype2/builds/win32/visualc/freetype.vcproj * xc/extras/freetype2/builds/win32/visualc/index.html * xc/extras/freetype2/devel/ftoption.h * xc/extras/freetype2/docs/CHANGES * xc/extras/freetype2/docs/VERSION.DLL * xc/extras/freetype2/docs/formats.txt * xc/extras/freetype2/include/freetype/cache/ftcmru.h * xc/extras/freetype2/include/freetype/config/ftmodule.h * xc/extras/freetype2/include/freetype/config/ftoption.h * xc/extras/freetype2/include/freetype/freetype.h * xc/extras/freetype2/include/freetype/ftcache.h * xc/extras/freetype2/include/freetype/ftmm.h Index: xc/config/cf/Imake.rules =================================================================== RCS file: /cvs/xorg/xc/config/cf/Imake.rules,v retrieving revision 1.8 diff -u -2 -0 -r1.8 Imake.rules --- xc/config/cf/Imake.rules 1 Feb 2005 22:27:00 -0000 1.8 +++ xc/config/cf/Imake.rules 7 Mar 2005 19:19:27 -0000 @@ -3529,40 +3529,62 @@ #ifndef InstallDynamicModule #define InstallDynamicModule(module,dest,subdir) @@\ AllTarget(module) @@\ LinkBuildModule(module,subdir) @@\ @@\ install:: module @@\ MakeDir($(DESTDIR)dest/subdir) @@\ $(INSTALL) -c $(INSTDATFLAGS) module $(DESTDIR)dest/subdir #endif #ifndef InstallDynamicNamedModule #define InstallDynamicNamedModule(module,instname,dest,subdir) @@\ AllTarget(module) @@\ LinkBuildNamedModule(module,instname,subdir) @@\ @@\ install:: module @@\ MakeDir($(DESTDIR)dest/subdir) @@\ $(INSTALL) -c $(INSTDATFLAGS) module $(DESTDIR)dest/subdir/instname #endif +/* Shortcuts for installing driver module, one per class */ +#ifndef InstallVideoObjectModule +#define InstallVideoObjectModule(module,dest) @@\ +InstallObjectModule(module,dest,drivers) +#endif +#ifndef InstallInputObjectModule +#define InstallInputObjectModule(module,dest) @@\ +InstallObjectModule(module,dest,input) +#endif +#ifndef InstallExtensionsObjectModule +#define InstallExtensionsObjectModule(module,dest) @@\ +InstallObjectModule(module,dest,extensions) +#endif +#ifndef InstallFontsObjectModule +#define InstallFontsObjectModule(module,dest) @@\ +InstallObjectModule(module,dest,fonts) +#endif +#ifndef InstallMultimediaObjectModule +#define InstallMultimediaObjectModule(module,dest) @@\ +InstallObjectModule(module,dest,multimedia) +#endif + #ifndef InstallObjectModule #if !DoLoadableServer #define InstallObjectModule(module,dest,subdir) /**/ #else #if MakeDllModules #define InstallObjectModule(module,dest,subdir) @@\ InstallDynamicModule(Concat(module,_drv.so),dest,subdir) #else #define InstallObjectModule(module,dest,subdir) @@\ InstallDynamicModule(Concat(module,_drv.o),dest,subdir) #endif #endif #endif #ifndef InstallLibraryModule #if !DoLoadableServer #define InstallLibraryModule(module,dest,subdir) /**/ #else #if MakeDllModules #define InstallLibraryModule(module,dest,subdir) @@\ Index: xc/programs/Xserver/hw/xfree86/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/Imakefile,v retrieving revision 1.4 diff -u -2 -0 -r1.4 Imakefile --- xc/programs/Xserver/hw/xfree86/Imakefile 17 Sep 2004 03:04:50 -0000 1.4 +++ xc/programs/Xserver/hw/xfree86/Imakefile 7 Mar 2005 19:19:42 -0000 @@ -204,22 +204,31 @@ -DNETBSDNEWMOUSEDEV=$(NETBSDNEWMOUSEDEV) \ -DLINUXMOUSEDEV=$(LINUXMOUSEDEV) \ -DMANPAGE=$(MANPAGE) '-DMODULEPATH="$(MODULEDIR)"', \ $(ICONFIGFILES)) InstallDriverSDKNonExecFile($(XORGCONFIG),$(DRIVERSDKDIR)) InstallDriverSDKNonExecFile($(XF98CONFIG),$(DRIVERSDKDIR)) EXTRAMANDEFS=-D__logdir__=$(LOGDIRECTORY) InstallManPage(Xorg,$(MANDIR)) InstallGenManPage(xorg.conf,$(FILEMANDIR),$(FILEMANSUFFIX)) #if 0 InstallNamedNonExec($(XORGCONFIG),XF86Config.eg,$(LIBDIR)) InstallNamedNonExec($(XF98CONFIG),XF86Config.98,$(LIBDIR)) #endif InstallNamedNonExec(Options,Options,$(LIBDIR)) InstallDriverSDKNamedNonExec($(XORGCONFIG),XF86Config.eg,$(DRIVERSDKDIR)) +XCOMM make sure all neccesary module dirs exist to avoid breaking +XCOMM the installation process on some platforms +InstallDirectory($(DESTDIR)$(MODULEDIR)/drivers) +InstallDirectory($(DESTDIR)$(MODULEDIR)/input) +InstallDirectory($(DESTDIR)$(MODULEDIR)/multimedia) +InstallDirectory($(DESTDIR)$(MODULEDIR)/extensions) +InstallDirectory($(DESTDIR)$(MODULEDIR)/fonts) +InstallDirectory($(DESTDIR)$(MODULEDIR)/internal) + MakeSubdirs($(SUBDIRS)) DependSubdirs($(SUBDIRS)) Index: xc/programs/Xserver/hw/xfree86/drivers/apm/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/apm/Imakefile,v retrieving revision 1.2 diff -u -2 -0 -r1.2 Imakefile --- xc/programs/Xserver/hw/xfree86/drivers/apm/Imakefile 23 Apr 2004 19:25:03 -0000 1.2 +++ xc/programs/Xserver/hw/xfree86/drivers/apm/Imakefile 7 Mar 2005 19:19:42 -0000 @@ -20,41 +20,41 @@ -I$(SERVERSRC)/mfb -I$(SERVERSRC)/mi \ -I$(SERVERSRC)/fb -I$(XF86SRC)/xaa \ -I$(XF86SRC)/xf1bpp -I$(XF86SRC)/xf4bpp \ -I$(XF86SRC)/vgahw -I$(XF86SRC)/ramdac \ -I$(XF86SRC)/rac -I$(XF86SRC)/int10 \ -I$(XF86SRC)/shadowfb \ -I$(XF86SRC)/i2c -I$(XF86SRC)/ddc \ -I$(SERVERSRC)/Xext -I$(EXTINCSRC) -I$(SERVERSRC)/render \ -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ -I$(XF86SRC)/vbe -I$(FONTINCSRC) #endif #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget(apm,$(OBJS)) -InstallObjectModule(apm,$(MODULEDIR),drivers) +InstallVideoObjectModule(apm,$(MODULEDIR)) #if !defined(XF86DriverSDK) InstallModuleManPage(apm) #endif DependTarget() InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/drivers/apm) InstallDriverSDKNonExecFile(apm.h,$(DRIVERSDKDIR)/drivers/apm) InstallDriverSDKNonExecFile(apm_regs.h,$(DRIVERSDKDIR)/drivers/apm) InstallDriverSDKNonExecFile(apm_accel.c,$(DRIVERSDKDIR)/drivers/apm) InstallDriverSDKNonExecFile(apm_cursor.c,$(DRIVERSDKDIR)/drivers/apm) InstallDriverSDKNonExecFile(apm_dga.c,$(DRIVERSDKDIR)/drivers/apm) InstallDriverSDKNonExecFile(apm_driver.c,$(DRIVERSDKDIR)/drivers/apm) InstallDriverSDKNonExecFile(apm_i2c.c,$(DRIVERSDKDIR)/drivers/apm) InstallDriverSDKNonExecFile(apm_funcs.c,$(DRIVERSDKDIR)/drivers/apm) InstallDriverSDKNonExecFile(apm_video.c,$(DRIVERSDKDIR)/drivers/apm) #if BuildXF86RushExt InstallDriverSDKNonExecFile(apm_rush.c,$(DRIVERSDKDIR)/drivers/apm) #endif Index: xc/programs/Xserver/hw/xfree86/drivers/ark/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/ark/Imakefile,v retrieving revision 1.3 diff -u -2 -0 -r1.3 Imakefile --- xc/programs/Xserver/hw/xfree86/drivers/ark/Imakefile 24 Sep 2004 00:07:35 -0000 1.3 +++ xc/programs/Xserver/hw/xfree86/drivers/ark/Imakefile 7 Mar 2005 19:19:42 -0000 @@ -19,30 +19,30 @@ -I$(SERVERSRC)/fb -I$(SERVERSRC)/mi \ -I$(XF86SRC)/xaa -I$(XF86SRC)/xf1bpp \ -I$(XF86SRC)/xf4bpp -I$(SERVERSRC)/Xext \ -I$(XF86SRC)/vgahw -I$(XF86SRC)/ramdac \ -I$(XF86SRC)/rac -I$(XF86SRC)/int10 \ -I$(XF86SRC)/fbdevhw -I$(XF86SRC)/ddc \ -I$(XF86SRC)/i2c \ -I$(SERVERSRC)/include -I$(XINCLUDESRC) -I$(FONTINCSRC) \ -I$(EXTINCSRC) -I$(SERVERSRC)/render #endif #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif NormalAsmObjectRule() ModuleObjectRule() ObjectModuleTarget(ark, $(OBJS)) -InstallObjectModule(ark,$(MODULEDIR),drivers) +InstallVideoObjectModule(ark,$(MODULEDIR)) DependTarget() InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/drivers/ark) InstallDriverSDKNonExecFile(ark.h,$(DRIVERSDKDIR)/drivers/ark) InstallDriverSDKNonExecFile(ark_reg.h,$(DRIVERSDKDIR)/drivers/ark) InstallDriverSDKNonExecFile(ark_driver.c,$(DRIVERSDKDIR)/drivers/ark) InstallDriverSDKNonExecFile(ark_accel.c,$(DRIVERSDKDIR)/drivers/ark) Index: xc/programs/Xserver/hw/xfree86/drivers/ati/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/ati/Imakefile,v retrieving revision 1.12 diff -u -2 -0 -r1.12 Imakefile --- xc/programs/Xserver/hw/xfree86/drivers/ati/Imakefile 6 Dec 2004 15:53:00 -0000 1.12 +++ xc/programs/Xserver/hw/xfree86/drivers/ati/Imakefile 7 Mar 2005 19:19:42 -0000 @@ -207,45 +207,45 @@ -I$(XF86SRC)/xf4bpp -I$(XF86SRC)/xf1bpp \ -I$(XF86SRC)/vgahw -I$(XF86SRC)/fbdevhw \ -I$(SERVERSRC)/mfb -I$(SERVERSRC)/fb -I$(SERVERSRC)/mi \ -I$(SERVERSRC)/miext/shadow \ -I$(SERVERSRC)/render -I$(SERVERSRC)/Xext -I$(SERVERSRC)/include \ $(DRIINCLUDES) -I$(FONTINCSRC) -I$(EXTINCSRC) -I$(XINCLUDESRC) #endif #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget(ati,$(OBJS1)) ObjectModuleTarget(atimisc,$(OBJS2)) ObjectModuleTarget(r128,$(OBJS3)) ObjectModuleTarget(radeon,$(OBJS4)) ObjectModuleTarget(theatre, $(OBJS_THEATRE)) -InstallObjectModule(ati,$(MODULEDIR),drivers) -InstallObjectModule(atimisc,$(MODULEDIR),drivers) -InstallObjectModule(r128,$(MODULEDIR),drivers) -InstallObjectModule(radeon,$(MODULEDIR),drivers) -InstallObjectModule(theatre,$(MODULEDIR),multimedia) +InstallVideoObjectModule(ati,$(MODULEDIR)) +InstallVideoObjectModule(atimisc,$(MODULEDIR)) +InstallVideoObjectModule(r128,$(MODULEDIR)) +InstallVideoObjectModule(radeon,$(MODULEDIR)) +InstallMultimediaObjectModule(theatre,$(MODULEDIR)) #if !defined(XF86DriverSDK) #if 0 InstallModuleManPage(ati) #endif InstallModuleManPage(r128) InstallModuleManPage(radeon) #endif DependTarget() InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/drivers/ati) InstallDriverSDKNonExecFile(ati.c,$(DRIVERSDKDIR)/drivers/ati) InstallDriverSDKNonExecFile(ati.h,$(DRIVERSDKDIR)/drivers/ati) InstallDriverSDKNonExecFile(atiaccel.c,$(DRIVERSDKDIR)/drivers/ati) InstallDriverSDKNonExecFile(atiaccel.h,$(DRIVERSDKDIR)/drivers/ati) InstallDriverSDKNonExecFile(atiadapter.c,$(DRIVERSDKDIR)/drivers/ati) InstallDriverSDKNonExecFile(atiadapter.h,$(DRIVERSDKDIR)/drivers/ati) Index: xc/programs/Xserver/hw/xfree86/drivers/chips/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/chips/Imakefile,v retrieving revision 1.3 diff -u -2 -0 -r1.3 Imakefile --- xc/programs/Xserver/hw/xfree86/drivers/chips/Imakefile 24 Sep 2004 00:07:37 -0000 1.3 +++ xc/programs/Xserver/hw/xfree86/drivers/chips/Imakefile 7 Mar 2005 19:19:42 -0000 @@ -25,41 +25,41 @@ -I$(SERVERSRC)/mi -I$(SERVERSRC)/cfb -I$(SERVERSRC)/mfb \ -I$(XF86SRC)/xf1bpp -I$(XF86SRC)/xf4bpp -I$(SERVERSRC)/Xext \ -I$(XINCLUDESRC) -I$(XF86SRC)/xaa -I$(FONTINCSRC) \ -I$(XF86SRC)/ramdac -I$(XF86SRC)/rac -I$(XF86SRC)/ddc \ -I$(XF86SRC)/i2c -I$(XF86SRC)/shadowfb \ -I$(XF86SRC)/xf8_16bpp -I$(XF86SRC)/int10 \ -I$(XF86SRC)/vbe -I$(EXTINCSRC) -I$(SERVERSRC)/render #endif #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget(chips,$(OBJS)) ObjectFromSpecialSource(ct_accelmm, ct_accel, -DCHIPS_MMIO) ObjectFromSpecialSource(ct_accelhi, ct_accel, -DCHIPS_MMIO -DCHIPS_HIQV) -InstallObjectModule(chips,$(MODULEDIR),drivers) +InstallVideoObjectModule(chips,$(MODULEDIR)) #if !defined(XF86DriverSDK) InstallModuleManPage(chips) #endif DependTarget() InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/drivers/chips) InstallDriverSDKNonExecFile(ct_BlitMM.h,$(DRIVERSDKDIR)/drivers/chips) InstallDriverSDKNonExecFile(ct_Blitter.h,$(DRIVERSDKDIR)/drivers/chips) InstallDriverSDKNonExecFile(ct_BltHiQV.h,$(DRIVERSDKDIR)/drivers/chips) InstallDriverSDKNonExecFile(ct_accel.c,$(DRIVERSDKDIR)/drivers/chips) InstallDriverSDKNonExecFile(ct_bank.c,$(DRIVERSDKDIR)/drivers/chips) InstallDriverSDKNonExecFile(ct_cursor.c,$(DRIVERSDKDIR)/drivers/chips) InstallDriverSDKNonExecFile(ct_ddc.c,$(DRIVERSDKDIR)/drivers/chips) InstallDriverSDKNonExecFile(ct_dga.c,$(DRIVERSDKDIR)/drivers/chips) InstallDriverSDKNonExecFile(ct_driver.c,$(DRIVERSDKDIR)/drivers/chips) InstallDriverSDKNonExecFile(ct_driver.h,$(DRIVERSDKDIR)/drivers/chips) InstallDriverSDKNonExecFile(ct_regs.c,$(DRIVERSDKDIR)/drivers/chips) InstallDriverSDKNonExecFile(ct_shadow.c,$(DRIVERSDKDIR)/drivers/chips) Index: xc/programs/Xserver/hw/xfree86/drivers/cirrus/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/cirrus/Imakefile,v retrieving revision 1.3 diff -u -2 -0 -r1.3 Imakefile --- xc/programs/Xserver/hw/xfree86/drivers/cirrus/Imakefile 24 Sep 2004 00:07:39 -0000 1.3 +++ xc/programs/Xserver/hw/xfree86/drivers/cirrus/Imakefile 7 Mar 2005 19:19:42 -0000 @@ -60,41 +60,41 @@ InstallDynamicModule(Concat(module,.so),dest,subdir) #else #define InstallSubDriverObjectModule(module,dest,subdir) @@\ InstallDynamicModule(Concat(module,.o),dest,subdir) #endif #endif #endif XCOMM XCOMM End of extra rules XCOMM ModuleObjectRule() #if !DoLoadableServer ObjectModuleTarget(cirrus,$(COBJS) $(AOBJS) $(LOBJS)) #else ObjectModuleTarget(cirrus,$(COBJS)) #endif -InstallObjectModule(cirrus,$(MODULEDIR),drivers) +InstallVideoObjectModule(cirrus,$(MODULEDIR)) SubDriverObjectModuleTarget(cirrus_alpine,$(AOBJS)) InstallSubDriverObjectModule(cirrus_alpine,$(MODULEDIR),drivers) SubDriverObjectModuleTarget(cirrus_laguna,$(LOBJS)) InstallSubDriverObjectModule(cirrus_laguna,$(MODULEDIR),drivers) #if !defined(XF86DriverSDK) InstallModuleManPage(cirrus) #endif DependTarget() InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/drivers/cirrus) InstallDriverSDKNonExecFile(CirrusClk.c,$(DRIVERSDKDIR)/drivers/cirrus) InstallDriverSDKNonExecFile(cir_driver.c,$(DRIVERSDKDIR)/drivers/cirrus) InstallDriverSDKNonExecFile(cir_shadow.c,$(DRIVERSDKDIR)/drivers/cirrus) InstallDriverSDKNonExecFile(cir_dga.c,$(DRIVERSDKDIR)/drivers/cirrus) Index: xc/programs/Xserver/hw/xfree86/drivers/cyrix/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/cyrix/Imakefile,v retrieving revision 1.2 diff -u -2 -0 -r1.2 Imakefile --- xc/programs/Xserver/hw/xfree86/drivers/cyrix/Imakefile 23 Apr 2004 19:28:51 -0000 1.2 +++ xc/programs/Xserver/hw/xfree86/drivers/cyrix/Imakefile 7 Mar 2005 19:19:42 -0000 @@ -12,38 +12,38 @@ #if defined(XF86DriverSDK) INCLUDES = -I. -I../../include #else INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86OSSRC) -I$(SERVERSRC)/Xext \ -I$(SERVERSRC)/fb -I$(SERVERSRC)/mi -I$(XF86SRC)/i2c \ -I$(XF86SRC)/xaa -I$(XF86SRC)/rac -I$(XF86SRC)/shadowfb \ -I$(XF86SRC)/vgahw -I$(XF86SRC)/ddc -I$(XF86SRC)/ramdac \ -I$(FONTINCSRC) -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ -I$(XTOP)/include/extensions -I$(SERVERSRC)/render \ -I$(XF86SRC)/vbe -I$(XF86SRC)/int10 #endif #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget(cyrix,$(OBJS)) -InstallObjectModule(cyrix,$(MODULEDIR),drivers) +InstallVideoObjectModule(cyrix,$(MODULEDIR)) #if !defined(XF86DriverSDK) InstallModuleManPage(cyrix) #endif DependTarget() InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/drivers/cyrix) InstallDriverSDKNonExecFile(cyrix.h,$(DRIVERSDKDIR)/drivers/cyrix) InstallDriverSDKNonExecFile(cyrix_accel.c,$(DRIVERSDKDIR)/drivers/cyrix) InstallDriverSDKNonExecFile(cyrix_bank.c,$(DRIVERSDKDIR)/drivers/cyrix) InstallDriverSDKNonExecFile(cyrix_driver.c,$(DRIVERSDKDIR)/drivers/cyrix) InstallDriverSDKNonExecFile(cyrix_helper.c,$(DRIVERSDKDIR)/drivers/cyrix) InstallDriverSDKNonExecFile(cyrix_shadow.c,$(DRIVERSDKDIR)/drivers/cyrix) InstallDriverSDKObjectModule(cyrix,$(DRIVERSDKMODULEDIR),drivers) Index: xc/programs/Xserver/hw/xfree86/drivers/dummy/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/dummy/Imakefile,v retrieving revision 1.2 diff -u -2 -0 -r1.2 Imakefile --- xc/programs/Xserver/hw/xfree86/drivers/dummy/Imakefile 23 Apr 2004 19:30:15 -0000 1.2 +++ xc/programs/Xserver/hw/xfree86/drivers/dummy/Imakefile 7 Mar 2005 19:19:42 -0000 @@ -11,31 +11,31 @@ #if defined(XF86DriverSDK) INCLUDES = -I. -I../../include #else INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86OSSRC) \ -I$(SERVERSRC)/include -I$(SERVERSRC)/mi -I$(SERVERSRC)/fb \ -I$(SERVERSRC)/mfb -I$(XINCLUDESRC) -I$(FONTINCSRC) \ -I$(XF86SRC)/ramdac -I$(SERVERSRC)/Xext -I$(EXTINCSRC) \ -I$(SERVERSRC)/render #endif #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget(dummy,$(OBJS)) -InstallObjectModule(dummy,$(MODULEDIR),drivers) +InstallVideoObjectModule(dummy,$(MODULEDIR)) DependTarget() InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/drivers/dummy) InstallDriverSDKNonExecFile(dummy.h,$(DRIVERSDKDIR)/drivers/dummy) InstallDriverSDKNonExecFile(dummy_cursor.c,$(DRIVERSDKDIR)/drivers/dummy) InstallDriverSDKNonExecFile(dummy_dga.c,$(DRIVERSDKDIR)/drivers/dummy) InstallDriverSDKNonExecFile(dummy_driver.c,$(DRIVERSDKDIR)/drivers/dummy) InstallDriverSDKObjectModule(dummy,$(DRIVERSDKMODULEDIR),drivers) Index: xc/programs/Xserver/hw/xfree86/drivers/fbdev/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/fbdev/Imakefile,v retrieving revision 1.3 diff -u -2 -0 -r1.3 Imakefile --- xc/programs/Xserver/hw/xfree86/drivers/fbdev/Imakefile 24 Sep 2004 00:07:40 -0000 1.3 +++ xc/programs/Xserver/hw/xfree86/drivers/fbdev/Imakefile 7 Mar 2005 19:19:42 -0000 @@ -17,32 +17,32 @@ -I$(SERVERSRC)/afb \ -I$(SERVERSRC)/fb -I$(XF86SRC)/xaa \ -I$(XF86SRC)/fbdevhw -I$(XF86SRC)/ramdac \ -I$(XF86SRC)/ddc -I$(XF86SRC)/i2c \ -I$(XF86SRC)/rac \ -I$(SERVERSRC)/Xext \ -I$(FONTINCSRC) -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ -I$(SERVERSRC)/miext/shadow -I$(EXTINCSRC) -I$(SERVERSRC)/render #endif DEFINES = FbdevDefines #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget(fbdev,$(OBJS)) -InstallObjectModule(fbdev,$(MODULEDIR),drivers) +InstallVideoObjectModule(fbdev,$(MODULEDIR)) #if !defined(XF86DriverSDK) InstallModuleManPage(fbdev) #endif DependTarget() InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/drivers/fbdev) InstallDriverSDKNonExecFile(fbdev.c,$(DRIVERSDKDIR)/drivers/fbdev) InstallDriverSDKObjectModule(fbdev,$(DRIVERSDKMODULEDIR),drivers) Index: xc/programs/Xserver/hw/xfree86/drivers/glide/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/glide/Imakefile,v retrieving revision 1.3 diff -u -2 -0 -r1.3 Imakefile --- xc/programs/Xserver/hw/xfree86/drivers/glide/Imakefile 24 Sep 2004 00:07:43 -0000 1.3 +++ xc/programs/Xserver/hw/xfree86/drivers/glide/Imakefile 7 Mar 2005 19:19:43 -0000 @@ -23,30 +23,30 @@ #else INCLUDES = -I. -I$(GLIDE2INCDIR) -I$(XF86COMSRC) -I$(XF86OSSRC) \ -I$(SERVERSRC)/fb -I$(SERVERSRC)/mi \ -I$(XF86SRC)/xaa \ -I$(XF86SRC)/vgahw -I$(XF86SRC)/ramdac \ -I$(XF86SRC)/ddc -I$(XF86SRC)/i2c \ -I$(SERVERSRC)/Xext -I$(XF86SRC)/xf8_32bpp\ -I$(FONTINCSRC) -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ -I$(XF86SRC)/shadowfb \ -I$(EXTINCSRC) -I$(SERVERSRC)/render #endif #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget(glide,$(OBJS)) -InstallObjectModule(glide,$(MODULEDIR),drivers) +InstallVideoObjectModule(glide,$(MODULEDIR)) InstallModuleManPage(glide) DependTarget() InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/drivers/glide) InstallDriverSDKNonExecFile(glide_driver.c,$(DRIVERSDKDIR)/drivers/glide) InstallDriverSDKObjectModule(glide,$(DRIVERSDKMODULEDIR),drivers) Index: xc/programs/Xserver/hw/xfree86/drivers/glint/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/glint/Imakefile,v retrieving revision 1.4 diff -u -2 -0 -r1.4 Imakefile --- xc/programs/Xserver/hw/xfree86/drivers/glint/Imakefile 24 Sep 2004 00:07:44 -0000 1.4 +++ xc/programs/Xserver/hw/xfree86/drivers/glint/Imakefile 7 Mar 2005 19:19:43 -0000 @@ -39,41 +39,41 @@ -I$(XF86SRC)/rac -I$(XF86SRC)/int10 \ -I$(FONTINCSRC) \ -I$(XF86SRC)/xf8_32bpp -I$(XF86SRC)/xf1bpp \ -I$(XF86SRC)/xf4bpp -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ -I$(XF86SRC)/ddc -I$(XF86SRC)/i2c -I$(EXTINCSRC) $(DRIINCLUDES) \ -I$(XF86SRC)/shadowfb -I$(XF86SRC)/fbdevhw \ -I$(XF86SRC)/vbe \ -I$(SERVERSRC)/render #endif DEFINES = $(DRIDEFINES) -DPPC_MMIO_IS_BE -DSPARC_MMIO_IS_BE #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget(glint,$(OBJS)) -InstallObjectModule(glint,$(MODULEDIR),drivers) +InstallVideoObjectModule(glint,$(MODULEDIR)) #if !defined(XF86DriverSDK) InstallModuleManPage(glint) #endif DependTarget() InstallDriverSDKNonExecFile(IBMramdac.c,$(DRIVERSDKDIR)/drivers/glint) InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/drivers/glint) InstallDriverSDKNonExecFile(TIramdac.c,$(DRIVERSDKDIR)/drivers/glint) InstallDriverSDKNonExecFile(glint.h,$(DRIVERSDKDIR)/drivers/glint) InstallDriverSDKNonExecFile(glint_dri.c,$(DRIVERSDKDIR)/drivers/glint) InstallDriverSDKNonExecFile(glint_dri.h,$(DRIVERSDKDIR)/drivers/glint) InstallDriverSDKNonExecFile(glint_dripriv.h,$(DRIVERSDKDIR)/drivers/glint) InstallDriverSDKNonExecFile(glint_driver.c,$(DRIVERSDKDIR)/drivers/glint) InstallDriverSDKNonExecFile(glint_dga.c,$(DRIVERSDKDIR)/drivers/glint) InstallDriverSDKNonExecFile(glint_regs.h,$(DRIVERSDKDIR)/drivers/glint) InstallDriverSDKNonExecFile(glint_shadow.c,$(DRIVERSDKDIR)/drivers/glint) InstallDriverSDKNonExecFile(glint_common.h,$(DRIVERSDKDIR)/drivers/glint) InstallDriverSDKNonExecFile(pm2_accel.c,$(DRIVERSDKDIR)/drivers/glint) Index: xc/programs/Xserver/hw/xfree86/drivers/i128/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i128/Imakefile,v retrieving revision 1.3 diff -u -2 -0 -r1.3 Imakefile --- xc/programs/Xserver/hw/xfree86/drivers/i128/Imakefile 19 Sep 2004 04:45:12 -0000 1.3 +++ xc/programs/Xserver/hw/xfree86/drivers/i128/Imakefile 7 Mar 2005 19:19:43 -0000 @@ -16,41 +16,41 @@ -I$(SERVERSRC)/mi -I$(XF86SRC)/int10 \ -I$(XF86SRC)/xaa -I$(XF86SRC)/rac \ -I$(XF86SRC)/vgahw -I$(XF86SRC)/fbdevhw \ -I$(XF86SRC)/ramdac -I$(XF86SRC)/ddc -I$(XF86SRC)/i2c \ -I$(SERVERSRC)/Xext \ -I$(FONTINCSRC) -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ -I$(XF86SRC)/shadowfb -I$(EXTINCSRC) \ -I$(XF86SRC)/vbe $(DRIINCLUDES) -I$(SERVERSRC)/render #endif DEFINES = $(DRIDEFINES) #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget(i128,$(OBJS)) -InstallObjectModule(i128,$(MODULEDIR),drivers) +InstallVideoObjectModule(i128,$(MODULEDIR)) #if !defined(XF86DriverSDK) InstallModuleManPage(i128) #endif DependTarget() InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/drivers/i128) InstallDriverSDKNonExecFile(i128.h,$(DRIVERSDKDIR)/drivers/i128) InstallDriverSDKNonExecFile(i128reg.h,$(DRIVERSDKDIR)/drivers/i128) InstallDriverSDKNonExecFile(i128_driver.c,$(DRIVERSDKDIR)/drivers/i128) InstallDriverSDKNonExecFile(i128accel.c,$(DRIVERSDKDIR)/drivers/i128) InstallDriverSDKNonExecFile(i128init.c,$(DRIVERSDKDIR)/drivers/i128) InstallDriverSDKNonExecFile(i128IBMDAC.c,$(DRIVERSDKDIR)/drivers/i128) InstallDriverSDKNonExecFile(Ti302X.h,$(DRIVERSDKDIR)/drivers/i128) InstallDriverSDKNonExecFile(IBMRGB.h,$(DRIVERSDKDIR)/drivers/i128) InstallDriverSDKNonExecFile(i128dga.c,$(DRIVERSDKDIR)/drivers/i128) InstallDriverSDKObjectModule(i128,$(DRIVERSDKMODULEDIR),drivers) Index: xc/programs/Xserver/hw/xfree86/drivers/i2c/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i2c/Imakefile,v retrieving revision 1.1 diff -u -2 -0 -r1.1 Imakefile --- xc/programs/Xserver/hw/xfree86/drivers/i2c/Imakefile 30 Sep 2004 22:58:07 -0000 1.1 +++ xc/programs/Xserver/hw/xfree86/drivers/i2c/Imakefile 7 Mar 2005 19:19:43 -0000 @@ -47,46 +47,46 @@ INCLUDES = -I. -I../../include #else INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86OSSRC) -I$(XF86SRC) \ -I$(XF86SRC)/i2c -I$(SERVERSRC)/include \ -I$(EXTINCSRC) -I$(XINCLUDESRC) #endif #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget(fi1236,$(OBJS_FI1236)) ObjectModuleTarget(msp3430, $(OBJS_MSP3430)) ObjectModuleTarget(bt829, $(OBJS_BT829)) ObjectModuleTarget(tda9850, $(OBJS_TDA9850)) ObjectModuleTarget(tda8425, $(OBJS_TDA8425)) ObjectModuleTarget(tda9885, $(OBJS_TDA9885)) -InstallObjectModule(fi1236,$(MODULEDIR),multimedia) -InstallObjectModule(msp3430,$(MODULEDIR),multimedia) -InstallObjectModule(bt829,$(MODULEDIR),multimedia) -InstallObjectModule(tda9850,$(MODULEDIR),multimedia) -InstallObjectModule(tda8425,$(MODULEDIR),multimedia) -InstallObjectModule(tda9885,$(MODULEDIR),multimedia) +InstallMultimediaObjectModule(fi1236,$(MODULEDIR)) +InstallMultimediaObjectModule(msp3430,$(MODULEDIR)) +InstallMultimediaObjectModule(bt829,$(MODULEDIR)) +InstallMultimediaObjectModule(tda9850,$(MODULEDIR)) +InstallMultimediaObjectModule(tda8425,$(MODULEDIR)) +InstallMultimediaObjectModule(tda9885,$(MODULEDIR)) DependTarget() InstallDriverSDKNonExecFile(fi1236.c,$(DRIVERSDKDIR)/drivers/ati) InstallDriverSDKNonExecFile(fi1236_module.c,$(DRIVERSDKDIR)/drivers/ati) InstallDriverSDKNonExecFile(fi1236.h,$(DRIVERSDKDIR)/drivers/ati) InstallDriverSDKNonExecFile(msp3430.c,$(DRIVERSDKDIR)/drivers/ati) InstallDriverSDKNonExecFile(msp3430_module.c,$(DRIVERSDKDIR)/drivers/ati) InstallDriverSDKNonExecFile(msp3430.h,$(DRIVERSDKDIR)/drivers/ati) InstallDriverSDKNonExecFile(bt829.c,$(DRIVERSDKDIR)/drivers/ati) InstallDriverSDKNonExecFile(bt829_module.c,$(DRIVERSDKDIR)/drivers/ati) InstallDriverSDKNonExecFile(bt829.h,$(DRIVERSDKDIR)/drivers/ati) InstallDriverSDKNonExecFile(tda8425.c,$(DRIVERSDKDIR)/drivers/ati) InstallDriverSDKNonExecFile(tda8425_module.c,$(DRIVERSDKDIR)/drivers/ati) InstallDriverSDKNonExecFile(tda8425.h,$(DRIVERSDKDIR)/drivers/ati) InstallDriverSDKNonExecFile(tda9850.c,$(DRIVERSDKDIR)/drivers/ati) Index: xc/programs/Xserver/hw/xfree86/drivers/i740/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i740/Imakefile,v retrieving revision 1.3 diff -u -2 -0 -r1.3 Imakefile --- xc/programs/Xserver/hw/xfree86/drivers/i740/Imakefile 17 Sep 2004 03:04:51 -0000 1.3 +++ xc/programs/Xserver/hw/xfree86/drivers/i740/Imakefile 7 Mar 2005 19:19:43 -0000 @@ -13,41 +13,41 @@ #if defined(XF86DriverSDK) INCLUDES = -I. -I../../include #else INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86OSSRC) \ -I$(SERVERSRC)/mi -I$(XF86SRC)/xaa -I$(XF86SRC)/rac \ -I$(XF86SRC)/xaa -I$(XF86SRC)/ramdac \ -I$(XF86SRC)/vgahw -I$(XF86SRC)/ddc -I$(XF86SRC)/i2c \ -I$(SERVERSRC)/Xext -I$(XF86SRC)/vbe -I$(SERVERSRC)/fb\ -I$(FONTINCSRC) -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ -I$(EXTINCSRC) -I$(XF86SRC)/int10 -I$(SERVERSRC)/render #endif #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget(i740,$(OBJS)) -InstallObjectModule(i740,$(MODULEDIR),drivers) +InstallVideoObjectModule(i740,$(MODULEDIR)) #if !defined(XF86DriverSDK) InstallModuleManPage(i740) #endif DependTarget() InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/drivers/i740) InstallDriverSDKNonExecFile(i740.h,$(DRIVERSDKDIR)/drivers/i740) InstallDriverSDKNonExecFile(i740_accel.c,$(DRIVERSDKDIR)/drivers/i740) InstallDriverSDKNonExecFile(i740_cursor.c,$(DRIVERSDKDIR)/drivers/i740) InstallDriverSDKNonExecFile(i740_driver.c,$(DRIVERSDKDIR)/drivers/i740) InstallDriverSDKNonExecFile(i740_io.c,$(DRIVERSDKDIR)/drivers/i740) InstallDriverSDKNonExecFile(i740_macros.h,$(DRIVERSDKDIR)/drivers/i740) InstallDriverSDKNonExecFile(i740_reg.h,$(DRIVERSDKDIR)/drivers/i740) InstallDriverSDKNonExecFile(i740_dga.h,$(DRIVERSDKDIR)/drivers/i740) InstallDriverSDKNonExecFile(i740_dga.c,$(DRIVERSDKDIR)/drivers/i740) InstallDriverSDKNonExecFile(i740_i2c.c,$(DRIVERSDKDIR)/drivers/i740) InstallDriverSDKNonExecFile(i740_video.c,$(DRIVERSDKDIR)/drivers/i740) Index: xc/programs/Xserver/hw/xfree86/drivers/i810/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/i810/Imakefile,v retrieving revision 1.7 diff -u -2 -0 -r1.7 Imakefile --- xc/programs/Xserver/hw/xfree86/drivers/i810/Imakefile 6 Jan 2005 14:43:14 -0000 1.7 +++ xc/programs/Xserver/hw/xfree86/drivers/i810/Imakefile 7 Mar 2005 19:19:43 -0000 @@ -71,41 +71,41 @@ -I$(XF86SRC)/vgahw -I$(XF86SRC)/ddc -I$(XF86SRC)/i2c \ -I$(XF86SRC)/vbe -I$(XF86SRC)/int10 \ -I$(XF86SRC)/shadowfb \ -I$(SERVERSRC)/Xext \ -I$(FONTINCSRC) -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ -I$(EXTINCSRC) -I$(SERVERSRC)/render \ $(DRIINCLUDES) #endif DEFINES = $(DRIDEFINES) $(CHIPDEFINES) $(I830XVDEFINES) ObjectFromSpecialSource(i830_io, i810_io, -DBUILD_FOR_I830) #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget(i810,$(OBJS)) -InstallObjectModule(i810,$(MODULEDIR),drivers) +InstallVideoObjectModule(i810,$(MODULEDIR)) #if !defined(XF86DriverSDK) InstallModuleManPage(i810) #endif DependTarget() InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/drivers/i810) InstallDriverSDKNonExecFile(common.h,$(DRIVERSDKDIR)/drivers/i810) InstallDriverSDKNonExecFile(i810.h,$(DRIVERSDKDIR)/drivers/i810) InstallDriverSDKNonExecFile(i810_accel.c,$(DRIVERSDKDIR)/drivers/i810) InstallDriverSDKNonExecFile(i810_common.h,$(DRIVERSDKDIR)/drivers/i810) InstallDriverSDKNonExecFile(i810_cursor.c,$(DRIVERSDKDIR)/drivers/i810) InstallDriverSDKNonExecFile(i810_dga.c,$(DRIVERSDKDIR)/drivers/i810) InstallDriverSDKNonExecFile(i810_dri.c,$(DRIVERSDKDIR)/drivers/i810) InstallDriverSDKNonExecFile(i810_dri.h,$(DRIVERSDKDIR)/drivers/i810) InstallDriverSDKNonExecFile(i810_driver.c,$(DRIVERSDKDIR)/drivers/i810) InstallDriverSDKNonExecFile(i810_hwmc.c,$(DRIVERSDKDIR)/drivers/i810) InstallDriverSDKNonExecFile(i810_io.c,$(DRIVERSDKDIR)/drivers/i810) InstallDriverSDKNonExecFile(i810_memory.c,$(DRIVERSDKDIR)/drivers/i810) Index: xc/programs/Xserver/hw/xfree86/drivers/imstt/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/imstt/Imakefile,v retrieving revision 1.2 diff -u -2 -0 -r1.2 Imakefile --- xc/programs/Xserver/hw/xfree86/drivers/imstt/Imakefile 23 Apr 2004 19:36:46 -0000 1.2 +++ xc/programs/Xserver/hw/xfree86/drivers/imstt/Imakefile 7 Mar 2005 19:19:43 -0000 @@ -19,33 +19,33 @@ -I$(SERVERSRC)/fb -I$(SERVERSRC)/mi \ -I$(XF86SRC)/xaa \ -I$(XF86SRC)/xf1bpp -I$(XF86SRC)/xf4bpp \ -I$(SERVERSRC)/Xext \ -I$(XF86SRC)/vgahw -I$(XF86SRC)/ramdac \ -I$(XF86SRC)/rac -I$(XF86SRC)/int10 \ -I$(XF86SRC)/fbdevhw -I$(SERVERSRC)/render \ -I$(SERVERSRC)/include -I$(XINCLUDESRC) -I$(FONTINCSRC) \ -I$(EXTINCSRC) #endif #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif NormalAsmObjectRule() ModuleObjectRule() ObjectModuleTarget(imstt, $(OBJS)) -InstallObjectModule(imstt,$(MODULEDIR),drivers) +InstallVideoObjectModule(imstt,$(MODULEDIR)) #if !defined(XF86DriverSDK) InstallModuleManPage(imstt) #endif DependTarget() InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/drivers/imstt) InstallDriverSDKNonExecFile(imstt.h,$(DRIVERSDKDIR)/drivers/imstt) InstallDriverSDKNonExecFile(imstt_reg.h,$(DRIVERSDKDIR)/drivers/imstt) InstallDriverSDKNonExecFile(imstt_driver.c,$(DRIVERSDKDIR)/drivers/imstt) InstallDriverSDKNonExecFile(imstt_accel.c,$(DRIVERSDKDIR)/drivers/imstt) Index: xc/programs/Xserver/hw/xfree86/drivers/mga/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/mga/Imakefile,v retrieving revision 1.4 diff -u -2 -0 -r1.4 Imakefile --- xc/programs/Xserver/hw/xfree86/drivers/mga/Imakefile 24 Sep 2004 00:07:45 -0000 1.4 +++ xc/programs/Xserver/hw/xfree86/drivers/mga/Imakefile 7 Mar 2005 19:19:43 -0000 @@ -88,43 +88,43 @@ #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() #if BuildHalStatic ObjectModuleTarget(mga,$(OBJS)) #else ObjectModuleTarget(mga,$(MGAOBJS)) #endif #if BuildHalModule ObjectModuleTarget(mga_hal,$(MGAHALOBJS)) #endif ObjectFromSpecialSource(mga_storm8, mga_storm, -DPSZ=8) ObjectFromSpecialSource(mga_storm16, mga_storm, -DPSZ=16) ObjectFromSpecialSource(mga_storm24, mga_storm, -DPSZ=24) ObjectFromSpecialSource(mga_storm32, mga_storm, -DPSZ=32) -InstallObjectModule(mga,$(MODULEDIR),drivers) +InstallVideoObjectModule(mga,$(MODULEDIR)) #if BuildHalModule -InstallObjectModule(mga_hal,$(MODULEDIR),drivers) +InstallVideoObjectModule(mga_hal,$(MODULEDIR)) #endif #if !defined(XF86DriverSDK) InstallModuleManPage(mga) #endif DependTarget() InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/drivers/mga) InstallDriverSDKNonExecFile(mga.h,$(DRIVERSDKDIR)/drivers/mga) InstallDriverSDKNonExecFile(mga_arc.c,$(DRIVERSDKDIR)/drivers/mga) InstallDriverSDKNonExecFile(mga_bios.h,$(DRIVERSDKDIR)/drivers/mga) InstallDriverSDKNonExecFile(mga_dac3026.c,$(DRIVERSDKDIR)/drivers/mga) InstallDriverSDKNonExecFile(mga_dacG.c,$(DRIVERSDKDIR)/drivers/mga) InstallDriverSDKNonExecFile(mga_dga.c,$(DRIVERSDKDIR)/drivers/mga) InstallDriverSDKNonExecFile(mga_driver.c,$(DRIVERSDKDIR)/drivers/mga) InstallDriverSDKNonExecFile(mga_hwcurs.c,$(DRIVERSDKDIR)/drivers/mga) InstallDriverSDKNonExecFile(mga_macros.h,$(DRIVERSDKDIR)/drivers/mga) InstallDriverSDKNonExecFile(mga_map.h,$(DRIVERSDKDIR)/drivers/mga) InstallDriverSDKNonExecFile(mga_reg.h,$(DRIVERSDKDIR)/drivers/mga) Index: xc/programs/Xserver/hw/xfree86/drivers/neomagic/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/neomagic/Imakefile,v retrieving revision 1.3 diff -u -2 -0 -r1.3 Imakefile --- xc/programs/Xserver/hw/xfree86/drivers/neomagic/Imakefile 24 Sep 2004 00:07:46 -0000 1.3 +++ xc/programs/Xserver/hw/xfree86/drivers/neomagic/Imakefile 7 Mar 2005 19:19:43 -0000 @@ -17,41 +17,41 @@ INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86OSSRC) \ -I$(XF86SRC)/vgafb -I$(XF86SRC)/vgahw -I$(SERVERSRC)/include \ -I$(SERVERSRC)/mi -I$(SERVERSRC)/fb -I$(SERVERSRC)/mfb \ -I$(SERVERSRC)/miext/shadow \ -I$(XINCLUDESRC) -I$(XF86SRC)/xaa -I$(FONTINCSRC) \ -I$(XF86SRC)/ramdac -I$(XF86SRC)/rac -I$(XF86SRC)/ddc \ -I$(XF86SRC)/i2c -I$(XF86SRC)/shadowfb \ -I$(SERVERSRC)/Xext -I$(EXTINCSRC) \ -I$(XF86SRC)/int10 -I$(XF86SRC)/vbe -I$(SERVERSRC)/render #endif #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget(neomagic,$(OBJS)) -InstallObjectModule(neomagic,$(MODULEDIR),drivers) +InstallVideoObjectModule(neomagic,$(MODULEDIR)) #if !defined(XF86DriverSDK) InstallModuleManPage(neomagic) #endif DependTarget() InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/drivers/neomagic) InstallDriverSDKNonExecFile(neo.h,$(DRIVERSDKDIR)/drivers/neomagic) InstallDriverSDKNonExecFile(neo_2070.c,$(DRIVERSDKDIR)/drivers/neomagic) InstallDriverSDKNonExecFile(neo_2090.c,$(DRIVERSDKDIR)/drivers/neomagic) InstallDriverSDKNonExecFile(neo_2097.c,$(DRIVERSDKDIR)/drivers/neomagic) InstallDriverSDKNonExecFile(neo_2200.c,$(DRIVERSDKDIR)/drivers/neomagic) InstallDriverSDKNonExecFile(neo_bank.c,$(DRIVERSDKDIR)/drivers/neomagic) InstallDriverSDKNonExecFile(neo_cursor.c,$(DRIVERSDKDIR)/drivers/neomagic) InstallDriverSDKNonExecFile(neo_dga.c,$(DRIVERSDKDIR)/drivers/neomagic) InstallDriverSDKNonExecFile(neo_driver.c,$(DRIVERSDKDIR)/drivers/neomagic) InstallDriverSDKNonExecFile(neo_i2c.c,$(DRIVERSDKDIR)/drivers/neomagic) InstallDriverSDKNonExecFile(neo_shadow.c,$(DRIVERSDKDIR)/drivers/neomagic) InstallDriverSDKNonExecFile(neo_macros.h,$(DRIVERSDKDIR)/drivers/neomagic) Index: xc/programs/Xserver/hw/xfree86/drivers/newport/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/newport/Imakefile,v retrieving revision 1.4 diff -u -2 -0 -r1.4 Imakefile --- xc/programs/Xserver/hw/xfree86/drivers/newport/Imakefile 18 Feb 2005 21:39:48 -0000 1.4 +++ xc/programs/Xserver/hw/xfree86/drivers/newport/Imakefile 7 Mar 2005 19:19:43 -0000 @@ -12,41 +12,41 @@ #if defined(XF86DriverSDK) INCLUDES = -I. -I../../include #else INCLUDES = -I. \ -I$(XF86COMSRC) -I$(XF86OSSRC) \ -I$(SERVERSRC)/mi -I$(SERVERSRC)/fb \ -I$(XF86SRC)/shadowfb \ -I$(XF86SRC)/xaa -I$(XF86SRC)/ramdac \ -I$(EXTINCSRC) -I$(SERVERSRC)/Xext -I$(SERVERSRC)/render \ -I$(SERVERSRC)/include -I$(FONTINCSRC) -I$(XINCLUDESRC) #endif #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget(newport,$(OBJS)) -InstallObjectModule(newport,$(MODULEDIR),drivers) +InstallVideoObjectModule(newport,$(MODULEDIR)) #if 0 InstallNamedNonExec($(XF86CONFIG),$(XF86CONFIG),$(LIBDIR)) #endif #if !defined(XF86DriverSDK) InstallModuleManPage(newport) #endif DependTarget() InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/drivers/newport) InstallDriverSDKNonExecFile(newport_driver.c,$(DRIVERSDKDIR)/drivers/newport) InstallDriverSDKNonExecFile(newport_regs.c,$(DRIVERSDKDIR)/drivers/newport) InstallDriverSDKNonExecFile(newport_cmap.c,$(DRIVERSDKDIR)/drivers/newport) InstallDriverSDKNonExecFile(newport_shadow.c,$(DRIVERSDKDIR)/drivers/newport) InstallDriverSDKNonExecFile(newport_cursor.c,$(DRIVERSDKDIR)/drivers/newport) InstallDriverSDKNonExecFile(newport_accel.c,$(DRIVERSDKDIR)/drivers/newport) InstallDriverSDKNonExecFile(newport_regs.h,$(DRIVERSDKDIR)/drivers/newport) InstallDriverSDKNonExecFile(newport.h,$(DRIVERSDKDIR)/drivers/newport) Index: xc/programs/Xserver/hw/xfree86/drivers/nsc/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/nsc/Imakefile,v retrieving revision 1.3 diff -u -2 -0 -r1.3 Imakefile --- xc/programs/Xserver/hw/xfree86/drivers/nsc/Imakefile 17 Sep 2004 03:04:52 -0000 1.3 +++ xc/programs/Xserver/hw/xfree86/drivers/nsc/Imakefile 7 Mar 2005 19:19:43 -0000 @@ -68,41 +68,41 @@ -I$(XF86SRC)/vgahw -I$(XF86SRC)/ramdac \ -I$(XF86SRC)/ddc -I$(XF86SRC)/i2c \ -I$(XF86SRC)/rac -I$(XF86SRC)/int10 \ -I$(FONTINCSRC) -I$(XF86SRC)/xf8_32bpp -I$(XF86SRC)/xf1bpp \ -I$(XF86SRC)/xf4bpp -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ -I$(XF86SRC)/ddc -I$(XF86SRC)/i2c -I$(EXTINCSRC) $(DRIINCLUDES) \ -I$(XF86SRC)/shadowfb -I$(XF86SRC)/fbdevhw \ -I$(XTOP)/include -I$(XF86SRC)/vbe -I$(SERVERSRC)/render \ $(EXTINCLUDES) #endif #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget(nsc,$(OBJS)) -InstallObjectModule(nsc,$(MODULEDIR),drivers) +InstallVideoObjectModule(nsc,$(MODULEDIR)) #if !defined(XF86DriverSDK) CppManTarget(nsc,) InstallModuleManPage(nsc) #endif DependTarget() #ifdef i386Architecture ObjectFromAsmSource(nsc_msr_asm,NullParameter) #endif InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/drivers/nsc) InstallDriverSDKNonExecFile(durango.c,$(DRIVERSDKDIR)/drivers/nsc) InstallDriverSDKNonExecFile(nsc.h,$(DRIVERSDKDIR)/drivers/nsc) InstallDriverSDKNonExecFile(nsc_driver.c,$(DRIVERSDKDIR)/drivers/nsc) InstallDriverSDKNonExecFile(nsc_fourcc.h,$(DRIVERSDKDIR)/drivers/nsc) InstallDriverSDKNonExecFile(nsc_galfns.c,$(DRIVERSDKDIR)/drivers/nsc) InstallDriverSDKNonExecFile(nsc_galstub.c,$(DRIVERSDKDIR)/drivers/nsc) Index: xc/programs/Xserver/hw/xfree86/drivers/nv/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/nv/Imakefile,v retrieving revision 1.2 diff -u -2 -0 -r1.2 Imakefile --- xc/programs/Xserver/hw/xfree86/drivers/nv/Imakefile 23 Apr 2004 19:42:10 -0000 1.2 +++ xc/programs/Xserver/hw/xfree86/drivers/nv/Imakefile 7 Mar 2005 19:19:43 -0000 @@ -60,41 +60,41 @@ InstallDynamicModule(Concat(module,.so),dest,subdir) #else #define InstallSubDriverObjectModule(module,dest,subdir) @@\ InstallDynamicModule(Concat(module,.o),dest,subdir) #endif #endif #endif XCOMM XCOMM End of extra rules XCOMM ModuleObjectRule() #if !DoLoadableServer ObjectModuleTarget(nv,$(R_OBJS) $(N_OBJS)) #else ObjectModuleTarget(nv,$(N_OBJS)) #endif -InstallObjectModule(nv,$(MODULEDIR),drivers) +InstallVideoObjectModule(nv,$(MODULEDIR)) SubDriverObjectModuleTarget(riva128,$(R_OBJS)) InstallSubDriverObjectModule(riva128,$(MODULEDIR),drivers) #if !defined(XF86DriverSDK) InstallModuleManPage(nv) #endif DependTarget() InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/drivers/nv) InstallDriverSDKNonExecFile(riva_const.h,$(DRIVERSDKDIR)/drivers/nv) InstallDriverSDKNonExecFile(riva_cursor.c,$(DRIVERSDKDIR)/drivers/nv) InstallDriverSDKNonExecFile(riva_dac.c,$(DRIVERSDKDIR)/drivers/nv) InstallDriverSDKNonExecFile(riva_dga.c,$(DRIVERSDKDIR)/drivers/nv) InstallDriverSDKNonExecFile(riva_driver.c,$(DRIVERSDKDIR)/drivers/nv) InstallDriverSDKNonExecFile(riva_include.h,$(DRIVERSDKDIR)/drivers/nv) InstallDriverSDKNonExecFile(riva_local.h,$(DRIVERSDKDIR)/drivers/nv) InstallDriverSDKNonExecFile(riva_proto.h,$(DRIVERSDKDIR)/drivers/nv) Index: xc/programs/Xserver/hw/xfree86/drivers/rendition/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/rendition/Imakefile,v retrieving revision 1.3 diff -u -2 -0 -r1.3 Imakefile --- xc/programs/Xserver/hw/xfree86/drivers/rendition/Imakefile 19 Sep 2004 04:45:12 -0000 1.3 +++ xc/programs/Xserver/hw/xfree86/drivers/rendition/Imakefile 7 Mar 2005 19:19:43 -0000 @@ -25,41 +25,41 @@ -I$(XF86SRC)/shadowfb -I$(XF86SRC)/rac -I$(XF86SRC)/loader \ -I$(SERVERSRC)/render -I$(EXTINCSRC) #endif XCOMM XCOMM Temporary solution for the loader to find the microcode XCOMM DEFINES = -DMODULEDIR=\"$(MODULEDIR)/\" #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget(rendition,$(OBJS)) ObjectFromSpecialSource(accel, accelX, -DPSZ=16) -InstallObjectModule(rendition,$(MODULEDIR),drivers) +InstallVideoObjectModule(rendition,$(MODULEDIR)) InstallNonExecFile(v10002d.uc,$(MODULEDIR)) InstallNonExecFile(v20002d.uc,$(MODULEDIR)) #if !defined(XF86DriverSDK) InstallModuleManPage(rendition) #endif DependTarget() InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/drivers/rendition) InstallDriverSDKNonExecFile(cscode.h,$(DRIVERSDKDIR)/drivers/rendition) InstallDriverSDKNonExecFile(rendition.c,$(DRIVERSDKDIR)/drivers/rendition) InstallDriverSDKNonExecFile(rendition.h,$(DRIVERSDKDIR)/drivers/rendition) InstallDriverSDKNonExecFile(rendition_options.h,$(DRIVERSDKDIR)/drivers/rendition) InstallDriverSDKNonExecFile(rendition_shadow.c,$(DRIVERSDKDIR)/drivers/rendition) InstallDriverSDKNonExecFile(rendition_shadow.h,$(DRIVERSDKDIR)/drivers/rendition) InstallDriverSDKNonExecFile(commonregs.h,$(DRIVERSDKDIR)/drivers/rendition) InstallDriverSDKNonExecFile(v1kregs.h,$(DRIVERSDKDIR)/drivers/rendition) InstallDriverSDKNonExecFile(v1krisc.c,$(DRIVERSDKDIR)/drivers/rendition) InstallDriverSDKNonExecFile(v1krisc.h,$(DRIVERSDKDIR)/drivers/rendition) Index: xc/programs/Xserver/hw/xfree86/drivers/s3/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/s3/Imakefile,v retrieving revision 1.3 diff -u -2 -0 -r1.3 Imakefile --- xc/programs/Xserver/hw/xfree86/drivers/s3/Imakefile 17 Sep 2004 03:04:53 -0000 1.3 +++ xc/programs/Xserver/hw/xfree86/drivers/s3/Imakefile 7 Mar 2005 19:19:43 -0000 @@ -19,41 +19,41 @@ -I$(XF86SRC)/xaa \ -I$(XF86SRC)/xf1bpp -I$(XF86SRC)/xf4bpp \ -I$(SERVERSRC)/Xext \ -I$(XF86SRC)/vgahw -I$(XF86SRC)/ramdac \ -I$(XF86SRC)/rac -I$(XF86SRC)/int10 \ -I$(XF86SRC)/fbdevhw -I$(XF86SRC)/ddc \ -I$(XF86SRC)/i2c -I$(XF86SRC)/vbe \ -I$(SERVERSRC)/include -I$(XINCLUDESRC) -I$(FONTINCSRC) \ -I$(EXTINCSRC) -I$(SERVERSRC)/render #endif #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif NormalAsmObjectRule() ModuleObjectRule() ObjectModuleTarget(s3, $(OBJS)) -InstallObjectModule(s3,$(MODULEDIR),drivers) +InstallVideoObjectModule(s3,$(MODULEDIR)) DependTarget() ObjectFromSpecialSource(s3_accel_pio, s3_accel, -DS3_GENERIC) ObjectFromSpecialSource(s3_accel_newmmio, s3_accel, -DS3_NEWMMIO) SpecialCObjectRule(s3_video,$(_NOOP_), -DS3_NEWMMIO) InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/drivers/s3) InstallDriverSDKNonExecFile(newmmio.h,$(DRIVERSDKDIR)/drivers/s3) InstallDriverSDKNonExecFile(s3.h,$(DRIVERSDKDIR)/drivers/s3) InstallDriverSDKNonExecFile(s3_reg.h,$(DRIVERSDKDIR)/drivers/s3) InstallDriverSDKNonExecFile(s3_driver.c,$(DRIVERSDKDIR)/drivers/s3) InstallDriverSDKNonExecFile(s3_accel.c,$(DRIVERSDKDIR)/drivers/s3) InstallDriverSDKNonExecFile(s3_cursor.c,$(DRIVERSDKDIR)/drivers/s3) InstallDriverSDKNonExecFile(s3_video.c,$(DRIVERSDKDIR)/drivers/s3) InstallDriverSDKNonExecFile(s3_dga.c,$(DRIVERSDKDIR)/drivers/s3) InstallDriverSDKNonExecFile(s3_bios.c,$(DRIVERSDKDIR)/drivers/s3) InstallDriverSDKNonExecFile(s3_Trio64DAC.c,$(DRIVERSDKDIR)/drivers/s3) InstallDriverSDKNonExecFile(s3_IBMRGB.c,$(DRIVERSDKDIR)/drivers/s3) InstallDriverSDKNonExecFile(s3_Ti.c,$(DRIVERSDKDIR)/drivers/s3) Index: xc/programs/Xserver/hw/xfree86/drivers/s3virge/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/s3virge/Imakefile,v retrieving revision 1.2 diff -u -2 -0 -r1.2 Imakefile --- xc/programs/Xserver/hw/xfree86/drivers/s3virge/Imakefile 17 Sep 2004 03:04:53 -0000 1.2 +++ xc/programs/Xserver/hw/xfree86/drivers/s3virge/Imakefile 7 Mar 2005 19:19:43 -0000 @@ -24,41 +24,41 @@ -I$(XF86SRC)/xaa -I$(SERVERSRC)/fb \ -I$(XF86SRC)/xf1bpp -I$(XF86SRC)/xf4bpp \ -I$(SERVERSRC)/Xext \ -I$(XF86SRC)/vgahw -I$(XF86SRC)/ramdac \ -I$(XF86SRC)/ddc -I$(XF86SRC)/i2c \ -I$(XF86SRC)/rac -I$(XF86SRC)/int10 \ -I$(SERVERSRC)/include -I$(XINCLUDESRC) -I$(FONTINCSRC) \ -I$(EXTINCSRC) -I$(XF86SRC)/vbe -I$(XF86SRC)/shadowfb \ -I$(SERVERSRC)/render #endif #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif NormalAsmObjectRule() ModuleObjectRule() ObjectModuleTarget(s3virge, $(OBJS)) -InstallObjectModule(s3virge,$(MODULEDIR),drivers) +InstallVideoObjectModule(s3virge,$(MODULEDIR)) #if !defined(XF86DriverSDK) InstallModuleManPage(s3virge) #endif DependTarget() InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/drivers/s3virge) InstallDriverSDKNonExecFile(newmmio.h,$(DRIVERSDKDIR)/drivers/s3virge) InstallDriverSDKNonExecFile(regs3v.h,$(DRIVERSDKDIR)/drivers/s3virge) InstallDriverSDKNonExecFile(s3v.h,$(DRIVERSDKDIR)/drivers/s3virge) InstallDriverSDKNonExecFile(s3v_accel.c,$(DRIVERSDKDIR)/drivers/s3virge) InstallDriverSDKNonExecFile(s3v_dac.c,$(DRIVERSDKDIR)/drivers/s3virge) InstallDriverSDKNonExecFile(s3v_dga.c,$(DRIVERSDKDIR)/drivers/s3virge) InstallDriverSDKNonExecFile(s3v_driver.c,$(DRIVERSDKDIR)/drivers/s3virge) InstallDriverSDKNonExecFile(s3v_hwcurs.c,$(DRIVERSDKDIR)/drivers/s3virge) InstallDriverSDKNonExecFile(s3v_i2c.c,$(DRIVERSDKDIR)/drivers/s3virge) InstallDriverSDKNonExecFile(s3v_macros.h,$(DRIVERSDKDIR)/drivers/s3virge) InstallDriverSDKNonExecFile(s3v_rop.h,$(DRIVERSDKDIR)/drivers/s3virge) InstallDriverSDKNonExecFile(s3v_shadow.c,$(DRIVERSDKDIR)/drivers/s3virge) Index: xc/programs/Xserver/hw/xfree86/drivers/savage/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/savage/Imakefile,v retrieving revision 1.6 diff -u -2 -0 -r1.6 Imakefile --- xc/programs/Xserver/hw/xfree86/drivers/savage/Imakefile 28 Sep 2004 00:23:21 -0000 1.6 +++ xc/programs/Xserver/hw/xfree86/drivers/savage/Imakefile 7 Mar 2005 19:19:43 -0000 @@ -71,41 +71,41 @@ -I$(SERVERSRC)/fb -I$(SERVERSRC)/mi \ -I$(XF86SRC)/xaa \ -I$(XF86SRC)/xf1bpp -I$(XF86SRC)/xf4bpp \ -I$(SERVERSRC)/Xext \ -I$(XF86SRC)/vgahw -I$(XF86SRC)/ramdac \ -I$(XF86SRC)/ddc -I$(XF86SRC)/i2c \ -I$(XF86SRC)/rac -I$(XF86SRC)/int10 -I$(SERVERSRC)/render \ -I$(SERVERSRC)/include -I$(XINCLUDESRC) -I$(FONTINCSRC) \ -I$(EXTINCSRC) -I$(XF86SRC)/vbe -I$(XF86SRC)/shadowfb $(DRIINCLUDES) #endif #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif NormalAsmObjectRule() ModuleObjectRule() ObjectModuleTarget(savage, $(OBJS)) -InstallObjectModule(savage,$(MODULEDIR),drivers) +InstallVideoObjectModule(savage,$(MODULEDIR)) #if !defined(XF86DriverSDK) InstallModuleManPage(savage) #endif DependTarget() InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/drivers/savage) InstallDriverSDKNonExecFile(savage_accel.c,$(DRIVERSDKDIR)/drivers/savage) InstallDriverSDKNonExecFile(savage_bci.h,$(DRIVERSDKDIR)/drivers/savage) InstallDriverSDKNonExecFile(savage_cursor.c,$(DRIVERSDKDIR)/drivers/savage) InstallDriverSDKNonExecFile(savage_dga.c,$(DRIVERSDKDIR)/drivers/savage) InstallDriverSDKNonExecFile(savage_driver.c,$(DRIVERSDKDIR)/drivers/savage) InstallDriverSDKNonExecFile(savage_driver.h,$(DRIVERSDKDIR)/drivers/savage) InstallDriverSDKNonExecFile(savage_dri.c,$(DRIVERSDKDIR)/drivers/savage) InstallDriverSDKNonExecFile(savage_dri.h,$(DRIVERSDKDIR)/drivers/savage) InstallDriverSDKNonExecFile(savage_i2c.c,$(DRIVERSDKDIR)/drivers/savage) InstallDriverSDKNonExecFile(savage_image.c,$(DRIVERSDKDIR)/drivers/savage) InstallDriverSDKNonExecFile(savage_regs.h,$(DRIVERSDKDIR)/drivers/savage) InstallDriverSDKNonExecFile(savage_shadow.c,$(DRIVERSDKDIR)/drivers/savage) Index: xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/Imakefile,v retrieving revision 1.3 diff -u -2 -0 -r1.3 Imakefile --- xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/Imakefile 17 Sep 2004 03:04:54 -0000 1.3 +++ xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/Imakefile 7 Mar 2005 19:19:43 -0000 @@ -18,41 +18,41 @@ INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86OSSRC) \ -I$(SERVERSRC)/mfb -I$(SERVERSRC)/mi \ -I$(XF86SRC)/xaa -I$(XF86SRC)/rac \ -I$(XF86SRC)/vgahw -I$(XF86SRC)/fbdevhw \ -I$(XF86SRC)/ramdac -I$(XF86SRC)/ddc -I$(XF86SRC)/i2c \ -I$(SERVERSRC)/Xext -I$(XF86SRC)/int10 \ -I$(FONTINCSRC) -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ -I$(XF86SRC)/shadowfb -I$(EXTINCSRC) -I$(SERVERSRC)/fb \ -I$(SERVERSRC)/render -I$(XF86SRC)/vbe #endif #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif NormalAsmObjectRule() ModuleObjectRule() ObjectModuleTarget(siliconmotion, $(OBJS)) -InstallObjectModule(siliconmotion,$(MODULEDIR),drivers) +InstallVideoObjectModule(siliconmotion,$(MODULEDIR)) #if !defined(XF86DriverSDK) InstallModuleManPage(siliconmotion) #endif DependTarget() InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/drivers/siliconmotion) InstallDriverSDKNonExecFile(smi_accel.c,$(DRIVERSDKDIR)/drivers/siliconmotion) InstallDriverSDKNonExecFile(smi_dac.c,$(DRIVERSDKDIR)/drivers/siliconmotion) InstallDriverSDKNonExecFile(smi_dga.c,$(DRIVERSDKDIR)/drivers/siliconmotion) InstallDriverSDKNonExecFile(smi_driver.c,$(DRIVERSDKDIR)/drivers/siliconmotion) InstallDriverSDKNonExecFile(smi_hwcurs.c,$(DRIVERSDKDIR)/drivers/siliconmotion) InstallDriverSDKNonExecFile(smi_i2c.c,$(DRIVERSDKDIR)/drivers/siliconmotion) InstallDriverSDKNonExecFile(smi_shadow.c,$(DRIVERSDKDIR)/drivers/siliconmotion) InstallDriverSDKNonExecFile(smi_video.c,$(DRIVERSDKDIR)/drivers/siliconmotion) InstallDriverSDKNonExecFile(regsmi.h,$(DRIVERSDKDIR)/drivers/siliconmotion) InstallDriverSDKNonExecFile(smi.h,$(DRIVERSDKDIR)/drivers/siliconmotion) InstallDriverSDKNonExecFile(smi_video.h,$(DRIVERSDKDIR)/drivers/siliconmotion) Index: xc/programs/Xserver/hw/xfree86/drivers/sis/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/sis/Imakefile,v retrieving revision 1.8 diff -u -2 -0 -r1.8 Imakefile --- xc/programs/Xserver/hw/xfree86/drivers/sis/Imakefile 19 Jan 2005 16:19:39 -0000 1.8 +++ xc/programs/Xserver/hw/xfree86/drivers/sis/Imakefile 7 Mar 2005 19:19:43 -0000 @@ -41,41 +41,41 @@ -I$(XF86SRC)/ddc -I$(XF86SRC)/i2c -I$(XF86SRC)/vbe \ -I$(XF86SRC)/rac -I$(XF86SRC)/int10 \ -I$(FONTINCSRC) -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ -I$(XTOP)/include/extensions \ -I$(SERVERSRC)/render \ -I$(XF86SRC)/shadowfb \ -I$(SERVERSRC)/hw/xfree86 \ $(DRIINCLUDES) #endif DEFINES = $(DRIDEFINES) #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget(sis,$(OBJS)) -InstallObjectModule(sis,$(MODULEDIR),drivers) +InstallVideoObjectModule(sis,$(MODULEDIR)) #if !defined(XF86DriverSDK) InstallModuleManPage(sis) #endif DependTarget() InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/drivers/sis) InstallDriverSDKNonExecFile(sis.h,$(DRIVERSDKDIR)/drivers/sis) InstallDriverSDKNonExecFile(sis300_accel.c,$(DRIVERSDKDIR)/drivers/sis) InstallDriverSDKNonExecFile(sis300_accel.h,$(DRIVERSDKDIR)/drivers/sis) InstallDriverSDKNonExecFile(sis310_accel.c,$(DRIVERSDKDIR)/drivers/sis) InstallDriverSDKNonExecFile(sis310_accel.h,$(DRIVERSDKDIR)/drivers/sis) InstallDriverSDKNonExecFile(sis_accel.h,$(DRIVERSDKDIR)/drivers/sis) InstallDriverSDKNonExecFile(sis_accel.c,$(DRIVERSDKDIR)/drivers/sis) InstallDriverSDKNonExecFile(init.c,$(DRIVERSDKDIR)/drivers/sis) InstallDriverSDKNonExecFile(init.h,$(DRIVERSDKDIR)/drivers/sis) InstallDriverSDKNonExecFile(init301.c,$(DRIVERSDKDIR)/drivers/sis) InstallDriverSDKNonExecFile(init301.h,$(DRIVERSDKDIR)/drivers/sis) InstallDriverSDKNonExecFile(osdef.h,$(DRIVERSDKDIR)/drivers/sis) Index: xc/programs/Xserver/hw/xfree86/drivers/sisusb/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/sisusb/Imakefile,v retrieving revision 1.1 diff -u -2 -0 -r1.1 Imakefile --- xc/programs/Xserver/hw/xfree86/drivers/sisusb/Imakefile 25 Jan 2005 15:54:02 -0000 1.1 +++ xc/programs/Xserver/hw/xfree86/drivers/sisusb/Imakefile 7 Mar 2005 19:19:43 -0000 @@ -22,41 +22,41 @@ -I$(SERVERSRC)/fb -I$(XF86SRC)/xaa \ -I$(XF86SRC)/xf24_32bpp \ -I$(XF86SRC)/ramdac -I$(XF86SRC)/rac \ -I$(FONTINCSRC) -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ -I$(XTOP)/include/extensions \ -I$(SERVERSRC)/render \ -I$(XF86SRC)/shadowfb \ -I$(SERVERSRC)/hw/xfree86 #endif DEFINES = #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget(sisusb,$(OBJS)) -InstallObjectModule(sisusb,$(MODULEDIR),drivers) +InstallVideoObjectModule(sisusb,$(MODULEDIR)) #if !defined(XF86DriverSDK) InstallModuleManPage(sisusb) #endif DependTarget() InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/drivers/sisusb) InstallDriverSDKNonExecFile(sisusb_accel.c,$(DRIVERSDKDIR)/drivers/sisusb) InstallDriverSDKNonExecFile(sisusb_accel.h,$(DRIVERSDKDIR)/drivers/sisusb) InstallDriverSDKNonExecFile(sisusb_cursor.c,$(DRIVERSDKDIR)/drivers/sisusb) InstallDriverSDKNonExecFile(sisusb_cursor.h,$(DRIVERSDKDIR)/drivers/sisusb) InstallDriverSDKNonExecFile(sisusb_dac.c,$(DRIVERSDKDIR)/drivers/sisusb) InstallDriverSDKNonExecFile(sisusb_dac.h,$(DRIVERSDKDIR)/drivers/sisusb) InstallDriverSDKNonExecFile(sisusb_driver.c,$(DRIVERSDKDIR)/drivers/sisusb) InstallDriverSDKNonExecFile(sisusb_driver.h,$(DRIVERSDKDIR)/drivers/sisusb) InstallDriverSDKNonExecFile(sisusb.h,$(DRIVERSDKDIR)/drivers/sisusb) InstallDriverSDKNonExecFile(sisusb_init.c,$(DRIVERSDKDIR)/drivers/sisusb) InstallDriverSDKNonExecFile(sisusb_init.h,$(DRIVERSDKDIR)/drivers/sisusb) InstallDriverSDKNonExecFile(sisusb_opt.c,$(DRIVERSDKDIR)/drivers/sisusb) Index: xc/programs/Xserver/hw/xfree86/drivers/sunbw2/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/sunbw2/Imakefile,v retrieving revision 1.2 diff -u -2 -0 -r1.2 Imakefile --- xc/programs/Xserver/hw/xfree86/drivers/sunbw2/Imakefile 23 Apr 2004 19:46:10 -0000 1.2 +++ xc/programs/Xserver/hw/xfree86/drivers/sunbw2/Imakefile 7 Mar 2005 19:19:43 -0000 @@ -11,27 +11,27 @@ #if defined(XF86DriverSDK) INCLUDES = -I. -I../../include #else INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86OSSRC) \ -I$(SERVERSRC)/mfb -I$(SERVERSRC)/mi \ -I$(SERVERSRC)/Xext -I$(XF86SRC)/xf1bpp \ -I$(XF86SRC)/ramdac \ -I$(FONTINCSRC) -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ -I$(EXTINCSRC) #endif #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget(sunbw2,$(OBJS)) -InstallObjectModule(sunbw2,$(MODULEDIR),drivers) +InstallVideoObjectModule(sunbw2,$(MODULEDIR)) #if !defined(XF86DriverSDK) InstallModuleManPage(sunbw2) #endif DependTarget() Index: xc/programs/Xserver/hw/xfree86/drivers/suncg14/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/suncg14/Imakefile,v retrieving revision 1.2 diff -u -2 -0 -r1.2 Imakefile --- xc/programs/Xserver/hw/xfree86/drivers/suncg14/Imakefile 23 Apr 2004 19:46:40 -0000 1.2 +++ xc/programs/Xserver/hw/xfree86/drivers/suncg14/Imakefile 7 Mar 2005 19:19:43 -0000 @@ -11,27 +11,27 @@ #if defined(XF86DriverSDK) INCLUDES = -I. -I../../include #else INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86OSSRC) \ -I$(SERVERSRC)/fb -I$(SERVERSRC)/mi \ -I$(SERVERSRC)/Xext -I$(SERVERSRC)/render \ -I$(XF86SRC)/ramdac \ -I$(FONTINCSRC) -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ -I$(EXTINCSRC) #endif #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget(suncg14,$(OBJS)) -InstallObjectModule(suncg14,$(MODULEDIR),drivers) +InstallVideoObjectModule(suncg14,$(MODULEDIR)) #if !defined(XF86DriverSDK) InstallModuleManPage(suncg14) #endif DependTarget() Index: xc/programs/Xserver/hw/xfree86/drivers/suncg3/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/suncg3/Imakefile,v retrieving revision 1.2 diff -u -2 -0 -r1.2 Imakefile --- xc/programs/Xserver/hw/xfree86/drivers/suncg3/Imakefile 23 Apr 2004 19:47:13 -0000 1.2 +++ xc/programs/Xserver/hw/xfree86/drivers/suncg3/Imakefile 7 Mar 2005 19:19:43 -0000 @@ -11,27 +11,27 @@ #if defined(XF86DriverSDK) INCLUDES = -I. -I../../include #else INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86OSSRC) \ -I$(SERVERSRC)/fb -I$(SERVERSRC)/mi \ -I$(SERVERSRC)/Xext -I$(SERVERSRC)/render \ -I$(XF86SRC)/ramdac \ -I$(FONTINCSRC) -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ -I$(EXTINCSRC) #endif #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget(suncg3,$(OBJS)) -InstallObjectModule(suncg3,$(MODULEDIR),drivers) +InstallVideoObjectModule(suncg3,$(MODULEDIR)) #if !defined(XF86DriverSDK) InstallModuleManPage(suncg3) #endif DependTarget() Index: xc/programs/Xserver/hw/xfree86/drivers/suncg6/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/suncg6/Imakefile,v retrieving revision 1.2 diff -u -2 -0 -r1.2 Imakefile --- xc/programs/Xserver/hw/xfree86/drivers/suncg6/Imakefile 23 Apr 2004 19:47:46 -0000 1.2 +++ xc/programs/Xserver/hw/xfree86/drivers/suncg6/Imakefile 7 Mar 2005 19:19:43 -0000 @@ -11,27 +11,27 @@ #if defined(XF86DriverSDK) INCLUDES = -I. -I../../include #else INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86OSSRC) \ -I$(SERVERSRC)/fb -I$(SERVERSRC)/mi \ -I$(SERVERSRC)/Xext -I$(SERVERSRC)/render \ -I$(XF86SRC)/ramdac \ -I$(FONTINCSRC) -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ -I$(EXTINCSRC) #endif #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget(suncg6,$(OBJS)) -InstallObjectModule(suncg6,$(MODULEDIR),drivers) +InstallVideoObjectModule(suncg6,$(MODULEDIR)) #if !defined(XF86DriverSDK) InstallModuleManPage(suncg6) #endif DependTarget() Index: xc/programs/Xserver/hw/xfree86/drivers/sunffb/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/sunffb/Imakefile,v retrieving revision 1.4 diff -u -2 -0 -r1.4 Imakefile --- xc/programs/Xserver/hw/xfree86/drivers/sunffb/Imakefile 14 Jan 2005 06:08:03 -0000 1.4 +++ xc/programs/Xserver/hw/xfree86/drivers/sunffb/Imakefile 7 Mar 2005 19:19:43 -0000 @@ -81,41 +81,41 @@ -I$(SERVERSRC)/dbe -I$(SERVERSRC)/fb \ -I$(SERVERSRC)/render \ -I$(XF86SRC)/xf8_32wid \ -I$(XF86SRC)/ramdac \ -I$(XF86SRC)/ddc \ -I$(XF86SRC)/i2c \ -I$(XF86SRC)/xaa \ -I$(FONTINCSRC) -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ -I$(EXTINCSRC) \ $(DRIINCLUDES) #endif #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget(sunffb,$(OBJS)) -InstallObjectModule(sunffb,$(MODULEDIR),drivers) +InstallVideoObjectModule(sunffb,$(MODULEDIR)) #if !defined(XF86DriverSDK) InstallModuleManPage(sunffb) #endif FFBCObjectRule(ffb_accel) FFBCObjectRule(ffb_driver) FFBCObjectRule(ffb_attr) FFBCObjectRule(ffb_stip) FFBCObjectRule(ffb_bcopy) FFBCObjectRule(ffb_cplane) FFBCObjectRule(ffb_fspans) FFBCObjectRule(ffb_point) FFBCObjectRule(ffb_seg) FFBCObjectRule(ffb_plygon) FFBCObjectRule(ffb_line) FFBCObjectRule(ffb_glyph) FFBCObjectRule(ffb_frect) FFBCObjectRule(ffb_circle) FFBCObjectRule(ffb_checks) Index: xc/programs/Xserver/hw/xfree86/drivers/sunleo/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/sunleo/Imakefile,v retrieving revision 1.3 diff -u -2 -0 -r1.3 Imakefile --- xc/programs/Xserver/hw/xfree86/drivers/sunleo/Imakefile 14 Jan 2005 06:20:17 -0000 1.3 +++ xc/programs/Xserver/hw/xfree86/drivers/sunleo/Imakefile 7 Mar 2005 19:19:44 -0000 @@ -15,27 +15,27 @@ #if defined(XF86DriverSDK) INCLUDES = -I. -I../../include #else INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86OSSRC) \ -I$(SERVERSRC)/fb -I$(SERVERSRC)/mi \ -I$(SERVERSRC)/Xext -I$(SERVERSRC)/render \ -I$(XF86SRC)/ramdac \ -I$(FONTINCSRC) -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ -I$(EXTINCSRC) #endif #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget(sunleo,$(OBJS)) -InstallObjectModule(sunleo,$(MODULEDIR),drivers) +InstallVideoObjectModule(sunleo,$(MODULEDIR)) #if !defined(XF86DriverSDK) InstallModuleManPage(sunleo) #endif DependTarget() Index: xc/programs/Xserver/hw/xfree86/drivers/suntcx/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/suntcx/Imakefile,v retrieving revision 1.2 diff -u -2 -0 -r1.2 Imakefile --- xc/programs/Xserver/hw/xfree86/drivers/suntcx/Imakefile 23 Apr 2004 19:49:23 -0000 1.2 +++ xc/programs/Xserver/hw/xfree86/drivers/suntcx/Imakefile 7 Mar 2005 19:19:44 -0000 @@ -11,27 +11,27 @@ #if defined(XF86DriverSDK) INCLUDES = -I. -I../../include #else INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86OSSRC) \ -I$(SERVERSRC)/fb -I$(SERVERSRC)/mi \ -I$(SERVERSRC)/Xext -I$(SERVERSRC)/render \ -I$(XF86SRC)/ramdac \ -I$(FONTINCSRC) -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ -I$(EXTINCSRC) #endif #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget(suntcx,$(OBJS)) -InstallObjectModule(suntcx,$(MODULEDIR),drivers) +InstallVideoObjectModule(suntcx,$(MODULEDIR)) #if !defined(XF86DriverSDK) InstallModuleManPage(suntcx) #endif DependTarget() Index: xc/programs/Xserver/hw/xfree86/drivers/tdfx/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/tdfx/Imakefile,v retrieving revision 1.3 diff -u -2 -0 -r1.3 Imakefile --- xc/programs/Xserver/hw/xfree86/drivers/tdfx/Imakefile 16 Jun 2004 09:44:00 -0000 1.3 +++ xc/programs/Xserver/hw/xfree86/drivers/tdfx/Imakefile 7 Mar 2005 19:19:44 -0000 @@ -35,41 +35,41 @@ -I$(SERVERSRC)/mfb -I$(SERVERSRC)/mi \ -I$(XF86SRC)/xaa -I$(XF86SRC)/rac -I$(XF86SRC)/int10 \ -I$(SERVERSRC)/fb -I$(XF86SRC)/xaa -I$(XF86SRC)/ramdac \ -I$(XF86SRC)/vgahw -I$(XF86SRC)/ddc -I$(XF86SRC)/i2c \ -I$(XF86SRC)/ddc -I$(XF86SRC)/vbe -I$(SERVERSRC)/Xext \ -I$(FONTINCSRC) -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ -I$(EXTINCSRC) -I$(SERVERSRC)/render \ $(DRIINCLUDES) #endif DEFINES = $(DRIDEFINES) #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget(tdfx,$(OBJS)) -InstallObjectModule(tdfx,$(MODULEDIR),drivers) +InstallVideoObjectModule(tdfx,$(MODULEDIR)) #if !defined(XF86DriverSDK) InstallModuleManPage(tdfx) #endif DependTarget() InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/drivers/tdfx) InstallDriverSDKNonExecFile(tdfx.h,$(DRIVERSDKDIR)/drivers/tdfx) InstallDriverSDKNonExecFile(tdfxdefs.h,$(DRIVERSDKDIR)/drivers/tdfx) InstallDriverSDKNonExecFile(tdfx_accel.c,$(DRIVERSDKDIR)/drivers/tdfx) InstallDriverSDKNonExecFile(tdfx_dga.c,$(DRIVERSDKDIR)/drivers/tdfx) InstallDriverSDKNonExecFile(tdfx_dri.c,$(DRIVERSDKDIR)/drivers/tdfx) InstallDriverSDKNonExecFile(tdfx_dri.h,$(DRIVERSDKDIR)/drivers/tdfx) InstallDriverSDKNonExecFile(tdfx_dripriv.h,$(DRIVERSDKDIR)/drivers/tdfx) InstallDriverSDKNonExecFile(tdfx_driver.c,$(DRIVERSDKDIR)/drivers/tdfx) InstallDriverSDKNonExecFile(tdfx_hwcurs.c,$(DRIVERSDKDIR)/drivers/tdfx) InstallDriverSDKNonExecFile(tdfx_io.c,$(DRIVERSDKDIR)/drivers/tdfx) InstallDriverSDKNonExecFile(tdfx_priv.c,$(DRIVERSDKDIR)/drivers/tdfx) Index: xc/programs/Xserver/hw/xfree86/drivers/tga/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/tga/Imakefile,v retrieving revision 1.2 diff -u -2 -0 -r1.2 Imakefile --- xc/programs/Xserver/hw/xfree86/drivers/tga/Imakefile 23 Apr 2004 19:50:24 -0000 1.2 +++ xc/programs/Xserver/hw/xfree86/drivers/tga/Imakefile 7 Mar 2005 19:19:44 -0000 @@ -14,38 +14,38 @@ #else INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86OSSRC) -I$(SERVERSRC)/Xext \ -I$(SERVERSRC)/mfb -I$(SERVERSRC)/mi \ -I$(SERVERSRC)/fb -I$(XF86SRC)/xaa \ -I$(XF86SRC)/vgahw -I$(XF86SRC)/ramdac \ -I$(XF86SRC)/rac -I$(EXTINCSRC) \ -I$(FONTINCSRC) -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ -I$(SERVERSRC)/render #endif #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectFromSpecialSource(tga_seg, tga_line, -DPOLYSEGMENT) ObjectModuleTarget(tga,$(OBJS)) -InstallObjectModule(tga,$(MODULEDIR),drivers) +InstallVideoObjectModule(tga,$(MODULEDIR)) DependTarget() InstallDriverSDKNonExecFile(BT463ramdac.c,$(DRIVERSDKDIR)/drivers/tga) InstallDriverSDKNonExecFile(BTramdac.c,$(DRIVERSDKDIR)/drivers/tga) InstallDriverSDKNonExecFile(IBM561ramdac.c,$(DRIVERSDKDIR)/drivers/tga) InstallDriverSDKNonExecFile(ICS1562.c,$(DRIVERSDKDIR)/drivers/tga) InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/drivers/tga) InstallDriverSDKNonExecFile(tga.h,$(DRIVERSDKDIR)/drivers/tga) InstallDriverSDKNonExecFile(tga_accel.c,$(DRIVERSDKDIR)/drivers/tga) InstallDriverSDKNonExecFile(tga_cursor.c,$(DRIVERSDKDIR)/drivers/tga) InstallDriverSDKNonExecFile(tga_dac.c,$(DRIVERSDKDIR)/drivers/tga) InstallDriverSDKNonExecFile(tga_driver.c,$(DRIVERSDKDIR)/drivers/tga) InstallDriverSDKNonExecFile(tga_regs.h,$(DRIVERSDKDIR)/drivers/tga) InstallDriverSDKNonExecFile(tga_line.c,$(DRIVERSDKDIR)/drivers/tga) InstallDriverSDKObjectModule(tga,$(DRIVERSDKMODULEDIR),drivers) Index: xc/programs/Xserver/hw/xfree86/drivers/trident/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/trident/Imakefile,v retrieving revision 1.2 diff -u -2 -0 -r1.2 Imakefile --- xc/programs/Xserver/hw/xfree86/drivers/trident/Imakefile 23 Apr 2004 19:52:01 -0000 1.2 +++ xc/programs/Xserver/hw/xfree86/drivers/trident/Imakefile 7 Mar 2005 19:19:44 -0000 @@ -21,41 +21,41 @@ INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86OSSRC) -I$(SERVERSRC)/Xext \ -I$(SERVERSRC)/mi -I$(XF86SRC)/xaa -I$(SERVERSRC)/fb \ -I$(XF86SRC)/xf1bpp -I$(SERVERSRC)/miext/shadow \ -I$(SERVERSRC)/render -I$(XF86SRC)/shadowfb \ -I$(XF86SRC)/xf4bpp -I$(SERVERSRC)/mfb \ -I$(XF86SRC)/vgahw -I$(XF86SRC)/ramdac \ -I$(XF86SRC)/rac -I$(XF86SRC)/int10 \ -I$(XF86SRC)/ddc -I$(XF86SRC)/i2c \ -I$(FONTINCSRC) -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ -I$(EXTINCSRC) -I$(XF86SRC)/vbe #endif #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget(trident,$(OBJS)) -InstallObjectModule(trident,$(MODULEDIR),drivers) +InstallVideoObjectModule(trident,$(MODULEDIR)) #if !defined(XF86DriverSDK) InstallModuleManPage(trident) #endif DependTarget() InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/drivers/trident) InstallDriverSDKNonExecFile(blade_accel.c,$(DRIVERSDKDIR)/drivers/trident) InstallDriverSDKNonExecFile(image_accel.c,$(DRIVERSDKDIR)/drivers/trident) InstallDriverSDKNonExecFile(trident.h,$(DRIVERSDKDIR)/drivers/trident) InstallDriverSDKNonExecFile(trident_accel.c,$(DRIVERSDKDIR)/drivers/trident) InstallDriverSDKNonExecFile(trident_bank.c,$(DRIVERSDKDIR)/drivers/trident) InstallDriverSDKNonExecFile(trident_dac.c,$(DRIVERSDKDIR)/drivers/trident) InstallDriverSDKNonExecFile(trident_dga.c,$(DRIVERSDKDIR)/drivers/trident) InstallDriverSDKNonExecFile(trident_driver.c,$(DRIVERSDKDIR)/drivers/trident) InstallDriverSDKNonExecFile(trident_i2c.c,$(DRIVERSDKDIR)/drivers/trident) InstallDriverSDKNonExecFile(trident_shadow.c,$(DRIVERSDKDIR)/drivers/trident) InstallDriverSDKNonExecFile(trident_regs.h,$(DRIVERSDKDIR)/drivers/trident) InstallDriverSDKNonExecFile(tridenthelper.c,$(DRIVERSDKDIR)/drivers/trident) Index: xc/programs/Xserver/hw/xfree86/drivers/tseng/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/tseng/Imakefile,v retrieving revision 1.3 diff -u -2 -0 -r1.3 Imakefile --- xc/programs/Xserver/hw/xfree86/drivers/tseng/Imakefile 24 Sep 2004 00:07:50 -0000 1.3 +++ xc/programs/Xserver/hw/xfree86/drivers/tseng/Imakefile 7 Mar 2005 19:19:44 -0000 @@ -26,41 +26,41 @@ -I$(XF86SRC)/xf1bpp -I$(XF86SRC)/xf4bpp \ -I$(SERVERSRC)/Xext \ -I$(XF86SRC)/vgahw -I$(XF86SRC)/ramdac \ -I$(XF86SRC)/ddc -I$(XF86SRC)/i2c \ -I$(XF86SRC)/rac -I$(XF86SRC)/int10 \ -I$(SERVERSRC)/include -I$(XINCLUDESRC) -I$(FONTINCSRC) \ -I$(EXTINCSRC) -I$(SERVERSRC)/render #endif DEFINES = -DPSZ=8 $(VENDORSUPPORTDEFS) #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif NormalAsmObjectRule() ModuleObjectRule() ObjectModuleTarget(tseng, $(OBJS)) -InstallObjectModule(tseng,$(MODULEDIR),drivers) +InstallVideoObjectModule(tseng,$(MODULEDIR)) #if !defined(XF86DriverSDK) InstallModuleManPage(tseng) #endif DependTarget() InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/drivers/tseng) InstallDriverSDKNonExecFile(tseng.h,$(DRIVERSDKDIR)/drivers/tseng) InstallDriverSDKNonExecFile(tseng_accel.c,$(DRIVERSDKDIR)/drivers/tseng) InstallDriverSDKNonExecFile(tseng_acl.c,$(DRIVERSDKDIR)/drivers/tseng) InstallDriverSDKNonExecFile(tseng_acl.h,$(DRIVERSDKDIR)/drivers/tseng) InstallDriverSDKNonExecFile(tseng_bank.c,$(DRIVERSDKDIR)/drivers/tseng) InstallDriverSDKNonExecFile(tseng_clock.c,$(DRIVERSDKDIR)/drivers/tseng) InstallDriverSDKNonExecFile(tseng_colexp.c,$(DRIVERSDKDIR)/drivers/tseng) InstallDriverSDKNonExecFile(tseng_cursor.c,$(DRIVERSDKDIR)/drivers/tseng) InstallDriverSDKNonExecFile(tseng_dpms.c,$(DRIVERSDKDIR)/drivers/tseng) InstallDriverSDKNonExecFile(tseng_driver.c,$(DRIVERSDKDIR)/drivers/tseng) InstallDriverSDKNonExecFile(tseng_inline.h,$(DRIVERSDKDIR)/drivers/tseng) InstallDriverSDKNonExecFile(tseng_ramdac.c,$(DRIVERSDKDIR)/drivers/tseng) Index: xc/programs/Xserver/hw/xfree86/drivers/v4l/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/v4l/Imakefile,v retrieving revision 1.3 diff -u -2 -0 -r1.3 Imakefile --- xc/programs/Xserver/hw/xfree86/drivers/v4l/Imakefile 19 Sep 2004 04:45:12 -0000 1.3 +++ xc/programs/Xserver/hw/xfree86/drivers/v4l/Imakefile 7 Mar 2005 19:19:44 -0000 @@ -11,33 +11,33 @@ #if defined(XF86DriverSDK) INCLUDES = -I. -I../../include #else INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86OSSRC) -I$(SERVERSRC)/Xext \ -I$(SERVERSRC)/mi -I$(XF86SRC)/xaa \ -I$(XF86SRC)/vgahw -I$(XF86SRC)/ramdac \ -I$(XF86SRC)/ddc -I$(XF86SRC)/i2c -I$(FONTINCSRC) \ -I$(XF86SRC)/xf8_32bpp -I$(XF86SRC)/xf1bpp \ -I$(XF86SRC)/xf4bpp -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ -I$(XF86SRC)/ddc -I$(XF86SRC)/i2c -I$(EXTINCSRC) #endif #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget(v4l,$(OBJS)) -InstallObjectModule(v4l,$(MODULEDIR),drivers/linux) +InstallVideoObjectModule(v4l,$(MODULEDIR)) #if !defined(XF86DriverSDK) InstallModuleManPage(v4l) #endif DependTarget() InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/drivers/v4l) InstallDriverSDKNonExecFile(v4l.c,$(DRIVERSDKDIR)/drivers/v4l) InstallDriverSDKNonExecFile(videodev.h,$(DRIVERSDKDIR)/drivers/v4l) -InstallDriverSDKObjectModule(v4l,$(DRIVERSDKMODULEDIR),drivers/linux) +InstallDriverSDKObjectModule(v4l,$(DRIVERSDKMODULEDIR),drivers) Index: xc/programs/Xserver/hw/xfree86/drivers/vesa/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/vesa/Imakefile,v retrieving revision 1.3 diff -u -2 -0 -r1.3 Imakefile --- xc/programs/Xserver/hw/xfree86/drivers/vesa/Imakefile 24 Sep 2004 00:07:54 -0000 1.3 +++ xc/programs/Xserver/hw/xfree86/drivers/vesa/Imakefile 7 Mar 2005 19:19:44 -0000 @@ -12,34 +12,34 @@ #else INCLUDES = -I. -I$(SERVERSRC)/fb -I$(XF86SRC)/xf4bpp -I$(XF86SRC)/xf1bpp \ -I$(SERVERSRC)/mfb -I$(SERVERSRC)/afb -I$(SERVERSRC)/mi \ -I$(SERVERSRC)/miext/shadow -I$(SERVERSRC)/render \ -I$(XF86SRC)/vgahw \ -I$(XF86COMSRC) -I$(XF86OSSRC) -I$(SERVERSRC)/Xext \ -I$(SERVERSRC)/include -I$(FONTINCSRC) -I$(XINCLUDESRC)\ -I$(XF86SRC)/rac -I$(XF86SRC)/ddc -I$(XF86SRC)/i2c \ -I$(XF86SRC)/vbe -I$(XF86SRC)/int10 \ -I$(EXTINCSRC) #endif #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget(vesa,$(OBJS)) -InstallObjectModule(vesa,$(MODULEDIR),drivers) +InstallVideoObjectModule(vesa,$(MODULEDIR)) #if !defined(XF86DriverSDK) InstallModuleManPage(vesa) #endif DependTarget() InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/drivers/vesa) InstallDriverSDKNonExecFile(vesa.c,$(DRIVERSDKDIR)/drivers/vesa) InstallDriverSDKNonExecFile(vesa.h,$(DRIVERSDKDIR)/drivers/vesa) InstallDriverSDKObjectModule(vesa,$(DRIVERSDKMODULEDIR),drivers) Index: xc/programs/Xserver/hw/xfree86/drivers/vga/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/vga/Imakefile,v retrieving revision 1.2 diff -u -2 -0 -r1.2 Imakefile --- xc/programs/Xserver/hw/xfree86/drivers/vga/Imakefile 23 Apr 2004 19:53:24 -0000 1.2 +++ xc/programs/Xserver/hw/xfree86/drivers/vga/Imakefile 7 Mar 2005 19:19:44 -0000 @@ -23,33 +23,33 @@ #if defined(XF86DriverSDK) INCLUDES = -I. -I../../include #else INCLUDES = -I. -I$(SERVERSRC)/fb -I$(XF86SRC)/xf4bpp -I$(XF86SRC)/xf1bpp \ -I$(SERVERSRC)/mfb -I$(SERVERSRC)/mi -I$(XF86SRC)/vgahw \ -I$(SERVERSRC)/Xext -I$(SERVERSRC)/render -I$(EXTINCSRC)\ -I$(XF86COMSRC) -I$(XF86OSSRC) \ -I$(SERVERSRC)/include -I$(FONTINCSRC) -I$(XINCLUDESRC)\ -I$(XF86SRC)/rac -I$(XF86SRC)/ddc -I$(XF86SRC)/i2c \ -I$(XF86SRC)/shadowfb -I$(XF86SRC)/int10 #endif #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget(vga,$(OBJS)) -InstallObjectModule(vga,$(MODULEDIR),drivers) +InstallVideoObjectModule(vga,$(MODULEDIR)) #if !defined(XF86DriverSDK) InstallModuleManPage(vga) #endif DependTarget() InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/drivers/vga) InstallDriverSDKNonExecFile(generic.c,$(DRIVERSDKDIR)/drivers/vga) InstallDriverSDKObjectModule(vga,$(DRIVERSDKMODULEDIR),drivers) Index: xc/programs/Xserver/hw/xfree86/drivers/via/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/via/Imakefile,v retrieving revision 1.8 diff -u -2 -0 -r1.8 Imakefile --- xc/programs/Xserver/hw/xfree86/drivers/via/Imakefile 6 Feb 2005 07:12:43 -0000 1.8 +++ xc/programs/Xserver/hw/xfree86/drivers/via/Imakefile 7 Mar 2005 19:19:44 -0000 @@ -61,41 +61,41 @@ -I$(XF86SRC)/xf4bpp -I$(SERVERSRC)/Xext \ -I$(XF86SRC)/vgahw -I$(XF86SRC)/ramdac \ -I$(XF86SRC)/ddc -I$(XF86SRC)/i2c \ -I$(XF86SRC)/rac -I$(XF86SRC)/int10 -I$(SERVERSRC)/render \ -I$(SERVERSRC)/include -I$(XINCLUDESRC) -I$(FONTINCSRC) \ -I$(EXTINCSRC) -I$(XF86SRC)/vbe -I$(XF86SRC)/shadowfb \ -I$(SERVERSRC)/fb $(DRIINCLUDES) #endif DEFINES = $(DRIDEFINES) #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif NormalAsmObjectRule() ModuleObjectRule() ObjectModuleTarget(via, $(OBJS)) -InstallObjectModule(via,$(MODULEDIR),drivers) +InstallVideoObjectModule(via,$(MODULEDIR)) #if !defined(XF86DriverSDK) InstallModuleManPage(via) #endif DependTarget() InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/drivers/via) InstallDriverSDKNonExecFile(via.h,$(DRIVERSDKDIR)/drivers/via) InstallDriverSDKNonExecFile(via_accel.c,$(DRIVERSDKDIR)/drivers/via) InstallDriverSDKNonExecFile(via_bandwidth.c,$(DRIVERSDKDIR)/drivers/via) InstallDriverSDKNonExecFile(via_bios.c,$(DRIVERSDKDIR)/drivers/via) InstallDriverSDKNonExecFile(via_bios.h,$(DRIVERSDKDIR)/drivers/via) InstallDriverSDKNonExecFile(via_common.h,$(DRIVERSDKDIR)/drivers/via) InstallDriverSDKNonExecFile(via_cursor.c,$(DRIVERSDKDIR)/drivers/via) InstallDriverSDKNonExecFile(via_dga.c,$(DRIVERSDKDIR)/drivers/via) InstallDriverSDKNonExecFile(via_dri.c,$(DRIVERSDKDIR)/drivers/via) InstallDriverSDKNonExecFile(via_dri.h,$(DRIVERSDKDIR)/drivers/via) InstallDriverSDKNonExecFile(via_driver.c,$(DRIVERSDKDIR)/drivers/via) InstallDriverSDKNonExecFile(via_driver.h,$(DRIVERSDKDIR)/drivers/via) Index: xc/programs/Xserver/hw/xfree86/drivers/vmware/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/vmware/Imakefile,v retrieving revision 1.2 diff -u -2 -0 -r1.2 Imakefile --- xc/programs/Xserver/hw/xfree86/drivers/vmware/Imakefile 23 Apr 2004 19:53:57 -0000 1.2 +++ xc/programs/Xserver/hw/xfree86/drivers/vmware/Imakefile 7 Mar 2005 19:19:44 -0000 @@ -17,41 +17,41 @@ -I$(SERVERSRC)/fb -I$(SERVERSRC)/mi -I$(XF86SRC)/int10 \ -I$(XF86SRC)/xaa -I$(XF86SRC)/rac \ -I$(XF86SRC)/vgahw -I$(XF86SRC)/fbdevhw \ -I$(XF86SRC)/ramdac -I$(XF86SRC)/ddc -I$(XF86SRC)/i2c \ -I$(SERVERSRC)/Xext -I$(SERVERSRC)/render \ -I$(FONTINCSRC) -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ -I$(XF86SRC)/shadowfb -I$(EXTINCSRC) \ -I$(XF86SRC)/vbe $(DRIINCLUDES) #endif DEFINES = $(DRIDEFINES) #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget(vmware,$(OBJS)) -InstallObjectModule(vmware,$(MODULEDIR),drivers) +InstallVideoObjectModule(vmware,$(MODULEDIR)) #if !defined(XF86DriverSDK) InstallModuleManPage(vmware) #endif DependTarget() InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/drivers/vmware) InstallDriverSDKNonExecFile(vmware.c,$(DRIVERSDKDIR)/drivers/vmware) InstallDriverSDKNonExecFile(vmwarecurs.c,$(DRIVERSDKDIR)/drivers/vmware) InstallDriverSDKNonExecFile(vmwarexaa.c,$(DRIVERSDKDIR)/drivers/vmware) InstallDriverSDKNonExecFile(guest_os.h,$(DRIVERSDKDIR)/drivers/vmware) InstallDriverSDKNonExecFile(includeCheck.h,$(DRIVERSDKDIR)/drivers/vmware) InstallDriverSDKNonExecFile(svga_limits.h,$(DRIVERSDKDIR)/drivers/vmware) InstallDriverSDKNonExecFile(svga_reg.h,$(DRIVERSDKDIR)/drivers/vmware) InstallDriverSDKNonExecFile(svga_struct.h,$(DRIVERSDKDIR)/drivers/vmware) InstallDriverSDKNonExecFile(vm_basic_types.h,$(DRIVERSDKDIR)/drivers/vmware) InstallDriverSDKNonExecFile(vm_device_version.h,$(DRIVERSDKDIR)/drivers/vmware) InstallDriverSDKNonExecFile(vmware.h,$(DRIVERSDKDIR)/drivers/vmware) InstallDriverSDKNonExecFile(bits2pixels.c,$(DRIVERSDKDIR)/drivers/vmware) Index: xc/programs/Xserver/hw/xfree86/drivers/voodoo/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/voodoo/Imakefile,v retrieving revision 1.2 diff -u -2 -0 -r1.2 Imakefile --- xc/programs/Xserver/hw/xfree86/drivers/voodoo/Imakefile 24 Sep 2004 00:07:55 -0000 1.2 +++ xc/programs/Xserver/hw/xfree86/drivers/voodoo/Imakefile 7 Mar 2005 19:19:44 -0000 @@ -15,30 +15,30 @@ INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86OSSRC) \ -I$(SERVERSRC)/fb -I$(SERVERSRC)/mi \ -I$(XF86SRC)/xaa \ -I$(XF86SRC)/vgahw -I$(XF86SRC)/ramdac \ -I$(XF86SRC)/ddc -I$(XF86SRC)/i2c \ -I$(SERVERSRC)/Xext -I$(XF86SRC)/xf8_32bpp\ -I$(XF86SRC)/rac -I$(XF86SRC)/int10 -I$(SERVERSRC)/render \ -I$(FONTINCSRC) -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ -I$(XF86SRC)/shadowfb \ -I$(EXTINCSRC) -I$(SERVERSRC)/render #endif #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget(voodoo,$(OBJS)) -InstallObjectModule(voodoo,$(MODULEDIR),drivers) +InstallVideoObjectModule(voodoo,$(MODULEDIR)) InstallModuleManPage(voodoo) DependTarget() InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/drivers/voodoo) InstallDriverSDKNonExecFile(voodoo_driver.c,$(DRIVERSDKDIR)/drivers/voodoo) InstallDriverSDKObjectModule(voodoo,$(DRIVERSDKMODULEDIR),drivers) Index: xc/programs/Xserver/hw/xfree86/drivers/wsfb/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/wsfb/Imakefile,v retrieving revision 1.1 diff -u -2 -0 -r1.1 Imakefile --- xc/programs/Xserver/hw/xfree86/drivers/wsfb/Imakefile 26 Sep 2004 17:06:45 -0000 1.1 +++ xc/programs/Xserver/hw/xfree86/drivers/wsfb/Imakefile 7 Mar 2005 19:19:44 -0000 @@ -14,32 +14,32 @@ #else INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86OSSRC) -I$(SERVERSRC)/mi \ -I$(SERVERSRC)/fb -I$(SERVERSRC)/mfb -I$(XF86SRC)/xaa \ -I$(XF86SRC)/ramdac -I$(XF86SRC)/ddc -I$(XF86SRC)/i2c \ -I$(XF86SRC)/rac -I$(SERVERSRC)/Xext \ -I$(XF86SRC)/xf4bpp -I$(XF86SRC)/xf1bpp -I$(XF86SRC)/xf24_32bpp \ -I$(FONTINCSRC) -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ -I$(SERVERSRC)/miext/shadow -I$(EXTINCSRC) -I$(SERVERSRC)/render #endif DEFINES = #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget(wsfb,$(OBJS)) -InstallObjectModule(wsfb,$(MODULEDIR),drivers) +InstallVideoObjectModule(wsfb,$(MODULEDIR)) #if !defined(XF86DriverSDK) InstallModuleManPage(wsfb) #endif DependTarget() InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/drivers/wsfb) InstallDriverSDKNonExecFile(wsfb_driver.c,$(DRIVERSDKDIR)/drivers/wsfb) InstallDriverSDKObjectModule(wsfb,$(DRIVERSDKMODULEDIR),drivers) Index: xc/programs/Xserver/hw/xfree86/input/acecad/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/acecad/Imakefile,v retrieving revision 1.2 diff -u -2 -0 -r1.2 Imakefile --- xc/programs/Xserver/hw/xfree86/input/acecad/Imakefile 23 Apr 2004 19:54:02 -0000 1.2 +++ xc/programs/Xserver/hw/xfree86/input/acecad/Imakefile 7 Mar 2005 19:19:44 -0000 @@ -7,25 +7,25 @@ DEFINES = -DLINUX_INPUT #endif SRCS = acecad.c OBJS = acecad.o DRIVER = acecad INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86SRC)/loader -I$(XF86OSSRC) \ -I$(SERVERSRC)/include -I$(SERVERSRC)/mi -I$(XINCLUDESRC) \ -I$(EXTINCSRC) #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget($(DRIVER),$(OBJS)) -InstallObjectModule($(DRIVER),$(MODULEDIR),input) +InstallInputObjectModule($(DRIVER),$(MODULEDIR)) DependTarget() InstallDriverSDKObjectModule($(DRIVER),$(DRIVERSDKMODULEDIR),input) Index: xc/programs/Xserver/hw/xfree86/input/aiptek/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/aiptek/Imakefile,v retrieving revision 1.2 diff -u -2 -0 -r1.2 Imakefile --- xc/programs/Xserver/hw/xfree86/input/aiptek/Imakefile 23 Apr 2004 19:54:02 -0000 1.2 +++ xc/programs/Xserver/hw/xfree86/input/aiptek/Imakefile 7 Mar 2005 19:19:44 -0000 @@ -6,29 +6,29 @@ #if HasLinuxInput DEFINES = -DLINUX_INPUT #endif SRCS = xf86Aiptek.c OBJS = xf86Aiptek.o DRIVER = aiptek INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86SRC)/loader -I$(XF86OSSRC) \ -I$(SERVERSRC)/include -I$(SERVERSRC)/mi -I$(XINCLUDESRC) -I$(EXTINCSRC) #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget($(DRIVER),$(OBJS)) -InstallObjectModule($(DRIVER),$(MODULEDIR),input) +InstallInputObjectModule($(DRIVER),$(MODULEDIR)) #if !defined(XF86DriverSDK) InstallModuleManPage($(DRIVER)) #endif DependTarget() InstallDriverSDKObjectModule($(DRIVER),$(DRIVERSDKMODULEDIR),input) Index: xc/programs/Xserver/hw/xfree86/input/calcomp/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/calcomp/Imakefile,v retrieving revision 1.2 diff -u -2 -0 -r1.2 Imakefile --- xc/programs/Xserver/hw/xfree86/input/calcomp/Imakefile 23 Apr 2004 19:54:02 -0000 1.2 +++ xc/programs/Xserver/hw/xfree86/input/calcomp/Imakefile 7 Mar 2005 19:19:44 -0000 @@ -2,25 +2,25 @@ #define IHaveModules #include SRCS = xf86Calcomp.c OBJS = xf86Calcomp.o DRIVER = calcomp INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86SRC)/loader -I$(XF86OSSRC) \ -I$(SERVERSRC)/include -I$(XINCLUDESRC) -I$(EXTINCSRC) #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget($(DRIVER),$(OBJS)) -InstallObjectModule($(DRIVER),$(MODULEDIR),input) +InstallInputObjectModule($(DRIVER),$(MODULEDIR)) DependTarget() InstallDriverSDKObjectModule($(DRIVER),$(DRIVERSDKMODULEDIR),input) Index: xc/programs/Xserver/hw/xfree86/input/citron/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/citron/Imakefile,v retrieving revision 1.2 diff -u -2 -0 -r1.2 Imakefile --- xc/programs/Xserver/hw/xfree86/input/citron/Imakefile 23 Apr 2004 19:54:02 -0000 1.2 +++ xc/programs/Xserver/hw/xfree86/input/citron/Imakefile 7 Mar 2005 19:19:44 -0000 @@ -2,29 +2,29 @@ #define IHaveModules #include SRCS = citron.c OBJS = citron.o DRIVER = citron INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86SRC)/loader -I$(XF86OSSRC) \ -I$(SERVERSRC)/include -I$(SERVERSRC)/mi -I$(XINCLUDESRC) -I$(EXTINCSRC) #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget($(DRIVER),$(OBJS)) -InstallObjectModule($(DRIVER),$(MODULEDIR),input) +InstallInputObjectModule($(DRIVER),$(MODULEDIR)) #if !defined(XF86DriverSDK) InstallModuleManPage($(DRIVER)) #endif DependTarget() InstallDriverSDKObjectModule($(DRIVER),$(DRIVERSDKMODULEDIR),input) Index: xc/programs/Xserver/hw/xfree86/input/digitaledge/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/digitaledge/Imakefile,v retrieving revision 1.2 diff -u -2 -0 -r1.2 Imakefile --- xc/programs/Xserver/hw/xfree86/input/digitaledge/Imakefile 23 Apr 2004 19:54:02 -0000 1.2 +++ xc/programs/Xserver/hw/xfree86/input/digitaledge/Imakefile 7 Mar 2005 19:19:44 -0000 @@ -2,25 +2,25 @@ #define IHaveModules #include SRCS = DigitalEdge.c OBJS = DigitalEdge.o DRIVER = digitaledge INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86SRC)/loader -I$(XF86OSSRC) \ -I$(SERVERSRC)/mi -I$(SERVERSRC)/include -I$(XINCLUDESRC) -I$(EXTINCSRC) #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget($(DRIVER),$(OBJS)) -InstallObjectModule($(DRIVER),$(MODULEDIR),input) +InstallInputObjectModule($(DRIVER),$(MODULEDIR)) DependTarget() InstallDriverSDKObjectModule($(DRIVER),$(DRIVERSDKMODULEDIR),input) Index: xc/programs/Xserver/hw/xfree86/input/dmc/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/dmc/Imakefile,v retrieving revision 1.2 diff -u -2 -0 -r1.2 Imakefile --- xc/programs/Xserver/hw/xfree86/input/dmc/Imakefile 23 Apr 2004 19:54:02 -0000 1.2 +++ xc/programs/Xserver/hw/xfree86/input/dmc/Imakefile 7 Mar 2005 19:19:44 -0000 @@ -2,29 +2,29 @@ #define IHaveModules #include SRCS = xf86DMC.c OBJS = xf86DMC.o DRIVER = dmc INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86SRC)/loader -I$(XF86OSSRC) \ -I$(SERVERSRC)/include -I$(XINCLUDESRC) -I$(EXTINCSRC) #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget($(DRIVER),$(OBJS)) -InstallObjectModule($(DRIVER),$(MODULEDIR),input) +InstallInputObjectModule($(DRIVER),$(MODULEDIR)) #if !defined(XF86DriverSDK) InstallModuleManPage($(DRIVER)) #endif DependTarget() InstallDriverSDKObjectModule($(DRIVER),$(DRIVERSDKMODULEDIR),input) Index: xc/programs/Xserver/hw/xfree86/input/dynapro/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/dynapro/Imakefile,v retrieving revision 1.2 diff -u -2 -0 -r1.2 Imakefile --- xc/programs/Xserver/hw/xfree86/input/dynapro/Imakefile 23 Apr 2004 19:54:02 -0000 1.2 +++ xc/programs/Xserver/hw/xfree86/input/dynapro/Imakefile 7 Mar 2005 19:19:44 -0000 @@ -2,29 +2,29 @@ #define IHaveModules #include SRCS = xf86Dyna.c OBJS = xf86Dyna.o DRIVER = dynapro INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86SRC)/loader -I$(XF86OSSRC) \ -I$(SERVERSRC)/include -I$(XINCLUDESRC) -I$(EXTINCSRC) #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget($(DRIVER),$(OBJS)) -InstallObjectModule($(DRIVER),$(MODULEDIR),input) +InstallInputObjectModule($(DRIVER),$(MODULEDIR)) #if !defined(XF86DriverSDK) InstallModuleManPage($(DRIVER)) #endif DependTarget() InstallDriverSDKObjectModule($(DRIVER),$(DRIVERSDKMODULEDIR),input) Index: xc/programs/Xserver/hw/xfree86/input/elo2300/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/elo2300/Imakefile,v retrieving revision 1.2 diff -u -2 -0 -r1.2 Imakefile --- xc/programs/Xserver/hw/xfree86/input/elo2300/Imakefile 23 Apr 2004 19:54:02 -0000 1.2 +++ xc/programs/Xserver/hw/xfree86/input/elo2300/Imakefile 7 Mar 2005 19:19:44 -0000 @@ -2,25 +2,25 @@ #define IHaveModules #include SRCS = elo.c OBJS = elo.o DRIVER = elo2300 INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86SRC)/loader -I$(XF86OSSRC) \ -I$(SERVERSRC)/include -I$(XINCLUDESRC) -I$(EXTINCSRC) #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget($(DRIVER),$(OBJS)) -InstallObjectModule($(DRIVER),$(MODULEDIR),input) +InstallInputObjectModule($(DRIVER),$(MODULEDIR)) DependTarget() InstallDriverSDKObjectModule($(DRIVER),$(DRIVERSDKMODULEDIR),input) Index: xc/programs/Xserver/hw/xfree86/input/elographics/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/elographics/Imakefile,v retrieving revision 1.2 diff -u -2 -0 -r1.2 Imakefile --- xc/programs/Xserver/hw/xfree86/input/elographics/Imakefile 23 Apr 2004 19:54:03 -0000 1.2 +++ xc/programs/Xserver/hw/xfree86/input/elographics/Imakefile 7 Mar 2005 19:19:44 -0000 @@ -2,29 +2,29 @@ #define IHaveModules #include SRCS = xf86Elo.c OBJS = xf86Elo.o DRIVER = elographics INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86SRC)/loader -I$(XF86OSSRC) \ -I$(SERVERSRC)/include -I$(XINCLUDESRC) -I$(EXTINCSRC) #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget($(DRIVER),$(OBJS)) -InstallObjectModule($(DRIVER),$(MODULEDIR),input) +InstallInputObjectModule($(DRIVER),$(MODULEDIR)) #if !defined(XF86DriverSDK) InstallModuleManPage($(DRIVER)) #endif DependTarget() InstallDriverSDKObjectModule($(DRIVER),$(DRIVERSDKMODULEDIR),input) Index: xc/programs/Xserver/hw/xfree86/input/evdev/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/evdev/Imakefile,v retrieving revision 1.1 diff -u -2 -0 -r1.1 Imakefile --- xc/programs/Xserver/hw/xfree86/input/evdev/Imakefile 12 Jan 2005 20:15:52 -0000 1.1 +++ xc/programs/Xserver/hw/xfree86/input/evdev/Imakefile 7 Mar 2005 19:19:44 -0000 @@ -1,24 +1,24 @@ #define IHaveModules #include SRCS = evdev.c OBJS = evdev.o DRIVER = evdev INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86SRC)/loader -I$(XF86OSSRC) \ -I$(SERVERSRC)/include -I$(SERVERSRC)/mi -I$(XINCLUDESRC) -I$(EXTINCSRC) #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget($(DRIVER),$(OBJS)) -InstallObjectModule($(DRIVER),$(MODULEDIR),input) +InstallInputObjectModule($(DRIVER),$(MODULEDIR)) DependTarget() InstallDriverSDKObjectModule($(DRIVER),$(DRIVERSDKMODULEDIR),input) Index: xc/programs/Xserver/hw/xfree86/input/fpit/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/fpit/Imakefile,v retrieving revision 1.2 diff -u -2 -0 -r1.2 Imakefile --- xc/programs/Xserver/hw/xfree86/input/fpit/Imakefile 23 Apr 2004 19:54:03 -0000 1.2 +++ xc/programs/Xserver/hw/xfree86/input/fpit/Imakefile 7 Mar 2005 19:19:44 -0000 @@ -2,29 +2,29 @@ #define IHaveModules #include SRCS = xf86Fpit.c OBJS = xf86Fpit.o DRIVER = fpit INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86SRC)/loader -I$(XF86OSSRC) \ -I$(SERVERSRC)/include -I$(SERVERSRC)/mi -I$(XINCLUDESRC) -I$(EXTINCSRC) #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget($(DRIVER),$(OBJS)) -InstallObjectModule($(DRIVER),$(MODULEDIR),input) +InstallInputObjectModule($(DRIVER),$(MODULEDIR)) #if !defined(XF86DriverSDK) InstallModuleManPage($(DRIVER)) #endif DependTarget() InstallDriverSDKObjectModule($(DRIVER),$(DRIVERSDKMODULEDIR),input) Index: xc/programs/Xserver/hw/xfree86/input/hyperpen/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/hyperpen/Imakefile,v retrieving revision 1.2 diff -u -2 -0 -r1.2 Imakefile --- xc/programs/Xserver/hw/xfree86/input/hyperpen/Imakefile 23 Apr 2004 19:54:03 -0000 1.2 +++ xc/programs/Xserver/hw/xfree86/input/hyperpen/Imakefile 7 Mar 2005 19:19:44 -0000 @@ -6,25 +6,25 @@ #if HasLinuxInput DEFINES = -DLINUX_INPUT #endif SRCS = xf86HyperPen.c OBJS = xf86HyperPen.o DRIVER = hyperpen INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86SRC)/loader -I$(XF86OSSRC) \ -I$(SERVERSRC)/include -I$(SERVERSRC)/mi -I$(XINCLUDESRC) -I$(EXTINCSRC) #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget($(DRIVER),$(OBJS)) -InstallObjectModule($(DRIVER),$(MODULEDIR),input) +InstallInputObjectModule($(DRIVER),$(MODULEDIR)) DependTarget() InstallDriverSDKObjectModule($(DRIVER),$(DRIVERSDKMODULEDIR),input) Index: xc/programs/Xserver/hw/xfree86/input/jamstudio/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/jamstudio/Imakefile,v retrieving revision 1.2 diff -u -2 -0 -r1.2 Imakefile --- xc/programs/Xserver/hw/xfree86/input/jamstudio/Imakefile 23 Apr 2004 19:54:03 -0000 1.2 +++ xc/programs/Xserver/hw/xfree86/input/jamstudio/Imakefile 7 Mar 2005 19:19:44 -0000 @@ -2,29 +2,29 @@ #define IHaveModules #include SRCS = js_x.c OBJS = js_x.o DRIVER = js_x INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86SRC)/loader -I$(XF86OSSRC) \ -I$(SERVERSRC)/include -I$(SERVERSRC)/mi -I$(XINCLUDESRC) -I$(EXTINCSRC) #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget($(DRIVER),$(OBJS)) -InstallObjectModule($(DRIVER),$(MODULEDIR),input) +InstallInputObjectModule($(DRIVER),$(MODULEDIR)) #if !defined(XF86DriverSDK) InstallModuleManPage($(DRIVER)) #endif DependTarget() InstallDriverSDKObjectModule($(DRIVER),$(DRIVERSDKMODULEDIR),input) Index: xc/programs/Xserver/hw/xfree86/input/joystick/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/joystick/Imakefile,v retrieving revision 1.2 diff -u -2 -0 -r1.2 Imakefile --- xc/programs/Xserver/hw/xfree86/input/joystick/Imakefile 23 Apr 2004 19:54:03 -0000 1.2 +++ xc/programs/Xserver/hw/xfree86/input/joystick/Imakefile 7 Mar 2005 19:19:44 -0000 @@ -10,25 +10,25 @@ INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86SRC)/loader -I$(XF86OSSRC) \ -I$(SERVERSRC)/include -I$(XINCLUDESRC) -I$(EXTINCSRC) #ifdef LinuxArchitecture ARCH_JSTK = ../os-support/linux/lnx_jstk.o #endif #if defined(FreeBSDArchitecture) || defined(NetBSDArchitecture) || defined(OpenBSDArchitecture) ARCH_JSTK = ../os-support/bsd/bsd_jstk.o #endif #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget($(DRIVER),$(OBJS)) -InstallObjectModule($(DRIVER),$(MODULEDIR),input) +InstallInputObjectModule($(DRIVER),$(MODULEDIR)) DependTarget() InstallDriverSDKObjectModule($(DRIVER),$(DRIVERSDKMODULEDIR),input) Index: xc/programs/Xserver/hw/xfree86/input/keyboard/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/keyboard/Imakefile,v retrieving revision 1.4 diff -u -2 -0 -r1.4 Imakefile --- xc/programs/Xserver/hw/xfree86/input/keyboard/Imakefile 20 Aug 2004 04:49:44 -0000 1.4 +++ xc/programs/Xserver/hw/xfree86/input/keyboard/Imakefile 7 Mar 2005 19:19:44 -0000 @@ -11,31 +11,31 @@ COMPAT_DRIVER = keyboard #if UseDeprecatedKeyboardDriver KEYBOARD_DEFS = -DUSE_DEPRECATED_KEYBOARD_DRIVER #endif INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86SRC)/loader -I$(XF86OSSRC) \ -I$(SERVERSRC)/mi -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ -I$(EXTINCSRC) DEFINES = $(XKBDEFRULESDEFS) $(KEYBOARD_DEFS) #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget($(DRIVER),$(OBJS)) ObjectModuleTarget($(COMPAT_DRIVER),$(OBJS)) -InstallObjectModule($(DRIVER),$(MODULEDIR),input) -InstallObjectModule($(COMPAT_DRIVER),$(MODULEDIR),input) +InstallInputObjectModule($(DRIVER),$(MODULEDIR)) +InstallInputObjectModule($(COMPAT_DRIVER),$(MODULEDIR)) #if !defined(XF86DriverSDK) InstallModuleManPage($(DRIVER)) InstallModuleManPage(keyboard) #endif DependTarget() InstallDriverSDKObjectModule($(DRIVER),$(DRIVERSDKMODULEDIR),input) Index: xc/programs/Xserver/hw/xfree86/input/magellan/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/magellan/Imakefile,v retrieving revision 1.2 diff -u -2 -0 -r1.2 Imakefile --- xc/programs/Xserver/hw/xfree86/input/magellan/Imakefile 23 Apr 2004 19:54:03 -0000 1.2 +++ xc/programs/Xserver/hw/xfree86/input/magellan/Imakefile 7 Mar 2005 19:19:44 -0000 @@ -2,25 +2,25 @@ #define IHaveModules #include SRCS = magellan.c OBJS = magellan.o DRIVER = magellan INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86SRC)/loader -I$(XF86OSSRC) \ -I$(SERVERSRC)/include -I$(XINCLUDESRC) -I$(EXTINCSRC) #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget($(DRIVER),$(OBJS)) -InstallObjectModule($(DRIVER),$(MODULEDIR),input) +InstallInputObjectModule($(DRIVER),$(MODULEDIR)) DependTarget() InstallDriverSDKObjectModule($(DRIVER),$(DRIVERSDKMODULEDIR),input) Index: xc/programs/Xserver/hw/xfree86/input/magictouch/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/magictouch/Imakefile,v retrieving revision 1.2 diff -u -2 -0 -r1.2 Imakefile --- xc/programs/Xserver/hw/xfree86/input/magictouch/Imakefile 23 Apr 2004 19:54:03 -0000 1.2 +++ xc/programs/Xserver/hw/xfree86/input/magictouch/Imakefile 7 Mar 2005 19:19:44 -0000 @@ -2,29 +2,29 @@ #define IHaveModules #include SRCS = xf86MagicTouch.c OBJS = xf86MagicTouch.o DRIVER = magictouch INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86SRC)/loader -I$(XF86OSSRC) \ -I$(SERVERSRC)/include -I$(SERVERSRC)/mi -I$(XINCLUDESRC) -I$(EXTINCSRC) #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget($(DRIVER),$(OBJS)) -InstallObjectModule($(DRIVER),$(MODULEDIR),input) +InstallInputObjectModule($(DRIVER),$(MODULEDIR)) #if !defined(XF86DriverSDK) InstallModuleManPage($(DRIVER)) #endif DependTarget() InstallDriverSDKObjectModule($(DRIVER),$(DRIVERSDKMODULEDIR),input) Index: xc/programs/Xserver/hw/xfree86/input/microtouch/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/microtouch/Imakefile,v retrieving revision 1.2 diff -u -2 -0 -r1.2 Imakefile --- xc/programs/Xserver/hw/xfree86/input/microtouch/Imakefile 23 Apr 2004 19:54:03 -0000 1.2 +++ xc/programs/Xserver/hw/xfree86/input/microtouch/Imakefile 7 Mar 2005 19:19:44 -0000 @@ -2,29 +2,29 @@ #define IHaveModules #include SRCS = microtouch.c OBJS = microtouch.o DRIVER = microtouch INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86SRC)/loader -I$(XF86OSSRC) \ -I$(SERVERSRC)/include -I$(XINCLUDESRC) -I$(EXTINCSRC) #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget($(DRIVER),$(OBJS)) -InstallObjectModule($(DRIVER),$(MODULEDIR),input) +InstallInputObjectModule($(DRIVER),$(MODULEDIR)) #if !defined(XF86DriverSDK) InstallModuleManPage($(DRIVER)) #endif DependTarget() InstallDriverSDKObjectModule($(DRIVER),$(DRIVERSDKMODULEDIR),input) Index: xc/programs/Xserver/hw/xfree86/input/mouse/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/mouse/Imakefile,v retrieving revision 1.2 diff -u -2 -0 -r1.2 Imakefile --- xc/programs/Xserver/hw/xfree86/input/mouse/Imakefile 23 Apr 2004 19:54:04 -0000 1.2 +++ xc/programs/Xserver/hw/xfree86/input/mouse/Imakefile 7 Mar 2005 19:19:44 -0000 @@ -5,29 +5,29 @@ SRCS = mouse.c pnp.c OBJS = mouse.o pnp.o DRIVER = mouse INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86SRC)/loader -I$(XF86OSSRC) \ -I$(SERVERSRC)/mi -I$(SERVERSRC)/include -I$(XINCLUDESRC) \ -I$(EXTINCSRC) DEFINES = -DPNP_MOUSE #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget($(DRIVER),$(OBJS)) -InstallObjectModule($(DRIVER),$(MODULEDIR),input) +InstallInputObjectModule($(DRIVER),$(MODULEDIR)) #if !defined(XF86DriverSDK) InstallModuleManPage($(DRIVER)) #endif DependTarget() InstallDriverSDKObjectModule($(DRIVER),$(DRIVERSDKMODULEDIR),input) Index: xc/programs/Xserver/hw/xfree86/input/mutouch/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/mutouch/Imakefile,v retrieving revision 1.2 diff -u -2 -0 -r1.2 Imakefile --- xc/programs/Xserver/hw/xfree86/input/mutouch/Imakefile 23 Apr 2004 19:54:04 -0000 1.2 +++ xc/programs/Xserver/hw/xfree86/input/mutouch/Imakefile 7 Mar 2005 19:19:44 -0000 @@ -2,29 +2,29 @@ #define IHaveModules #include SRCS = xf86MuTouch.c OBJS = xf86MuTouch.o DRIVER = mutouch INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86SRC)/loader -I$(XF86OSSRC) \ -I$(SERVERSRC)/include -I$(SERVERSRC)/mi -I$(XINCLUDESRC) -I$(EXTINCSRC) #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget($(DRIVER),$(OBJS)) -InstallObjectModule($(DRIVER),$(MODULEDIR),input) +InstallInputObjectModule($(DRIVER),$(MODULEDIR)) #if !defined(XF86DriverSDK) InstallModuleManPage($(DRIVER)) #endif DependTarget() InstallDriverSDKObjectModule($(DRIVER),$(DRIVERSDKMODULEDIR),input) Index: xc/programs/Xserver/hw/xfree86/input/palmax/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/palmax/Imakefile,v retrieving revision 1.2 diff -u -2 -0 -r1.2 Imakefile --- xc/programs/Xserver/hw/xfree86/input/palmax/Imakefile 23 Apr 2004 19:54:04 -0000 1.2 +++ xc/programs/Xserver/hw/xfree86/input/palmax/Imakefile 7 Mar 2005 19:19:44 -0000 @@ -2,29 +2,29 @@ #define IHaveModules #include SRCS = xf86Palmax.c OBJS = xf86Palmax.o DRIVER = palmax INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86SRC)/loader -I$(XF86OSSRC) \ -I$(SERVERSRC)/include -I$(SERVERSRC)/mi -I$(XINCLUDESRC) -I$(EXTINCSRC) #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget($(DRIVER),$(OBJS)) -InstallObjectModule($(DRIVER),$(MODULEDIR),input) +InstallInputObjectModule($(DRIVER),$(MODULEDIR)) #if !defined(XF86DriverSDK) InstallModuleManPage($(DRIVER)) #endif DependTarget() InstallDriverSDKObjectModule($(DRIVER),$(DRIVERSDKMODULEDIR),input) Index: xc/programs/Xserver/hw/xfree86/input/penmount/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/penmount/Imakefile,v retrieving revision 1.2 diff -u -2 -0 -r1.2 Imakefile --- xc/programs/Xserver/hw/xfree86/input/penmount/Imakefile 23 Apr 2004 19:54:05 -0000 1.2 +++ xc/programs/Xserver/hw/xfree86/input/penmount/Imakefile 7 Mar 2005 19:19:44 -0000 @@ -2,29 +2,29 @@ #define IHaveModules #include SRCS = xf86PM.c OBJS = xf86PM.o DRIVER = penmount INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86SRC)/loader -I$(XF86OSSRC) \ -I$(SERVERSRC)/include -I$(XINCLUDESRC) -I$(EXTINCSRC) #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget($(DRIVER),$(OBJS)) -InstallObjectModule($(DRIVER),$(MODULEDIR),input) +InstallInputObjectModule($(DRIVER),$(MODULEDIR)) #if !defined(XF86DriverSDK) InstallModuleManPage($(DRIVER)) #endif DependTarget() InstallDriverSDKObjectModule($(DRIVER),$(DRIVERSDKMODULEDIR),input) Index: xc/programs/Xserver/hw/xfree86/input/sample/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/sample/Imakefile,v retrieving revision 1.2 diff -u -2 -0 -r1.2 Imakefile --- xc/programs/Xserver/hw/xfree86/input/sample/Imakefile 23 Apr 2004 19:54:05 -0000 1.2 +++ xc/programs/Xserver/hw/xfree86/input/sample/Imakefile 7 Mar 2005 19:19:44 -0000 @@ -7,25 +7,25 @@ #define IHaveModules #include SRCS = sample.c OBJS = sample.o DRIVER = sample INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86SRC)/loader -I$(XF86OSSRC) \ -I$(SERVERSRC)/include -I$(XINCLUDESRC) -I$(EXTINCSRC) #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget($(DRIVER),$(OBJS)) -InstallObjectModule($(DRIVER),$(MODULEDIR),input) +InstallInputObjectModule($(DRIVER),$(MODULEDIR)) DependTarget() InstallDriverSDKObjectModule($(DRIVER),$(DRIVERSDKMODULEDIR),input) Index: xc/programs/Xserver/hw/xfree86/input/spaceorb/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/spaceorb/Imakefile,v retrieving revision 1.2 diff -u -2 -0 -r1.2 Imakefile --- xc/programs/Xserver/hw/xfree86/input/spaceorb/Imakefile 23 Apr 2004 19:54:05 -0000 1.2 +++ xc/programs/Xserver/hw/xfree86/input/spaceorb/Imakefile 7 Mar 2005 19:19:44 -0000 @@ -2,25 +2,25 @@ #define IHaveModules #include SRCS = spaceorb.c OBJS = spaceorb.o DRIVER = spaceorb INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86SRC)/loader -I$(XF86OSSRC) \ -I$(SERVERSRC)/include -I$(XINCLUDESRC) -I$(EXTINCSRC) #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget($(DRIVER),$(OBJS)) -InstallObjectModule($(DRIVER),$(MODULEDIR),input) +InstallInputObjectModule($(DRIVER),$(MODULEDIR)) DependTarget() InstallDriverSDKObjectModule($(DRIVER),$(DRIVERSDKMODULEDIR),input) Index: xc/programs/Xserver/hw/xfree86/input/summa/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/summa/Imakefile,v retrieving revision 1.2 diff -u -2 -0 -r1.2 Imakefile --- xc/programs/Xserver/hw/xfree86/input/summa/Imakefile 23 Apr 2004 19:54:05 -0000 1.2 +++ xc/programs/Xserver/hw/xfree86/input/summa/Imakefile 7 Mar 2005 19:19:44 -0000 @@ -2,25 +2,25 @@ #define IHaveModules #include SRCS = xf86Summa.c OBJS = xf86Summa.o DRIVER = summa INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86SRC)/loader -I$(XF86OSSRC) \ -I$(SERVERSRC)/mi -I$(SERVERSRC)/include -I$(XINCLUDESRC) -I$(EXTINCSRC) #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget($(DRIVER),$(OBJS)) -InstallObjectModule($(DRIVER),$(MODULEDIR),input) +InstallInputObjectModule($(DRIVER),$(MODULEDIR)) DependTarget() InstallDriverSDKObjectModule($(DRIVER),$(DRIVERSDKMODULEDIR),input) Index: xc/programs/Xserver/hw/xfree86/input/tek4957/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/tek4957/Imakefile,v retrieving revision 1.2 diff -u -2 -0 -r1.2 Imakefile --- xc/programs/Xserver/hw/xfree86/input/tek4957/Imakefile 23 Apr 2004 19:54:05 -0000 1.2 +++ xc/programs/Xserver/hw/xfree86/input/tek4957/Imakefile 7 Mar 2005 19:19:44 -0000 @@ -2,29 +2,29 @@ #define IHaveModules #include SRCS = xf86Tek4957.c OBJS = xf86Tek4957.o DRIVER = tek4957 INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86SRC)/loader -I$(XF86OSSRC) \ -I$(SERVERSRC)/mi -I$(SERVERSRC)/include -I$(XINCLUDESRC) -I$(EXTINCSRC) #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget($(DRIVER),$(OBJS)) -InstallObjectModule($(DRIVER),$(MODULEDIR),input) +InstallInputObjectModule($(DRIVER),$(MODULEDIR)) #if !defined(XF86DriverSDK) InstallModuleManPage($(DRIVER)) #endif DependTarget() InstallDriverSDKObjectModule($(DRIVER),$(DRIVERSDKMODULEDIR),input) Index: xc/programs/Xserver/hw/xfree86/input/ur98/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/ur98/Imakefile,v retrieving revision 1.2 diff -u -2 -0 -r1.2 Imakefile --- xc/programs/Xserver/hw/xfree86/input/ur98/Imakefile 23 Apr 2004 19:54:05 -0000 1.2 +++ xc/programs/Xserver/hw/xfree86/input/ur98/Imakefile 7 Mar 2005 19:19:44 -0000 @@ -2,29 +2,29 @@ #define IHaveModules #include SRCS = xf86Ur-98.c OBJS = xf86Ur-98.o DRIVER = ur98 INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86SRC)/loader -I$(XF86OSSRC) \ -I$(SERVERSRC)/include -I$(SERVERSRC)/mi -I$(XINCLUDESRC) -I$(EXTINCSRC) #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget($(DRIVER),$(OBJS)) -InstallObjectModule($(DRIVER),$(MODULEDIR),input/linux) +InstallInputObjectModule($(DRIVER),$(MODULEDIR)) #if !defined(XF86DriverSDK) InstallModuleManPage($(DRIVER)) #endif DependTarget() InstallDriverSDKObjectModule($(DRIVER),$(DRIVERSDKMODULEDIR),input/linux) Index: xc/programs/Xserver/hw/xfree86/input/void/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/void/Imakefile,v retrieving revision 1.2 diff -u -2 -0 -r1.2 Imakefile --- xc/programs/Xserver/hw/xfree86/input/void/Imakefile 23 Apr 2004 19:54:05 -0000 1.2 +++ xc/programs/Xserver/hw/xfree86/input/void/Imakefile 7 Mar 2005 19:19:44 -0000 @@ -2,29 +2,29 @@ #define IHaveModules #include SRCS = void.c OBJS = void.o DRIVER = void INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86SRC)/loader -I$(XF86OSSRC) \ -I$(SERVERSRC)/include -I$(SERVERSRC)/mi -I$(XINCLUDESRC) -I$(EXTINCSRC) #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget($(DRIVER),$(OBJS)) -InstallObjectModule($(DRIVER),$(MODULEDIR),input) +InstallInputObjectModule($(DRIVER),$(MODULEDIR)) #if !defined(XF86DriverSDK) InstallModuleManPage($(DRIVER)) #endif DependTarget() InstallDriverSDKObjectModule($(DRIVER),$(DRIVERSDKMODULEDIR),input) Index: xc/programs/Xserver/hw/xfree86/input/wacom/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/wacom/Imakefile,v retrieving revision 1.2 diff -u -2 -0 -r1.2 Imakefile --- xc/programs/Xserver/hw/xfree86/input/wacom/Imakefile 23 Apr 2004 19:54:06 -0000 1.2 +++ xc/programs/Xserver/hw/xfree86/input/wacom/Imakefile 7 Mar 2005 19:19:44 -0000 @@ -6,34 +6,34 @@ #if HasLinuxInput DEFINES = -DLINUX_INPUT #endif SRCS = xf86Wacom.c OBJS = xf86Wacom.o DRIVER = wacom INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86SRC)/loader -I$(XF86OSSRC) \ -I$(SERVERSRC)/include -I$(SERVERSRC)/mi -I$(XINCLUDESRC) -I$(EXTINCSRC) #if MakeHasPosixVariableSubstitutions SubdirLibraryRule($(OBJS)) #endif ModuleObjectRule() ObjectModuleTarget($(DRIVER),$(OBJS)) -InstallObjectModule($(DRIVER),$(MODULEDIR),input) +InstallInputObjectModule($(DRIVER),$(MODULEDIR)) #if !defined(XF86DriverSDK) InstallModuleManPage($(DRIVER)) #endif XCOMM Build a standalone executable to be able to test the driver without XCOMM a running X server. LinkFile(testwacom.c,xf86Wacom.c) SpecialCObjectRule(testwacom,NullParameter,-DTEST) DependTarget() InstallDriverSDKObjectModule($(DRIVER),$(DRIVERSDKMODULEDIR),input)