From cb4a2d732001d32fa1e95bb15e047da12b6c9754 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 26 May 2015 16:22:40 +0200 Subject: Drop nx-X11/lib/GL and move Imakefile.inc include files into Xserver code tree. The client-side library libNX_GL.{a,so} is not built when building nx-libs. However, nx-X11/lib/GL/** ships several imake include files (Imakefile.inc) that are also used in nx-X11/programs/Xserver/GL/**. These files have been moved from the nx-X11/lib/GL/ code subtree to the nx-X11/programs/Xserver/GL/. Furthermore, we don't provide module builds of the GL extension anymore, as that feature is neither used in nx-libs. --- .../Xserver/GL/mesa/array_cache/Imakefile.inc | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile.inc (limited to 'nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile.inc') diff --git a/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile.inc new file mode 100644 index 000000000..9a5044791 --- /dev/null +++ b/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile.inc @@ -0,0 +1,34 @@ +XCOMM $XFree86: xc/lib/GL/mesa/src/array_cache/Imakefile.inc,v 1.1tsi Exp $ + +#ifndef MesaACBuildDir +#define MesaACBuildDir $(GLXLIBSRC)/mesa/array_cache/ +#endif + +MESAACBUILDDIR = MesaACBuildDir + + MESA_AC_SRCS = $(MESAACBUILDDIR)ac_context.c \ + $(MESAACBUILDDIR)ac_import.c + +#ifdef NeedToLinkMesaSrc +LinkSourceFile(acache.h, $(MESASRCDIR)/src/mesa/array_cache) +LinkSourceFile(ac_context.c, $(MESASRCDIR)/src/mesa/array_cache) +LinkSourceFile(ac_context.h, $(MESASRCDIR)/src/mesa/array_cache) +LinkSourceFile(ac_import.c, $(MESASRCDIR)/src/mesa/array_cache) +#endif + + MESA_AC_OBJS = $(MESAACBUILDDIR)ac_context.o \ + $(MESAACBUILDDIR)ac_import.o + +#if defined(DoSharedLib) && DoSharedLib + MESA_AC_UOBJS = $(MESAACBUILDDIR)unshared/ac_context.o \ + $(MESAACBUILDDIR)unshared/ac_import.o +#else + MESA_AC_UOBJS = $(MESA_AC_OBJS) +#endif + + MESA_AC_DOBJS = $(MESAACBUILDDIR)debugger/ac_context.o \ + $(MESAACBUILDDIR)debugger/ac_import.o + + MESA_AC_POBJS = $(MESAACBUILDDIR)profiled/ac_context.o \ + $(MESAACBUILDDIR)profiled/ac_import.o + -- cgit v1.2.3 From 5cd80d272ba366686a3b28c5915cb5bf3ada8985 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 27 May 2015 08:10:38 +0200 Subject: imake clean-up: Enforce build of Mesa GLX extension. Drop all other GLX build methods (built-in DRI drivers, etc.). --- nx-X11/config/cf/X11.tmpl | 7 - nx-X11/config/cf/host.def | 5 - nx-X11/config/cf/linux.cf | 64 ------ nx-X11/config/cf/lnxLib.tmpl | 7 +- nx-X11/config/cf/xfree86.cf | 242 ++------------------- nx-X11/config/cf/xorg.cf | 242 ++------------------- nx-X11/config/cf/xorgsite.def | 5 - nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile | 2 +- nx-X11/programs/Xserver/GL/mesa/Imakefile.inc | 4 - nx-X11/programs/Xserver/GL/mesa/X/Imakefile.inc | 4 - .../Xserver/GL/mesa/array_cache/Imakefile.inc | 4 - nx-X11/programs/Xserver/GL/mesa/main/Imakefile.inc | 4 - nx-X11/programs/Xserver/GL/mesa/math/Imakefile.inc | 4 - .../programs/Xserver/GL/mesa/shader/Imakefile.inc | 4 - .../Xserver/GL/mesa/shader/grammar/Imakefile.inc | 4 - .../Xserver/GL/mesa/shader/slang/Imakefile.inc | 4 - .../programs/Xserver/GL/mesa/swrast/Imakefile.inc | 4 - .../Xserver/GL/mesa/swrast_setup/Imakefile.inc | 4 - nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile.inc | 4 - 19 files changed, 29 insertions(+), 589 deletions(-) (limited to 'nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile.inc') diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl index 91a9aa6a6..8b3cf33a1 100644 --- a/nx-X11/config/cf/X11.tmpl +++ b/nx-X11/config/cf/X11.tmpl @@ -289,13 +289,6 @@ XORGRELSTRING = XorgManVersionString #endif #ifndef BuildGlxExt #define BuildGlxExt NO -#else -#if BuildGlxExt && !defined(XFree86Version) && !defined(XorgVersion) -#undef BuildXF86DRI -#undef BuildXF86DRIDriverSupport -#define BuildXF86DRI NO -#define BuildXF86DRIDriverSupport NO -#endif #endif #ifndef BuildOSMesaLib #define BuildOSMesaLib BuildGlxExt diff --git a/nx-X11/config/cf/host.def b/nx-X11/config/cf/host.def index 02eabbb9f..6b9faf72c 100644 --- a/nx-X11/config/cf/host.def +++ b/nx-X11/config/cf/host.def @@ -165,11 +165,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ wacom void magictouch aiptek */ -/* To enable building of development DRI drivers (insecure, or not - * useful on the chosen architecture, uncomment this define. -#define BuildDevelDRIDrivers YES - */ - /* * To use the deprecated, old keyboard driver, uncomment this. But * even better, make the new keyboard driver (hw/xfree86/input/keyboard) diff --git a/nx-X11/config/cf/linux.cf b/nx-X11/config/cf/linux.cf index aa28c5c55..c8b3e12cd 100644 --- a/nx-X11/config/cf/linux.cf +++ b/nx-X11/config/cf/linux.cf @@ -107,12 +107,8 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) /* the relative symlink created by this rule causes problems for us */ # endif /* !defined(NothingOutsideProjectRoot) || !NothingOutsideProjectRoot */ # define SharedLibXdmGreet NO -# define LinkGLToUsrInclude NO -# define LinkGLToUsrLib NO # define FSUseSyslog YES -# define BuildLibGlxWithoutPIC NO - # define DriverManSuffix 4x # define DriverManDir $(MANSOURCEPATH)4 @@ -325,58 +321,6 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) # endif #endif -/* The DRM module requires kernel services that appeared in late 2.1.x - kernels and are known to be present in 2.2.x kernels. */ -#ifndef BuildXF86DRI -# if defined(AlphaArchitecture) -# define BuildXF86DRI YES -# elif defined(Arm32Architecture) -# define BuildXF86DRI NO -# elif defined(HPArchitecture) -# define BuildXF86DRI YES -# elif defined(i386Architecture) -# if (defined(__linux__) && (OSMajorVersion > 2 || (OSMajorVersion == 2 && \ - OSMinorVersion >= 2))) || \ - defined(__FreeBSD_kernel__) -# define BuildXF86DRI YES -# else -# define BuildXF86DRI NO -# endif -# elif defined(ia64Architecture) -# define BuildXF86DRI YES -# elif defined(Mc68020Architecture) -# define BuildXF86DRI NO -# elif defined(MipsArchitecture) -# define BuildXF86DRI NO -# elif defined(PpcArchitecture) -# define BuildXF86DRI YES -# elif defined(Ppc64Architecture) -# define BuildXF86DRI NO -# elif defined(s390Architecture) || defined(s390xArchitecture) -# define BuildXF86DRI NO -# elif defined(SparcArchitecture) -# define BuildXF86DRI YES -# elif defined(SuperHArchitecture) -# define BuildXF86DRI NO -# elif defined(AMD64Architecture) -# define BuildXF86DRI YES -# else -# define BuildXF86DRI NO -# endif -#endif - -/* - * Build shared libGL and the DRI modules without -fPIC on some architectures. - * This improves performance. - */ -#ifndef BuildLibGlxWithoutPIC -# if BuildXF86DRI -# if defined(i386Architecture) -# define BuildLibGlxWithoutPIC YES -# endif -# endif -#endif - #ifndef HasAgpGart # if defined(i386Architecture) || defined(ia64Architecture) || defined(AMD64Architecture) /* The AGPGART header file is included in os-support/linux, which @@ -1006,14 +950,6 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) # define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath) Concat(-l,libname) -Wl,-Bdynamic #endif -#ifndef LinkGLToUsrLib -# define LinkGLToUsrLib YES -#endif -# ifndef LinkGLToUsrInclude -# define LinkGLToUsrInclude YES -#endif - - #define HasGnuMake YES #define MakeNamedTargetSubdir(dir,flags,subname)\ diff --git a/nx-X11/config/cf/lnxLib.tmpl b/nx-X11/config/cf/lnxLib.tmpl index ee372709a..7096ee150 100644 --- a/nx-X11/config/cf/lnxLib.tmpl +++ b/nx-X11/config/cf/lnxLib.tmpl @@ -12,12 +12,7 @@ XCOMM $XFree86: xc/config/cf/lnxLib.tmpl,v 3.19 2003/10/15 22:47:48 herrb Exp $ #define SharedXrenderReqs $(LDPRELIB) $(XLIB) #define SharedXtstReqs $(LDPRELIB) $(XLIB) -#if GlxUseBuiltInDRIDriver -#define ExtraSharedGLReqs /**/ -#else -#define ExtraSharedGLReqs -ldl -#endif -#define SharedGLReqs $(LDPRELIB) $(XLIB) ExtraSharedGLReqs +#define SharedGLReqs $(LDPRELIB) $(XLIB) -ldl #define SharedXineramaReqs $(LDPRELIB) $(XLIB) #define SharedXxf86dgaReqs $(LDPRELIB) $(XLIB) diff --git a/nx-X11/config/cf/xfree86.cf b/nx-X11/config/cf/xfree86.cf index 11c6a95c9..367835170 100644 --- a/nx-X11/config/cf/xfree86.cf +++ b/nx-X11/config/cf/xfree86.cf @@ -346,24 +346,6 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ dummy XF86OSCardDrivers XF86ExtraCardDrivers # endif -/* - * DRI drivers under development, or drivers included on this platform - * only for build testing. - */ -# ifndef DevelDRIDrivers -# if XFree86Devel -# define DevelDRIDrivers ffb -# else -# define DevelDRIDrivers /**/ -# endif -# endif - -# ifndef DriDrivers -# define DriDrivers gamma i810 i830 mga r128 radeon r200 \ - sis tdfx DevelDRIDrivers -# endif -#endif - #if defined(AMD64Architecture) # ifndef XF86Server # define XF86Server YES @@ -446,13 +428,6 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ vga dummy fbdev vesa # endif -/* DRI tdfx driver needs Glide, which is not available for AMD64 */ -# define TdfxDriDriver /**/ - -# define DevelDRIDrivers /**/ - -# define DriDrivers gamma i810 mga r128 radeon r200 \ - TdfxDriDriver DevelDRIDrivers #endif /*AMD64Arcitecture*/ /* SPARC and UltraSPARC drivers */ @@ -555,10 +530,6 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ XF86OSCardDrivers XF86ExtraCardDrivers \ DevelDrivers # endif -# ifndef DriDrivers -# define DriDrivers ffb -# endif - #endif /* Sparc64 Drivers */ @@ -653,10 +624,6 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ DevelDrivers \ XF86OSCardDrivers XF86ExtraCardDrivers # endif -# define TdfxDriDriver /**/ -# ifndef DriDrivers -# define DriDrivers /**/ -# endif #endif /* MIPS drivers */ @@ -833,9 +800,6 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ savage nv cirrus DevelDrivers siliconmotion \ vga XF86OSCardDrivers XF86ExtraCardDrivers # endif -# ifndef DriDrivers -# define DriDrivers gamma tdfx mga r128 radeon r200 /*sis*/ -# endif #endif /* @@ -929,9 +893,6 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ DevelDrivers vga \ XF86OSCardDrivers XF86ExtraCardDrivers # endif -# ifndef DriDrivers -# define DriDrivers gamma tdfx mga r128 radeon r200 -# endif #endif /* @@ -1021,14 +982,6 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ DevelDrivers vga \ XF86OSCardDrivers XF86ExtraCardDrivers # endif -# if HasGlide3 -# define TdfxDriDriver tdfx -# else -# define TdfxDriDriver /**/ -# endif -# ifndef DriDrivers -# define DriDrivers gamma tdfx mga r128 radeon r200 -# endif #endif /* SuperH drivers */ @@ -1191,14 +1144,6 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ DevelDrivers \ XF86OSCardDrivers XF86ExtraCardDrivers # endif -# if HasGlide3 -# define TdfxDriDriver -# else -# define TdfxDriDriver /**/ -# endif -# ifndef DriDrivers -# define DriDrivers gamma r128 -# endif #endif /* @@ -1272,190 +1217,29 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 # define BuildGlxExt YES #endif -#ifndef BuildXF86DRI -#define BuildXF86DRI NO -#endif - -#ifndef GlxUseSGISI -#define GlxUseSGISI NO -#endif - -#if BuildXF86DRI - -/* - * One and ONLY one of the GlxBuiltIn* drivers can be defined to be YES. - * If more than one are defined, the compilation will fail with multiply - * defined references of GLX and OpenGL functions. - */ - -/* - * The first is a built-in driver that does software rendering client-side - * and renders to the X server via Xlib. - */ - -# ifndef GlxBuiltInXMesa -# define GlxBuiltInXMesa NO -# endif - -/* - * The rest are hardware-specific DRI drivers. - */ -# ifndef GlxBuiltInGamma -# define GlxBuiltInGamma NO -# endif -# ifndef GlxBuiltInTdfx -# define GlxBuiltInTdfx NO -# endif -# ifndef GlxBuiltInMga -# define GlxBuiltInMga NO -# endif -# ifndef GlxBuiltInI810 -# define GlxBuiltInI810 NO -# endif -# ifndef GlxBuiltInI830 -# define GlxBuiltInI830 NO -# endif -# ifndef GlxBuiltInR128 -# define GlxBuiltInR128 NO -# endif -# ifndef GlxBuiltInRadeon -# define GlxBuiltInRadeon NO -# endif -# ifndef GlxBuiltInR200 -# define GlxBuiltInR200 NO -# endif -# ifndef GlxBuiltInFfb -# define GlxBuiltInFfb NO -# endif -# ifndef GlxBuiltInSIS -# define GlxBuiltInSIS NO -# endif - -# if GlxBuiltInTdfx || \ - GlxBuiltInMga || \ - GlxBuiltInI810 || \ - GlxBuiltInI830 || \ - GlxBuiltInR128 || \ - GlxBuiltInRadeon || \ - GlxBuiltInR200 || \ - GlxBuiltInFfb || \ - GlxBuiltInSIS -# define GlxDriverUsesMesa YES -# else -# define GlxDriverUsesMesa NO -# endif - -# if GlxBuiltInGamma || \ - GlxBuiltInTdfx || \ - GlxBuiltInMga || \ - GlxBuiltInI810 || \ - GlxBuiltInI830 || \ - GlxBuiltInR128 || \ - GlxBuiltInRadeon || \ - GlxBuiltInR200 || \ - GlxBuiltInFfb || \ - GlxBuiltInSIS -# define GlxUseBuiltInDRIDriver YES -# define DRIDynLoadDefines /**/ -# else -# define GlxUseBuiltInDRIDriver NO -# define DRIDynLoadDefines -DGLX_USE_DLOPEN -# endif - -# if GlxUseBuiltInDRIDriver -# undef DriDrivers -# if GlxBuiltInGamma -# define DriDrivers gamma -# endif -# if GlxBuiltInTdfx -# define DriDrivers tdfx -# endif -# if GlxBuiltInMga -# define DriDrivers mga -# endif -# if GlxBuiltInI810 -# define DriDrivers i810 -# endif -# if GlxBuiltInI830 -# define DriDrivers i830 -# endif -# if GlxBuiltInR128 -# define DriDrivers r128 -# endif -# if GlxBuiltInRadeon -# define DriDrivers radeon -# endif -# if GlxBuiltInR200 -# define DriDrivers r200 -# endif -# if GlxBuiltInSIS -# define DriDrivers sis -# endif -# if GlxBuiltInFfb -# define DriDrivers ffb -# endif -# endif - -#endif - -/* - * This enables building DRI support into video drivers, which can be done - * even on platforms that don't have functional DRI support. - * - * Defining BuildXF86DRIDriverSupport to YES will not work until we have a - * separate set of defines set up for building driver-only support for the - * DRI. - */ -#ifndef BuildXF86DRIDriverSupport -# define BuildXF86DRIDriverSupport NO -#endif - #if BuildGlxExt -# if BuildXF86DRI -# define DRIDefines -DXF86DRI -DGLX_DIRECT_RENDERING DRIDynLoadDefines -# else -# define DRIDefines /**/ -# endif -# if defined(GlxUseSGISI) && GlxUseSGISI -# define GlxCoreLibDefines -DGLX_USE_SGI_SI -# else -# define GlxCoreLibDefines -DGLX_USE_MESA -# endif +# define GlxCoreLibDefines -DGLX_USE_MESA -# if defined(SparcArchitecture) \ +# if defined(SparcArchitecture) \ || defined (Sparc64Architecture) \ || defined(ia64Architecture) \ || defined(s390xArchitecture) \ || defined(AMD64Architecture) -# define GlxArchDefines -D__GLX_ALIGN64 -# elif defined(AlphaArchitecture) +# define GlxArchDefines -D__GLX_ALIGN64 +# elif defined(AlphaArchitecture) /* On the Alpha we need to ensure floating point accuracy for 3D */ -# define GlxArchDefines -D__GLX_ALIGN64 -mieee -# elif defined(DarwinArchitecture) +# define GlxArchDefines -D__GLX_ALIGN64 -mieee +# elif defined(DarwinArchitecture) /* GLX contains lots of uninitialized globals, which can upset Darwin */ -# define GlxArchDefines -fno-common -# else -# define GlxArchDefines /**/ -# endif - -# ifndef GlxExtraDefines -# define GlxExtraDefines DRIDefines GlxCoreLibDefines GlxArchDefines -# endif - -#else - -/* If we are not building GLX, then make sure the DRI is not built */ -# undef BuildXF86DRI -# define BuildXF86DRI NO -# undef BuildXF86DRIDriverSupport -# define BuildXF86DRIDriverSupport NO - -#endif +# define GlxArchDefines -fno-common +# else +# define GlxArchDefines /**/ +# endif -#if !BuildXF86DRI -# define GlxUseBuiltInDRIDriver NO /* For libOSmesa */ -#endif +# ifndef GlxExtraDefines +# define GlxExtraDefines GlxCoreLibDefines GlxArchDefines +# endif # ifndef UseX86Emu # define UseX86Emu YES diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf index 8210cb049..c92162ef0 100644 --- a/nx-X11/config/cf/xorg.cf +++ b/nx-X11/config/cf/xorg.cf @@ -270,13 +270,6 @@ NX_VERSION_CURRENT_STRING = nxVersionString #define HasAgpGart NO #endif -/* Some DRI drivers are disabled because they are either insecure or unusable on - * this architecture. This switch allows you to enable building these drivers. - */ -#ifndef BuildDevelDRIDrivers -#define BuildDevelDRIDrivers NO -#endif - /* The glide driver only works for the loadable server at the moment */ #ifndef HasGlide2 #define HasGlide2 NO @@ -399,20 +392,6 @@ NX_VERSION_CURRENT_STRING = nxVersionString vesa vga \ dummy XF86OSCardDrivers XF86ExtraCardDrivers # endif - -# ifndef DevelDRIDrivers -# define DevelDRIDrivers ffb mach64 unichrome -# endif - -# ifndef DriDrivers -# ifndef ia64Architecture -# define i386DRIDrivers i810 i915 sis -# else - /* SiS is 64-bit unclean as of this writing. */ -# define i386DRIDrivers /**/ -# endif -# define DriDrivers i386DRIDrivers mga r128 radeon r200 tdfx -# endif #endif /* i386Architecture || ia64Architecture */ #if defined(AMD64Architecture) @@ -445,11 +424,6 @@ NX_VERSION_CURRENT_STRING = nxVersionString vga dummy vesa i810 vmware \ XF86OSCardDrivers XF86ExtraCardDrivers DevelDrivers # endif - -/* SiS is 64-bit unclean as of this writing. */ -# ifndef DriDrivers -# define DriDrivers i915 mga r128 radeon r200 tdfx -# endif #endif /*AMD64Arcitecture*/ /* SPARC and UltraSPARC drivers */ @@ -500,10 +474,6 @@ NX_VERSION_CURRENT_STRING = nxVersionString DevelDrivers # endif # endif -# ifndef DriDrivers -# define DriDrivers ffb -# endif - #endif /* Sparc64 Drivers */ @@ -584,13 +554,6 @@ NX_VERSION_CURRENT_STRING = nxVersionString vga dummy XF86OSCardDrivers \ XF86ExtraCardDrivers # endif -/* - * Glide is available for Alpha, therefore build tdfx DRM module. - * SiS is 64-bit unclean as of this writing. - */ -# ifndef DriDrivers -# define DriDrivers tdfx mga r128 radeon r200 -# endif #endif /* AlphaArchitecture */ /* @@ -621,10 +584,6 @@ NX_VERSION_CURRENT_STRING = nxVersionString DevelDrivers vga dummy \ XF86OSCardDrivers XF86ExtraCardDrivers # endif -/* The tdfx driver needs Glide, which is not available for PPC. */ -# ifndef DriDrivers -# define DriDrivers mga r128 radeon r200 -# endif #endif /* PpcArchitecture || Mc68020Architecture */ /* @@ -651,9 +610,6 @@ NX_VERSION_CURRENT_STRING = nxVersionString DevelDrivers vga dummy \ XF86OSCardDrivers XF86ExtraCardDrivers # endif -# ifndef DriDrivers -# define DriDrivers mga r128 radeon r200 -# endif #endif /* SuperH drivers */ @@ -751,10 +707,6 @@ NX_VERSION_CURRENT_STRING = nxVersionString DevelDrivers \ XF86OSCardDrivers XF86ExtraCardDrivers # endif -# define TdfxDriDriver /**/ -# ifndef DriDrivers -# define DriDrivers r128 -# endif #endif /* Ppc64Architecture */ /* @@ -828,197 +780,30 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8 # define BuildGlxExt YES #endif -#ifndef BuildXF86DRI -#define BuildXF86DRI NO -#endif - -#ifndef GlxUseSGISI -#define GlxUseSGISI NO -#endif - -#if BuildXF86DRI - -#ifndef DriDrivers -#define DriDrivers /**/ -#endif - -#ifndef DevelDRIDrivers -#define DevelDRIDrivers /**/ -#endif - -/* - * One and ONLY one of the GlxBuiltIn* drivers can be defined to be YES. - * If more than one are defined, the compilation will fail with multiply - * defined references of GLX and OpenGL functions. - */ - -/* - * The first is a built-in driver that does software rendering client-side - * and renders to the X server via Xlib. - */ - -# ifndef GlxBuiltInXMesa -# define GlxBuiltInXMesa NO -# endif - -/* - * The rest are hardware-specific DRI drivers. - */ -# ifndef GlxBuiltInGamma -# define GlxBuiltInGamma NO -# endif -# ifndef GlxBuiltInTdfx -# define GlxBuiltInTdfx NO -# endif -# ifndef GlxBuiltInMga -# define GlxBuiltInMga NO -# endif -# ifndef GlxBuiltInI810 -# define GlxBuiltInI810 NO -# endif -# ifndef GlxBuiltInI915 -# define GlxBuiltInI915 NO -# endif -# ifndef GlxBuiltInR128 -# define GlxBuiltInR128 NO -# endif -# ifndef GlxBuiltInRadeon -# define GlxBuiltInRadeon NO -# endif -# ifndef GlxBuiltInR200 -# define GlxBuiltInR200 NO -# endif -# ifndef GlxBuiltInFfb -# define GlxBuiltInFfb NO -# endif -# ifndef GlxBuiltInSIS -# define GlxBuiltInSIS NO -# endif - -# if GlxBuiltInTdfx || \ - GlxBuiltInMga || \ - GlxBuiltInI810 || \ - GlxBuiltInI915 || \ - GlxBuiltInR128 || \ - GlxBuiltInRadeon || \ - GlxBuiltInR200 || \ - GlxBuiltInFfb || \ - GlxBuiltInSIS -# define GlxDriverUsesMesa YES -# else -# define GlxDriverUsesMesa NO -# endif - -# if GlxBuiltInGamma || \ - GlxBuiltInTdfx || \ - GlxBuiltInMga || \ - GlxBuiltInI810 || \ - GlxBuiltInI915 || \ - GlxBuiltInR128 || \ - GlxBuiltInRadeon || \ - GlxBuiltInR200 || \ - GlxBuiltInFfb || \ - GlxBuiltInSIS -# define GlxUseBuiltInDRIDriver YES -# define DRIDynLoadDefines /**/ -# else -# define GlxUseBuiltInDRIDriver NO -# define DRIDynLoadDefines -DGLX_USE_DLOPEN -# endif - -# if GlxUseBuiltInDRIDriver -# undef DriDrivers -# if GlxBuiltInGamma -# define DriDrivers gamma -# endif -# if GlxBuiltInTdfx -# define DriDrivers tdfx -# endif -# if GlxBuiltInMga -# define DriDrivers mga -# endif -# if GlxBuiltInI810 -# define DriDrivers i810 -# endif -# if GlxBuiltInI915 -# define DriDrivers i915 -# endif -# if GlxBuiltInR128 -# define DriDrivers r128 -# endif -# if GlxBuiltInRadeon -# define DriDrivers radeon -# endif -# if GlxBuiltInR200 -# define DriDrivers r200 -# endif -# if GlxBuiltInSIS -# define DriDrivers sis -# endif -# if GlxBuiltInFfb -# define DriDrivers ffb -# endif -# endif - -#endif - -/* - * This enables building DRI support into video drivers, which can be done - * even on platforms that don't have functional DRI support. - * - * Defining BuildXF86DRIDriverSupport to YES will not work until we have a - * separate set of defines set up for building driver-only support for the - * DRI. - */ -#ifndef BuildXF86DRIDriverSupport -# define BuildXF86DRIDriverSupport NO -#endif - #if BuildGlxExt -# if BuildXF86DRI -# define DRIDefines -DXF86DRI -DGLX_DIRECT_RENDERING DRIDynLoadDefines -# else -# define DRIDefines /**/ -# endif -# if defined(GlxUseSGISI) && GlxUseSGISI -# define GlxCoreLibDefines -DGLX_USE_SGI_SI -# else -# define GlxCoreLibDefines -DGLX_USE_MESA -# endif +# define GlxCoreLibDefines -DGLX_USE_MESA -# if defined(SparcArchitecture) \ +# if defined(SparcArchitecture) \ || defined (Sparc64Architecture) \ || defined(ia64Architecture) \ || defined(s390xArchitecture) \ || defined(AMD64Architecture) -# define GlxArchDefines -D__GLX_ALIGN64 -# elif defined(AlphaArchitecture) +# define GlxArchDefines -D__GLX_ALIGN64 +# elif defined(AlphaArchitecture) /* On the Alpha we need to ensure floating point accuracy for 3D */ -# define GlxArchDefines -D__GLX_ALIGN64 -mieee -# elif defined(DarwinArchitecture) +# define GlxArchDefines -D__GLX_ALIGN64 -mieee +# elif defined(DarwinArchitecture) /* GLX contains lots of uninitialized globals, which can upset Darwin */ -# define GlxArchDefines -fno-common -# else -# define GlxArchDefines /**/ -# endif - -# ifndef GlxExtraDefines -# define GlxExtraDefines DRIDefines GlxCoreLibDefines GlxArchDefines -# endif - -#else - -/* If we are not building GLX, then make sure the DRI is not built */ -# undef BuildXF86DRI -# define BuildXF86DRI NO -# undef BuildXF86DRIDriverSupport -# define BuildXF86DRIDriverSupport NO +# define GlxArchDefines -fno-common +# else +# define GlxArchDefines /**/ +# endif -#endif +# ifndef GlxExtraDefines +# define GlxExtraDefines GlxCoreLibDefines GlxArchDefines +# endif -#if !BuildXF86DRI -# define GlxUseBuiltInDRIDriver NO /* For libOSmesa */ #endif # ifndef UseX86Emu @@ -1561,6 +1346,7 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese # define LargePositionIndependentCFlags -fPIC #endif + #ifndef XF8_32Wid # define XF8_32Wid NO #endif diff --git a/nx-X11/config/cf/xorgsite.def b/nx-X11/config/cf/xorgsite.def index a4d22b4b8..c05e53e17 100644 --- a/nx-X11/config/cf/xorgsite.def +++ b/nx-X11/config/cf/xorgsite.def @@ -84,11 +84,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ wacom void magictouch aiptek */ -/* To enable building of development DRI drivers (insecure, or not - * useful on the chosen architecture, uncomment this define. -#define BuildDevelDRIDrivers YES - */ - /* * To use the deprecated, old keyboard driver, uncomment this. But * even better, make the new keyboard driver (hw/xfree86/input/keyboard) diff --git a/nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile b/nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile index 8e3b77eda..e3e91cdb5 100644 --- a/nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile @@ -46,7 +46,7 @@ XCOMM $XFree86: xc/programs/Xserver/GL/mesa/GLcore/Imakefile,v 1.3 2002/05/31 18 ../shader/slang/DONE INCLUDES = -I$(INCLUDESRC) -I$(XINCLUDESRC) -I$(EXTINCSRC) \ - -I$(MESASRCDIR)/include -I$(GLXLIBSRC)/include \ + -I$(MESASRCDIR)/include \ -I$(MESASRCDIR)/src/mesa \ -I$(SERVERSRC)/include diff --git a/nx-X11/programs/Xserver/GL/mesa/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/Imakefile.inc index 03a7971f8..99e9c71c2 100644 --- a/nx-X11/programs/Xserver/GL/mesa/Imakefile.inc +++ b/nx-X11/programs/Xserver/GL/mesa/Imakefile.inc @@ -1,9 +1,5 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/Imakefile.inc,v 1.7tsi Exp $ -#ifndef MesaBuildDir -#define MesaBuildDir $(GLXLIBSRC)/mesa/ -#endif - MESABUILDDIR = MesaBuildDir COREMESASRCS = $(COREMESABASESRCS) \ diff --git a/nx-X11/programs/Xserver/GL/mesa/X/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/X/Imakefile.inc index d62800e7d..8e589c69a 100644 --- a/nx-X11/programs/Xserver/GL/mesa/X/Imakefile.inc +++ b/nx-X11/programs/Xserver/GL/mesa/X/Imakefile.inc @@ -1,9 +1,5 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/X/Imakefile.inc,v 1.3tsi Exp $ -#ifndef MesaXBuildDir -#define MesaXBuildDir $(GLXLIBSRC)/src/mesa/drivers/x11/ -#endif - MESAXBUILDDIR = MesaXBuildDir #ifndef MesaInXServer diff --git a/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile.inc index 9a5044791..3964bdc48 100644 --- a/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile.inc +++ b/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile.inc @@ -1,9 +1,5 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/array_cache/Imakefile.inc,v 1.1tsi Exp $ -#ifndef MesaACBuildDir -#define MesaACBuildDir $(GLXLIBSRC)/mesa/array_cache/ -#endif - MESAACBUILDDIR = MesaACBuildDir MESA_AC_SRCS = $(MESAACBUILDDIR)ac_context.c \ diff --git a/nx-X11/programs/Xserver/GL/mesa/main/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/main/Imakefile.inc index 80b3aef07..8927152aa 100644 --- a/nx-X11/programs/Xserver/GL/mesa/main/Imakefile.inc +++ b/nx-X11/programs/Xserver/GL/mesa/main/Imakefile.inc @@ -3,10 +3,6 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/Imakefile.inc,v 1.7tsi Exp $ /* gcc on ppc64 defines this, causes macro recursion with pixel below */ #undef pixel -#ifndef MesaBuildDir -#define MesaBuildDir $(GLXLIBSRC)/mesa/main/ -#endif - MESABUILDDIR = MesaBuildDir #ifdef NeedAllMesaSrc diff --git a/nx-X11/programs/Xserver/GL/mesa/math/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/math/Imakefile.inc index cd1dcc427..7356a4617 100644 --- a/nx-X11/programs/Xserver/GL/mesa/math/Imakefile.inc +++ b/nx-X11/programs/Xserver/GL/mesa/math/Imakefile.inc @@ -1,9 +1,5 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/math/Imakefile.inc,v 1.1tsi Exp $ -#ifndef MesaMathBuildDir -#define MesaMathBuildDir $(GLXLIBSRC)/mesa/math/ -#endif - MESAMATHBUILDDIR = MesaMathBuildDir MESA_MATH_SRCS = $(MESAMATHBUILDDIR)m_debug_clip.c \ diff --git a/nx-X11/programs/Xserver/GL/mesa/shader/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/shader/Imakefile.inc index 7d0032e56..383bdc008 100644 --- a/nx-X11/programs/Xserver/GL/mesa/shader/Imakefile.inc +++ b/nx-X11/programs/Xserver/GL/mesa/shader/Imakefile.inc @@ -1,9 +1,5 @@ XCOMM $XFree86:$ -#ifndef MesaShaderBuildDir -#define MesaShaderBuildDir $(GLXLIBSRC)/mesa/shader/ -#endif - MESASHADERBUILDDIR = MesaShaderBuildDir MESA_SHADER_SRCS = $(MESASHADERBUILDDIR)arbprogparse.c \ diff --git a/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile.inc index b2e885f89..e1196201d 100644 --- a/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile.inc +++ b/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile.inc @@ -1,9 +1,5 @@ XCOMM $XFree86$ -#ifndef MesaGrammarBuildDir -#define MesaGrammarBuildDir $(GLXLIBSRC)/mesa/shader/grammar/ -#endif - MESAGRAMMARBUILDDIR=MesaGrammarBuildDir MESA_GRAMMAR_SRCS = $(MESAGRAMMARBUILDDIR)grammar_mesa.c diff --git a/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile.inc index d824ca797..4358b8975 100644 --- a/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile.inc +++ b/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile.inc @@ -1,9 +1,5 @@ XCOMM $XFree86$ -#ifndef MesaSlangBuildDir -#define MesaSlangBuildDir $(GLXLIBSRC)/mesa/shader/slang/ -#endif - MESASLANGBUILDDIR=MesaSlangBuildDir MESA_SLANG_SRCS = $(MESASLANGBUILDDIR)slang_assemble_assignment.c \ diff --git a/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile.inc index 683b8f0a7..c57416d85 100644 --- a/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile.inc +++ b/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile.inc @@ -1,9 +1,5 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/swrast/Imakefile.inc,v 1.1tsi Exp $ -#ifndef MesaSwrastBuildDir -#define MesaSwrastBuildDir $(GLXLIBSRC)/mesa/swrast/ -#endif - MESASWRASTBUILDDIR = MesaSwrastBuildDir MESA_SWRAST_SRCS = $(MESASWRASTBUILDDIR)s_aaline.c \ diff --git a/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile.inc index 8d32aedb3..4fb10763a 100644 --- a/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile.inc +++ b/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile.inc @@ -1,9 +1,5 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/swrast_setup/Imakefile.inc,v 1.1tsi Exp $ -#ifndef MesaSwrastSetupBuildDir -#define MesaSwrastSetupBuildDir $(GLXLIBSRC)/mesa/swrast_setup/ -#endif - MESASWRSETUPDIR = MesaSwrastSetupBuildDir MESA_SWR_SETUP_SRCS = $(MESASWRSETUPDIR)ss_context.c \ diff --git a/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile.inc index a294a6fbf..3a124c195 100644 --- a/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile.inc +++ b/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile.inc @@ -1,9 +1,5 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/tnl/Imakefile.inc,v 1.1tsi Exp $ -#ifndef MesaTnlBuildDir -#define MesaTnlBuildDir $(GLXLIBSRC)/mesa/tnl/ -#endif - MESATNLBUILDDIR = MesaTnlBuildDir MESA_TNL_SRCS = $(MESATNLBUILDDIR)t_array_api.c \ -- cgit v1.2.3 From fcf61d3411bc1868e53305a3777f4bcaab3eb4bd Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sat, 29 Oct 2016 15:30:20 +0200 Subject: Imakefile cleanup: Delete all ancient Vcs comments stemming from SVN times of X.org and XFree86. Fixes ArcticaProject/nx-libs#250. --- nx-X11/config/Imakefile | 2 -- nx-X11/config/cf/Imake.cf | 3 --- nx-X11/config/cf/Imake.rules | 8 +------- nx-X11/config/cf/Imake.tmpl | 7 ------- nx-X11/config/cf/Imakefile | 3 --- nx-X11/config/cf/Library.tmpl | 7 ------- nx-X11/config/cf/README | 7 ------- nx-X11/config/cf/Server.tmpl | 3 --- nx-X11/config/cf/ServerLib.tmpl | 1 - nx-X11/config/cf/Threads.tmpl | 6 ------ nx-X11/config/cf/X11.rules | 5 ----- nx-X11/config/cf/X11.tmpl | 8 +------- nx-X11/config/cf/cross.rules | 2 -- nx-X11/config/cf/linux.cf | 9 --------- nx-X11/config/cf/lnxLib.rules | 3 --- nx-X11/config/cf/lnxLib.tmpl | 3 --- nx-X11/config/cf/site.def | 3 --- nx-X11/config/cf/xf86.rules | 7 ------- nx-X11/config/cf/xorg.cf | 2 -- nx-X11/config/cf/xorg.tmpl | 3 --- nx-X11/config/cf/xorgsite.def | 1 - nx-X11/include/GL/Imakefile | 2 -- nx-X11/include/Imakefile | 3 --- nx-X11/include/extensions/Imakefile | 8 -------- nx-X11/lib/Imakefile | 8 -------- nx-X11/lib/X11/xlibi18n/im/Imakefile | 1 - nx-X11/lib/X11/xlibi18n/im/ximcp/Imakefile | 1 - nx-X11/lib/X11/xlibi18n/lc/Imakefile | 1 - nx-X11/lib/X11/xlibi18n/lc/Utf8/Imakefile | 1 - nx-X11/lib/X11/xlibi18n/lc/def/Imakefile | 1 - nx-X11/lib/X11/xlibi18n/lc/gen/Imakefile | 1 - nx-X11/lib/X11/xlibi18n/om/Imakefile | 1 - nx-X11/lib/xtrans/Imakefile | 2 -- nx-X11/programs/Xserver/GL/Imakefile | 2 -- nx-X11/programs/Xserver/GL/glx/Imakefile | 2 -- nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile | 2 -- nx-X11/programs/Xserver/GL/mesa/Imakefile | 2 -- nx-X11/programs/Xserver/GL/mesa/Imakefile.inc | 2 -- nx-X11/programs/Xserver/GL/mesa/X/Imakefile | 2 -- nx-X11/programs/Xserver/GL/mesa/X/Imakefile.inc | 2 -- nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile | 2 -- nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile.inc | 2 -- nx-X11/programs/Xserver/GL/mesa/main/Imakefile | 3 --- nx-X11/programs/Xserver/GL/mesa/main/Imakefile.inc | 2 -- nx-X11/programs/Xserver/GL/mesa/math/Imakefile | 2 -- nx-X11/programs/Xserver/GL/mesa/math/Imakefile.inc | 2 -- nx-X11/programs/Xserver/GL/mesa/shader/Imakefile.inc | 2 -- nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile.inc | 2 -- nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile.inc | 2 -- .../programs/Xserver/GL/mesa/shader/slang/library/Imakefile.inc | 2 -- nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile | 2 -- nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile.inc | 2 -- nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile | 2 -- nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile.inc | 2 -- nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile | 3 --- nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile.inc | 2 -- nx-X11/programs/Xserver/Imakefile | 1 - nx-X11/programs/Xserver/Xext/extmod/Imakefile | 3 --- nx-X11/programs/Xserver/Xi/Imakefile | 7 ------- nx-X11/programs/Xserver/dbe/Imakefile | 7 ------- nx-X11/programs/Xserver/dbe/module/Imakefile | 4 ---- nx-X11/programs/Xserver/dix/Imakefile | 3 --- nx-X11/programs/Xserver/fb/Imakefile | 5 ----- nx-X11/programs/Xserver/fb/module/Imakefile | 2 -- nx-X11/programs/Xserver/hw/nxagent/Imakefile | 2 -- nx-X11/programs/Xserver/include/Imakefile | 7 ------- nx-X11/programs/Xserver/record/Imakefile | 3 --- nx-X11/programs/Xserver/record/module/Imakefile | 5 ----- nx-X11/programs/Xserver/render/Imakefile | 2 -- nx-X11/programs/Xserver/xkb/Imakefile | 7 ------- 70 files changed, 2 insertions(+), 227 deletions(-) (limited to 'nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile.inc') diff --git a/nx-X11/config/Imakefile b/nx-X11/config/Imakefile index 305b87107..1cf85aac8 100644 --- a/nx-X11/config/Imakefile +++ b/nx-X11/config/Imakefile @@ -1,5 +1,3 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:41:45 cpqbld Exp $ -XCOMM $XFree86: xc/config/Imakefile,v 1.3 2001/01/17 16:22:29 dawes Exp $ #define IHaveSubdirs #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)" diff --git a/nx-X11/config/cf/Imake.cf b/nx-X11/config/cf/Imake.cf index 76e4664aa..8decfdc3c 100644 --- a/nx-X11/config/cf/Imake.cf +++ b/nx-X11/config/cf/Imake.cf @@ -1,5 +1,3 @@ -XCOMM $XdotOrg: xc/config/cf/Imake.cf,v 1.12 2005/11/08 06:33:24 jkj Exp $ -XCOMM $Xorg: Imake.cf,v 1.4 2000/08/17 19:41:45 cpqbld Exp $ /* * To add support for another platform: * @@ -18,7 +16,6 @@ XCOMM $Xorg: Imake.cf,v 1.4 2000/08/17 19:41:45 cpqbld Exp $ * * 4. Create a .cf file with the name given by MacroFile. */ -XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.88 2003/12/16 21:30:21 herrb Exp $ #if defined(__APPLE__) # undef __APPLE__ diff --git a/nx-X11/config/cf/Imake.rules b/nx-X11/config/cf/Imake.rules index 7fffe5e31..fb6df65ce 100644 --- a/nx-X11/config/cf/Imake.rules +++ b/nx-X11/config/cf/Imake.rules @@ -1,12 +1,6 @@ XCOMM --------------------------------------------------------------------- XCOMM Imake rules for building libraries, programs, scripts, and data files -XCOMM rules: $Xorg: Imake.rules,v 1.3 2000/08/17 19:41:46 cpqbld Exp $ -XCOMM rules: $XdotOrg: xc/config/cf/Imake.rules,v 1.11 2005/11/08 06:33:24 jkj Exp $ -XCOMM -XCOMM -XCOMM -XCOMM -XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.128 2003/11/15 03:25:17 dawes Exp $ +XCOMM --------------------------------------------------------------------- /* * MACHINE-INDEPENDENT RULES; DO NOT MODIFY diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl index 7ddd6d936..0545f1094 100644 --- a/nx-X11/config/cf/Imake.tmpl +++ b/nx-X11/config/cf/Imake.tmpl @@ -1,12 +1,5 @@ XCOMM ---------------------------------------------------------------------- XCOMM Makefile generated from IMAKE_TEMPLATE and INCLUDE_IMAKEFILE -XCOMM $Xorg: Imake.tmpl,v 1.4 2000/08/17 19:41:46 cpqbld Exp $ -XCOMM $XdotOrg: xc/config/cf/Imake.tmpl,v 1.16 2005/11/08 06:33:24 jkj Exp $ -XCOMM -XCOMM -XCOMM -XCOMM -XCOMM $XFree86: xc/config/cf/Imake.tmpl,v 3.155 2003/12/24 18:58:41 dickey Exp $ XCOMM ---------------------------------------------------------------------- /* diff --git a/nx-X11/config/cf/Imakefile b/nx-X11/config/cf/Imakefile index a36adf323..714a865c9 100644 --- a/nx-X11/config/cf/Imakefile +++ b/nx-X11/config/cf/Imakefile @@ -1,6 +1,3 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:41:46 cpqbld Exp $ -XCOMM $XFree86: xc/config/cf/Imakefile,v 3.29 2002/10/16 14:07:49 tsi Exp $ - XCOMM Some compilers generate fatal errors if an -L directory does XCOMM not exist. Since BUILDLIBDIR may not exist yet suppress its use. LDPRELIB = diff --git a/nx-X11/config/cf/Library.tmpl b/nx-X11/config/cf/Library.tmpl index 95a9207fb..a5c9dc2a3 100644 --- a/nx-X11/config/cf/Library.tmpl +++ b/nx-X11/config/cf/Library.tmpl @@ -14,13 +14,6 @@ * Define LargePICTable YES if large (32-bit) PIC tables are needed. */ -XCOMM $Xorg: Library.tmpl,v 1.3 2000/08/17 19:41:46 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/config/cf/Library.tmpl,v 3.23tsi Exp $ - #ifndef DoNormalLib #define DoNormalLib NO #endif diff --git a/nx-X11/config/cf/README b/nx-X11/config/cf/README index 75fa4767c..27c2386a4 100644 --- a/nx-X11/config/cf/README +++ b/nx-X11/config/cf/README @@ -1,10 +1,3 @@ -$Xorg: README,v 1.4 2000/08/18 04:03:58 coskrey Exp $ - - - - -$XFree86: xc/config/cf/README,v 1.20 2003/04/14 20:35:50 herrb Exp $ - The easiest way to write an Imakefile is to find another one that does something similar and copy/modify it! diff --git a/nx-X11/config/cf/Server.tmpl b/nx-X11/config/cf/Server.tmpl index 3ada3087b..ffdca6811 100644 --- a/nx-X11/config/cf/Server.tmpl +++ b/nx-X11/config/cf/Server.tmpl @@ -1,11 +1,8 @@ -XCOMM $XFree86: xc/config/cf/Server.tmpl,v 3.20 2002/11/20 04:32:55 dawes Exp $ /* * Server imakefile info - this contains any special redefinitions, etc. * that Imakefiles in the server subtree will need. */ -XCOMM $Xorg: Server.tmpl,v 1.3 2000/08/17 19:41:46 cpqbld Exp $ - #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)" LDSTRIPFLAGS="$(LDSTRIPFLAGS)" #ifndef ServerCcCmd diff --git a/nx-X11/config/cf/ServerLib.tmpl b/nx-X11/config/cf/ServerLib.tmpl index 18a76746d..66c83b83d 100644 --- a/nx-X11/config/cf/ServerLib.tmpl +++ b/nx-X11/config/cf/ServerLib.tmpl @@ -1,4 +1,3 @@ -XCOMM $XFree86: xc/config/cf/ServerLib.tmpl,v 3.0tsi Exp $ /* * Server Library imakefile info - this contains any special * redefinitions, etc. that Imakefiles in the various server library diff --git a/nx-X11/config/cf/Threads.tmpl b/nx-X11/config/cf/Threads.tmpl index bb0a7e805..d2d6f6d1c 100644 --- a/nx-X11/config/cf/Threads.tmpl +++ b/nx-X11/config/cf/Threads.tmpl @@ -1,9 +1,3 @@ -XCOMM $Xorg: Threads.tmpl,v 1.3 2000/08/17 19:41:46 cpqbld Exp $ - - - -XCOMM $XFree86: xc/config/cf/Threads.tmpl,v 3.3tsi Exp $ - /* * For a multi-threaded application or library, * Define LocalThreadsDefines in your Imakefile (unless you like the diff --git a/nx-X11/config/cf/X11.rules b/nx-X11/config/cf/X11.rules index 51ae38c7d..0f6a67ed4 100644 --- a/nx-X11/config/cf/X11.rules +++ b/nx-X11/config/cf/X11.rules @@ -1,8 +1,3 @@ -XCOMM $Xorg: X11.rules,v 1.4 2000/08/17 19:41:46 cpqbld Exp $ - - -XCOMM $XFree86: xc/config/cf/X11.rules,v 1.6 2001/01/17 16:22:31 dawes Exp $ - /* Note whether we are the top level project. */ #ifndef SeenTopLevelProject # define SeenTopLevelProject YES diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl index 45a383935..33d108d06 100644 --- a/nx-X11/config/cf/X11.tmpl +++ b/nx-X11/config/cf/X11.tmpl @@ -1,12 +1,6 @@ XCOMM ---------------------------------------------------------------------- XCOMM X Window System Build Parameters and Rules -XCOMM $XdotOrg: xc/config/cf/X11.tmpl,v 1.54 2005/12/14 23:41:52 alanc Exp $ -XCOMM $Xorg: X11.tmpl,v 1.6 2000/08/17 19:41:46 cpqbld Exp $ -XCOMM -XCOMM -XCOMM -XCOMM -XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.248 2004/02/16 04:07:37 dawes Exp $ +XCOMM ---------------------------------------------------------------------- /*************************************************************************** * * diff --git a/nx-X11/config/cf/cross.rules b/nx-X11/config/cf/cross.rules index da02643af..fe8d119ab 100644 --- a/nx-X11/config/cf/cross.rules +++ b/nx-X11/config/cf/cross.rules @@ -1,5 +1,3 @@ -XCOMM $XFree86: xc/config/cf/cross.rules,v 1.7 2002/04/04 14:05:33 eich Exp $ - #ifndef HostCcCmd #define HostCcCmd cc #endif diff --git a/nx-X11/config/cf/linux.cf b/nx-X11/config/cf/linux.cf index 37be61534..085984165 100644 --- a/nx-X11/config/cf/linux.cf +++ b/nx-X11/config/cf/linux.cf @@ -1,12 +1,3 @@ -XCOMM $XdotOrg: xc/config/cf/linux.cf,v 1.31 2005/10/21 19:10:27 ajax Exp $ -XCOMM platform: $Xorg: linux.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ - - - - - -XCOMM platform: $XFree86: xc/config/cf/linux.cf,v 3.220 2003/12/30 22:38:33 tsi Exp $ - #ifndef LinuxElfDefault # define LinuxElfDefault YES #endif diff --git a/nx-X11/config/cf/lnxLib.rules b/nx-X11/config/cf/lnxLib.rules index b8a67e2b7..166e896f1 100644 --- a/nx-X11/config/cf/lnxLib.rules +++ b/nx-X11/config/cf/lnxLib.rules @@ -1,6 +1,3 @@ -XCOMM $Xorg: lnxLib.rules,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ -XCOMM $XFree86: xc/config/cf/lnxLib.rules,v 3.52 2003/10/31 20:49:03 herrb Exp $ - /* * Linux shared library rules (DLL & ELF versions) */ diff --git a/nx-X11/config/cf/lnxLib.tmpl b/nx-X11/config/cf/lnxLib.tmpl index a6e7f48d3..6748579cf 100644 --- a/nx-X11/config/cf/lnxLib.tmpl +++ b/nx-X11/config/cf/lnxLib.tmpl @@ -1,6 +1,3 @@ -XCOMM $Xorg: lnxLib.tmpl,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ -XCOMM $XFree86: xc/config/cf/lnxLib.tmpl,v 3.19 2003/10/15 22:47:48 herrb Exp $ - /* * Linux shared library template */ diff --git a/nx-X11/config/cf/site.def b/nx-X11/config/cf/site.def index 7f2053cb2..f5e769278 100644 --- a/nx-X11/config/cf/site.def +++ b/nx-X11/config/cf/site.def @@ -1,5 +1,3 @@ -XCOMM site: $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $ - /*************************************************************************** * * * SITE-SPECIFIC DEFINITIONS * @@ -21,7 +19,6 @@ XCOMM site: $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $ * .cf file, not overridden in site.def. * * * ***************************************************************************/ -XCOMM site: $XFree86: xc/config/cf/site.def,v 3.24 2000/06/25 20:17:29 dawes Exp $ /* if you want host-specific customization, this is one way to do it */ /* diff --git a/nx-X11/config/cf/xf86.rules b/nx-X11/config/cf/xf86.rules index 3c69445f4..12125fb9b 100644 --- a/nx-X11/config/cf/xf86.rules +++ b/nx-X11/config/cf/xf86.rules @@ -1,10 +1,3 @@ -XCOMM $Xorg: xf86.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/config/cf/xf86.rules,v 3.34tsi Exp $ - /* * Rules needed to build the XFree86 X Servers */ diff --git a/nx-X11/config/cf/xorg.cf b/nx-X11/config/cf/xorg.cf index 5ed60e491..f967796f0 100644 --- a/nx-X11/config/cf/xorg.cf +++ b/nx-X11/config/cf/xorg.cf @@ -1,4 +1,3 @@ -XCOMM $XdotOrg: xc/config/cf/xorg.cf,v 1.53 2005/10/03 16:08:44 alanc Exp $ /* * This configuration file contains all of the configuration * information for the Xorg based X Servers. @@ -6,7 +5,6 @@ XCOMM $XdotOrg: xc/config/cf/xorg.cf,v 1.53 2005/10/03 16:08:44 alanc Exp $ * Most of these settings can be overridden in a vendor.cf or the * BeforeVendor part of the site.def file. */ -XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ /* Get and set version information. */ diff --git a/nx-X11/config/cf/xorg.tmpl b/nx-X11/config/cf/xorg.tmpl index a1703b56b..c5f332b3a 100644 --- a/nx-X11/config/cf/xorg.tmpl +++ b/nx-X11/config/cf/xorg.tmpl @@ -1,6 +1,3 @@ -XCOMM $Xorg: xf86.tmpl,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ -XCOMM $XdotOrg: xc/config/cf/xorg.tmpl,v 1.5 2005/11/08 06:33:24 jkj Exp $ - #ifndef ConfigDefines # define ConfigDefines -D__XCONFIGFILE__='"$(XCONFIGFILE)"' \ -D__XCONFIGDIR__='"$(XCONFIGDIR)"' -D__XLOGFILE__='"$(XLOGFILE)"' \ diff --git a/nx-X11/config/cf/xorgsite.def b/nx-X11/config/cf/xorgsite.def index 18fd96dbe..f28bb2b2e 100644 --- a/nx-X11/config/cf/xorgsite.def +++ b/nx-X11/config/cf/xorgsite.def @@ -1,4 +1,3 @@ -XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ /******************************************************************************/ /* * This file is to provide a quick method for most people to change the diff --git a/nx-X11/include/GL/Imakefile b/nx-X11/include/GL/Imakefile index 4905f7ee6..8719813e2 100644 --- a/nx-X11/include/GL/Imakefile +++ b/nx-X11/include/GL/Imakefile @@ -1,5 +1,3 @@ -XCOMM $XFree86: xc/include/GL/Imakefile,v 1.13 2001/04/30 14:58:48 dawes Exp $ - LinkSourceFile(gl.h, $(MESASRCDIR)/include/GL) LinkSourceFile(glext.h, $(MESASRCDIR)/include/GL) LinkSourceFile(glxext.h, $(MESASRCDIR)/include/GL) diff --git a/nx-X11/include/Imakefile b/nx-X11/include/Imakefile index 8b5bd356f..9d43fb53f 100644 --- a/nx-X11/include/Imakefile +++ b/nx-X11/include/Imakefile @@ -1,6 +1,3 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/18 04:05:43 coskrey Exp $ -XCOMM $XFree86: xc/include/Imakefile,v 3.28 2001/04/28 23:52:31 dawes Exp $ - NULL = #define IHaveSubdirs diff --git a/nx-X11/include/extensions/Imakefile b/nx-X11/include/extensions/Imakefile index 2d8f63494..ad80e5299 100644 --- a/nx-X11/include/extensions/Imakefile +++ b/nx-X11/include/extensions/Imakefile @@ -1,11 +1,3 @@ -XCOMM $XdotOrg: xc/include/extensions/Imakefile,v 1.12 2004/11/24 02:45:33 krh Exp $ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/18 04:05:44 coskrey Exp $ - - - - -XCOMM $XFree86: xc/include/extensions/Imakefile,v 3.55 2003/04/21 12:32:06 sven Exp $ - NULL = #if BuildScreenSaverExt diff --git a/nx-X11/lib/Imakefile b/nx-X11/lib/Imakefile index 4615b8932..1d11c977b 100644 --- a/nx-X11/lib/Imakefile +++ b/nx-X11/lib/Imakefile @@ -1,11 +1,3 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:44:00 cpqbld Exp $ -XCOMM $XdotOrg: xc/lib/Imakefile,v 1.12 2005/10/10 04:18:08 alanc Exp $ - - - - -XCOMM $XFree86: xc/lib/Imakefile,v 3.74 2003/04/14 20:37:07 herrb Exp $ - #define IHaveSubdirs #define PassCDebugFlags diff --git a/nx-X11/lib/X11/xlibi18n/im/Imakefile b/nx-X11/lib/X11/xlibi18n/im/Imakefile index 3c638b1a8..8e0816cb9 100644 --- a/nx-X11/lib/X11/xlibi18n/im/Imakefile +++ b/nx-X11/lib/X11/xlibi18n/im/Imakefile @@ -1,4 +1,3 @@ -XCOMM $XConsortium: Imakefile,v 1.27 94/04/07 15:01:48 rws Exp $ #define IHaveSubdirs #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)" diff --git a/nx-X11/lib/X11/xlibi18n/im/ximcp/Imakefile b/nx-X11/lib/X11/xlibi18n/im/ximcp/Imakefile index 9919e6df3..881f25f87 100644 --- a/nx-X11/lib/X11/xlibi18n/im/ximcp/Imakefile +++ b/nx-X11/lib/X11/xlibi18n/im/ximcp/Imakefile @@ -1,4 +1,3 @@ - #include "../../Xi18nLib.conf" EXTRA_INCLUDES = -I../../.. diff --git a/nx-X11/lib/X11/xlibi18n/lc/Imakefile b/nx-X11/lib/X11/xlibi18n/lc/Imakefile index 16f7aceb3..d3beed642 100644 --- a/nx-X11/lib/X11/xlibi18n/lc/Imakefile +++ b/nx-X11/lib/X11/xlibi18n/lc/Imakefile @@ -1,4 +1,3 @@ -XCOMM $XConsortium: Imakefile,v 1.27 94/04/07 15:01:48 rws Exp $ #define IHaveSubdirs #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)" diff --git a/nx-X11/lib/X11/xlibi18n/lc/Utf8/Imakefile b/nx-X11/lib/X11/xlibi18n/lc/Utf8/Imakefile index 46e402ba6..416151fda 100644 --- a/nx-X11/lib/X11/xlibi18n/lc/Utf8/Imakefile +++ b/nx-X11/lib/X11/xlibi18n/lc/Utf8/Imakefile @@ -1,4 +1,3 @@ - #include "../../Xi18nLib.conf" EXTRA_INCLUDES = -I../../.. diff --git a/nx-X11/lib/X11/xlibi18n/lc/def/Imakefile b/nx-X11/lib/X11/xlibi18n/lc/def/Imakefile index 614ca582f..1ef2d85c7 100644 --- a/nx-X11/lib/X11/xlibi18n/lc/def/Imakefile +++ b/nx-X11/lib/X11/xlibi18n/lc/def/Imakefile @@ -1,4 +1,3 @@ - #include "../../Xi18nLib.conf" EXTRA_INCLUDES = -I../../.. diff --git a/nx-X11/lib/X11/xlibi18n/lc/gen/Imakefile b/nx-X11/lib/X11/xlibi18n/lc/gen/Imakefile index ffd66ad0b..886832805 100644 --- a/nx-X11/lib/X11/xlibi18n/lc/gen/Imakefile +++ b/nx-X11/lib/X11/xlibi18n/lc/gen/Imakefile @@ -1,4 +1,3 @@ - #include "../../Xi18nLib.conf" EXTRA_INCLUDES = -I../../.. diff --git a/nx-X11/lib/X11/xlibi18n/om/Imakefile b/nx-X11/lib/X11/xlibi18n/om/Imakefile index fc8335e9a..e02f7624e 100644 --- a/nx-X11/lib/X11/xlibi18n/om/Imakefile +++ b/nx-X11/lib/X11/xlibi18n/om/Imakefile @@ -1,4 +1,3 @@ -XCOMM $XConsortium: Imakefile,v 1.27 94/04/07 15:01:48 rws Exp $ #define IHaveSubdirs #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)" diff --git a/nx-X11/lib/xtrans/Imakefile b/nx-X11/lib/xtrans/Imakefile index 2cc880c39..b4b36685d 100644 --- a/nx-X11/lib/xtrans/Imakefile +++ b/nx-X11/lib/xtrans/Imakefile @@ -1,5 +1,3 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:46:44 cpqbld Exp $ - #define IncSubdir nx-X11 all:: diff --git a/nx-X11/programs/Xserver/GL/Imakefile b/nx-X11/programs/Xserver/GL/Imakefile index c681d23e0..48059b4dd 100644 --- a/nx-X11/programs/Xserver/GL/Imakefile +++ b/nx-X11/programs/Xserver/GL/Imakefile @@ -1,5 +1,3 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/Imakefile,v 1.12 2003/08/06 14:04:01 eich Exp $ - #define IHaveModules #include diff --git a/nx-X11/programs/Xserver/GL/glx/Imakefile b/nx-X11/programs/Xserver/GL/glx/Imakefile index 65a28352a..7658ea4cf 100644 --- a/nx-X11/programs/Xserver/GL/glx/Imakefile +++ b/nx-X11/programs/Xserver/GL/glx/Imakefile @@ -1,5 +1,3 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/glx/Imakefile,v 1.11 2004/01/28 18:11:50 alanh Exp $ - NULL = #if DoLoadableServer diff --git a/nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile b/nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile index e3e91cdb5..698cba2d9 100644 --- a/nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile @@ -1,5 +1,3 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/mesa/GLcore/Imakefile,v 1.3 2002/05/31 18:12:36 dawes Exp $ - #if DoLoadableServer #define IHaveModules #endif diff --git a/nx-X11/programs/Xserver/GL/mesa/Imakefile b/nx-X11/programs/Xserver/GL/mesa/Imakefile index 41acce9f4..7f9b5191c 100644 --- a/nx-X11/programs/Xserver/GL/mesa/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/Imakefile @@ -1,5 +1,3 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/Imakefile,v 1.23 2002/11/22 22:56:00 tsi Exp $ - #if DoLoadableServer #define IHaveModules #endif diff --git a/nx-X11/programs/Xserver/GL/mesa/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/Imakefile.inc index 99e9c71c2..1bff5782e 100644 --- a/nx-X11/programs/Xserver/GL/mesa/Imakefile.inc +++ b/nx-X11/programs/Xserver/GL/mesa/Imakefile.inc @@ -1,5 +1,3 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/Imakefile.inc,v 1.7tsi Exp $ - MESABUILDDIR = MesaBuildDir COREMESASRCS = $(COREMESABASESRCS) \ diff --git a/nx-X11/programs/Xserver/GL/mesa/X/Imakefile b/nx-X11/programs/Xserver/GL/mesa/X/Imakefile index 9fb00ef73..c8ea2ab72 100644 --- a/nx-X11/programs/Xserver/GL/mesa/X/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/X/Imakefile @@ -1,5 +1,3 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/X/Imakefile,v 1.16 2002/11/22 22:56:01 tsi Exp $ - #if DoLoadableServer #define IHaveModules #endif diff --git a/nx-X11/programs/Xserver/GL/mesa/X/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/X/Imakefile.inc index 8e589c69a..67eaf7804 100644 --- a/nx-X11/programs/Xserver/GL/mesa/X/Imakefile.inc +++ b/nx-X11/programs/Xserver/GL/mesa/X/Imakefile.inc @@ -1,5 +1,3 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/X/Imakefile.inc,v 1.3tsi Exp $ - MESAXBUILDDIR = MesaXBuildDir #ifndef MesaInXServer diff --git a/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile b/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile index 188972b3b..548c6adb0 100644 --- a/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile @@ -1,5 +1,3 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/array_cache/Imakefile,v 1.8 2002/11/22 22:56:01 tsi Exp $ - #if DoLoadableServer #define IHaveModules #endif diff --git a/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile.inc index 3964bdc48..39f6e2400 100644 --- a/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile.inc +++ b/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile.inc @@ -1,5 +1,3 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/array_cache/Imakefile.inc,v 1.1tsi Exp $ - MESAACBUILDDIR = MesaACBuildDir MESA_AC_SRCS = $(MESAACBUILDDIR)ac_context.c \ diff --git a/nx-X11/programs/Xserver/GL/mesa/main/Imakefile b/nx-X11/programs/Xserver/GL/mesa/main/Imakefile index 2dd59ea8f..ff95bd187 100644 --- a/nx-X11/programs/Xserver/GL/mesa/main/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/main/Imakefile @@ -1,6 +1,3 @@ -XCOMM $XdotOrg: xc/programs/Xserver/GL/mesa/main/Imakefile,v 1.2 2004/08/19 07:34:43 kem Exp $ -XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/math/Imakefile,v 1.8 2002/11/22 22:56:01 tsi Exp $ - #if DoLoadableServer #define IHaveModules #endif diff --git a/nx-X11/programs/Xserver/GL/mesa/main/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/main/Imakefile.inc index 8927152aa..3e98f9149 100644 --- a/nx-X11/programs/Xserver/GL/mesa/main/Imakefile.inc +++ b/nx-X11/programs/Xserver/GL/mesa/main/Imakefile.inc @@ -1,5 +1,3 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/Imakefile.inc,v 1.7tsi Exp $ - /* gcc on ppc64 defines this, causes macro recursion with pixel below */ #undef pixel diff --git a/nx-X11/programs/Xserver/GL/mesa/math/Imakefile b/nx-X11/programs/Xserver/GL/mesa/math/Imakefile index df30ab909..77e7f7664 100644 --- a/nx-X11/programs/Xserver/GL/mesa/math/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/math/Imakefile @@ -1,5 +1,3 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/math/Imakefile,v 1.8 2002/11/22 22:56:01 tsi Exp $ - #if DoLoadableServer #define IHaveModules #endif diff --git a/nx-X11/programs/Xserver/GL/mesa/math/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/math/Imakefile.inc index 7356a4617..bc9a1f326 100644 --- a/nx-X11/programs/Xserver/GL/mesa/math/Imakefile.inc +++ b/nx-X11/programs/Xserver/GL/mesa/math/Imakefile.inc @@ -1,5 +1,3 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/math/Imakefile.inc,v 1.1tsi Exp $ - MESAMATHBUILDDIR = MesaMathBuildDir MESA_MATH_SRCS = $(MESAMATHBUILDDIR)m_debug_clip.c \ diff --git a/nx-X11/programs/Xserver/GL/mesa/shader/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/shader/Imakefile.inc index 383bdc008..185103996 100644 --- a/nx-X11/programs/Xserver/GL/mesa/shader/Imakefile.inc +++ b/nx-X11/programs/Xserver/GL/mesa/shader/Imakefile.inc @@ -1,5 +1,3 @@ -XCOMM $XFree86:$ - MESASHADERBUILDDIR = MesaShaderBuildDir MESA_SHADER_SRCS = $(MESASHADERBUILDDIR)arbprogparse.c \ diff --git a/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile.inc index e1196201d..4f91af9c1 100644 --- a/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile.inc +++ b/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile.inc @@ -1,5 +1,3 @@ -XCOMM $XFree86$ - MESAGRAMMARBUILDDIR=MesaGrammarBuildDir MESA_GRAMMAR_SRCS = $(MESAGRAMMARBUILDDIR)grammar_mesa.c diff --git a/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile.inc index 4358b8975..4ffa7805f 100644 --- a/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile.inc +++ b/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile.inc @@ -1,5 +1,3 @@ -XCOMM $XFree86$ - MESASLANGBUILDDIR=MesaSlangBuildDir MESA_SLANG_SRCS = $(MESASLANGBUILDDIR)slang_assemble_assignment.c \ diff --git a/nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Imakefile.inc index 3489b7a28..06b530063 100644 --- a/nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Imakefile.inc +++ b/nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Imakefile.inc @@ -1,5 +1,3 @@ -XCOMM $XFree86:$ - #ifdef NeedToLinkMesaSrc LinkSourceFile(slang_common_builtin_gc_bin.h, $(MESASRCDIR)/src/mesa/shader/slang/library) LinkSourceFile(slang_common_builtin_gc.h, $(MESASRCDIR)/src/mesa/shader/slang/library) diff --git a/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile b/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile index c4c55a86f..bf4df7b4a 100644 --- a/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile @@ -1,5 +1,3 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/swrast/Imakefile,v 1.8 2002/11/22 22:56:01 tsi Exp $ - #if DoLoadableServer #define IHaveModules #endif diff --git a/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile.inc index c57416d85..f573098c1 100644 --- a/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile.inc +++ b/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile.inc @@ -1,5 +1,3 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/swrast/Imakefile.inc,v 1.1tsi Exp $ - MESASWRASTBUILDDIR = MesaSwrastBuildDir MESA_SWRAST_SRCS = $(MESASWRASTBUILDDIR)s_aaline.c \ diff --git a/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile b/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile index 52be70141..ca29177a0 100644 --- a/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile @@ -1,5 +1,3 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/swrast_setup/Imakefile,v 1.8 2002/11/22 22:56:01 tsi Exp $ - #if DoLoadableServer #define IHaveModules #endif diff --git a/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile.inc index 4fb10763a..567ad65b8 100644 --- a/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile.inc +++ b/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile.inc @@ -1,5 +1,3 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/swrast_setup/Imakefile.inc,v 1.1tsi Exp $ - MESASWRSETUPDIR = MesaSwrastSetupBuildDir MESA_SWR_SETUP_SRCS = $(MESASWRSETUPDIR)ss_context.c \ diff --git a/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile b/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile index 3f1c4bbc5..2fec2d03f 100644 --- a/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile @@ -1,6 +1,3 @@ -XCOMM $XdotOrg: xc/programs/Xserver/GL/mesa/tnl/Imakefile,v 1.2 2004/08/19 07:34:44 kem Exp $ -XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/tnl/Imakefile,v 1.8 2002/11/22 22:56:02 tsi Exp $ - #if DoLoadableServer #define IHaveModules #endif diff --git a/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile.inc index 3a124c195..a6c8f923e 100644 --- a/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile.inc +++ b/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile.inc @@ -1,5 +1,3 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/tnl/Imakefile.inc,v 1.1tsi Exp $ - MESATNLBUILDDIR = MesaTnlBuildDir MESA_TNL_SRCS = $(MESATNLBUILDDIR)t_array_api.c \ diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile index 20324dd13..ae11a18c2 100644 --- a/nx-X11/programs/Xserver/Imakefile +++ b/nx-X11/programs/Xserver/Imakefile @@ -26,7 +26,6 @@ /* * Server Master Makefile */ -XCOMM $XFree86: xc/programs/Xserver/Imakefile,v 3.296 2003/11/23 06:47:00 torrey Exp $ #include diff --git a/nx-X11/programs/Xserver/Xext/extmod/Imakefile b/nx-X11/programs/Xserver/Xext/extmod/Imakefile index f5aceb507..0105cf775 100644 --- a/nx-X11/programs/Xserver/Xext/extmod/Imakefile +++ b/nx-X11/programs/Xserver/Xext/extmod/Imakefile @@ -1,6 +1,3 @@ -XCOMM $XFree86: xc/programs/Xserver/Xext/extmod/Imakefile,v 1.21 2001/03/05 04:51:56 mvojkovi Exp $ -XCOMM This directory is only entered if DoLoadableServer is set - #define IHaveModules #include diff --git a/nx-X11/programs/Xserver/Xi/Imakefile b/nx-X11/programs/Xserver/Xi/Imakefile index b40f0d06b..746e57eaa 100644 --- a/nx-X11/programs/Xserver/Xi/Imakefile +++ b/nx-X11/programs/Xserver/Xi/Imakefile @@ -1,10 +1,3 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:47:59 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/Xserver/Xi/Imakefile,v 3.2 1999/04/17 09:08:22 dawes Exp $ - #include SRCS = allowev.c \ diff --git a/nx-X11/programs/Xserver/dbe/Imakefile b/nx-X11/programs/Xserver/dbe/Imakefile index 5e5eac4a1..4e03a03ad 100644 --- a/nx-X11/programs/Xserver/dbe/Imakefile +++ b/nx-X11/programs/Xserver/dbe/Imakefile @@ -1,10 +1,3 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:48:16 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/Xserver/dbe/Imakefile,v 3.10 2001/01/17 22:36:41 dawes Exp $ - #if DoLoadableServer #define IHaveSubdirs #endif diff --git a/nx-X11/programs/Xserver/dbe/module/Imakefile b/nx-X11/programs/Xserver/dbe/module/Imakefile index a2a4c6144..8b099e844 100644 --- a/nx-X11/programs/Xserver/dbe/module/Imakefile +++ b/nx-X11/programs/Xserver/dbe/module/Imakefile @@ -1,7 +1,3 @@ -XCOMM $XConsortium: Imakefile /main/2 1996/09/28 17:06:40 rws $ - -XCOMM $XFree86: xc/programs/Xserver/dbe/module/Imakefile,v 1.1 2000/04/06 15:35:03 dawes Exp $ - #define IHaveModules #include diff --git a/nx-X11/programs/Xserver/dix/Imakefile b/nx-X11/programs/Xserver/dix/Imakefile index fb67cb65b..7acd1b45c 100644 --- a/nx-X11/programs/Xserver/dix/Imakefile +++ b/nx-X11/programs/Xserver/dix/Imakefile @@ -1,6 +1,3 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:48:16 cpqbld Exp $ -XCOMM $XFree86: xc/programs/Xserver/dix/Imakefile,v 3.17 2003/04/15 18:30:43 alanh Exp $ - NULL = #include diff --git a/nx-X11/programs/Xserver/fb/Imakefile b/nx-X11/programs/Xserver/fb/Imakefile index b5e8d590f..43960fc98 100644 --- a/nx-X11/programs/Xserver/fb/Imakefile +++ b/nx-X11/programs/Xserver/fb/Imakefile @@ -1,8 +1,3 @@ -XCOMM $XFree86: xc/programs/Xserver/fb/Imakefile,v 1.16 2002/05/31 16:12:17 dawes Exp $ -XCOMM -XCOMM -XCOMM Id: Imakefile,v 1.1 1999/11/02 03:54:44 keithp Exp $ - /* * The X.org 6.8.99.16 snapshot fails to compile with GCC 4. * Temporarily disable the MMX features until the bug is diff --git a/nx-X11/programs/Xserver/fb/module/Imakefile b/nx-X11/programs/Xserver/fb/module/Imakefile index bea44f4e8..d063bc28d 100644 --- a/nx-X11/programs/Xserver/fb/module/Imakefile +++ b/nx-X11/programs/Xserver/fb/module/Imakefile @@ -1,5 +1,3 @@ -XCOMM $XFree86: xc/programs/Xserver/cfb/module/Imakefile,v 1.1 2002/05/31 15:12:56 dawes Exp $ - #define IHaveModules #define LinkDirectory .. diff --git a/nx-X11/programs/Xserver/hw/nxagent/Imakefile b/nx-X11/programs/Xserver/hw/nxagent/Imakefile index 905bfa92f..d4404356b 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Imakefile +++ b/nx-X11/programs/Xserver/hw/nxagent/Imakefile @@ -1,5 +1,3 @@ -# XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ - #include #ifdef OS2Architecture diff --git a/nx-X11/programs/Xserver/include/Imakefile b/nx-X11/programs/Xserver/include/Imakefile index 0a64fff0c..03c389989 100644 --- a/nx-X11/programs/Xserver/include/Imakefile +++ b/nx-X11/programs/Xserver/include/Imakefile @@ -1,10 +1,3 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:53:29 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/Xserver/include/Imakefile,v 3.21 2001/01/17 22:36:56 dawes Exp $ - HEADERS = os.h misc.h #if defined(XorgVersion) \ diff --git a/nx-X11/programs/Xserver/record/Imakefile b/nx-X11/programs/Xserver/record/Imakefile index cabcd558d..fc74ec4da 100644 --- a/nx-X11/programs/Xserver/record/Imakefile +++ b/nx-X11/programs/Xserver/record/Imakefile @@ -1,6 +1,3 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:53:45 cpqbld Exp $ -XCOMM $XFree86: xc/programs/Xserver/record/Imakefile,v 1.12 2001/11/02 23:29:34 dawes Exp $ - NULL = #if DoLoadableServer diff --git a/nx-X11/programs/Xserver/record/module/Imakefile b/nx-X11/programs/Xserver/record/module/Imakefile index 1a9aa1fee..fd78192fb 100644 --- a/nx-X11/programs/Xserver/record/module/Imakefile +++ b/nx-X11/programs/Xserver/record/module/Imakefile @@ -1,8 +1,3 @@ -XCOMM $XFree86: xc/programs/Xserver/record/module/Imakefile,v 1.1 2000/04/05 18:14:03 dawes Exp $ -XCOMM -XCOMM -XCOMM $XConsortium: Imakefile /main/3 1996/09/28 17:15:43 rws $ - #define IHaveModules #include diff --git a/nx-X11/programs/Xserver/render/Imakefile b/nx-X11/programs/Xserver/render/Imakefile index 6c3a7880c..0fe78340d 100644 --- a/nx-X11/programs/Xserver/render/Imakefile +++ b/nx-X11/programs/Xserver/render/Imakefile @@ -1,5 +1,3 @@ -XCOMM $XFree86: xc/programs/Xserver/render/Imakefile,v 1.10 2002/11/23 02:38:15 keithp Exp $ - NULL = #include diff --git a/nx-X11/programs/Xserver/xkb/Imakefile b/nx-X11/programs/Xserver/xkb/Imakefile index 4b5280f80..1417cbc3f 100644 --- a/nx-X11/programs/Xserver/xkb/Imakefile +++ b/nx-X11/programs/Xserver/xkb/Imakefile @@ -1,10 +1,3 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:53:45 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/Xserver/xkb/Imakefile,v 3.21 2002/12/09 23:00:42 dawes Exp $ - #define SGIHyperOpt #include -- cgit v1.2.3