From 28b95fd9d1c2f078aaaac75c310a27b17c74a6fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Thu, 6 Jul 2006 03:25:38 -0400 Subject: [PATCH] Drop unused GL/include subtree. Woo, less Makefile's to generate. --- GL/Makefile.am | 2 +- GL/include/GL/Makefile.am | 1 - GL/include/GL/glx_ansic.h | 112 -------------------------------------- GL/include/GL/xf86glx.h | 39 ------------- GL/include/Makefile.am | 1 - GL/mesa/X/xf86glx.c | 1 - GL/mesa/X/xf86glx_util.c | 1 - configure.ac | 2 - 8 files changed, 1 insertion(+), 158 deletions(-) delete mode 100644 GL/include/GL/Makefile.am delete mode 100644 GL/include/GL/glx_ansic.h delete mode 100644 GL/include/GL/xf86glx.h delete mode 100644 GL/include/Makefile.am diff --git a/GL/Makefile.am b/GL/Makefile.am index e8e080df1..b9337ba69 100644 --- a/GL/Makefile.am +++ b/GL/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = glx mesa include +SUBDIRS = glx mesa # someone could get really crazy someday and add support for the SI... diff --git a/GL/include/GL/Makefile.am b/GL/include/GL/Makefile.am deleted file mode 100644 index f2a902396..000000000 --- a/GL/include/GL/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = glx_ansic.h xf86glx.h diff --git a/GL/include/GL/glx_ansic.h b/GL/include/GL/glx_ansic.h deleted file mode 100644 index 9085a08fe..000000000 --- a/GL/include/GL/glx_ansic.h +++ /dev/null @@ -1,112 +0,0 @@ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - -#ifndef _glx_ansic_h_ -#define _glx_ansic_h_ - -/* $XFree86: xc/programs/Xserver/GL/include/GL/glx_ansic.h,v 1.5 2001/03/21 20:49:08 dawes Exp $ */ -/* -** License Applicability. Except to the extent portions of this file are -** made subject to an alternative license as permitted in the SGI Free -** Software License B, Version 1.1 (the "License"), the contents of this -** file are subject only to the provisions of the License. You may not use -** this file except in compliance with the License. You may obtain a copy -** of the License at Silicon Graphics, Inc., attn: Legal Services, 1600 -** Amphitheatre Parkway, Mountain View, CA 94043-1351, or at: -** -** http://oss.sgi.com/projects/FreeB -** -** Note that, as provided in the License, the Software is distributed on an -** "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS -** DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND -** CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A -** PARTICULAR PURPOSE, AND NON-INFRINGEMENT. -** -** Original Code. The Original Code is: OpenGL Sample Implementation, -** Version 1.2.1, released January 26, 2000, developed by Silicon Graphics, -** Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc. -** Copyright in any portions created by third parties is as indicated -** elsewhere herein. All Rights Reserved. -** -** Additional Notice Provisions: The application programming interfaces -** established by SGI in conjunction with the Original Code are The -** OpenGL(R) Graphics System: A Specification (Version 1.2.1), released -** April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version -** 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X -** Window System(R) (Version 1.3), released October 19, 1998. This software -** was created using the OpenGL(R) version 1.2.1 Sample Implementation -** published by SGI, but has not been independently verified as being -** compliant with the OpenGL(R) version 1.2.1 Specification. -*/ - -/* -** this needs to check whether we're using XFree86 at all, and then -** which version we're using. Use these macros if version is 3.9+, else -** use normal commands below. -*/ - -/* -** turns out this include file only exists for XFree86 3.9+ -** I notice that not having it is not an error and does not stop the build, -** but having it will allow opengl and glx to be built for 3.9+. We no longer -** need an explicit define in the Makefile, just point to the correct X source -** tree and all should be taken care of. -*/ - -#ifdef XFree86Server - -#ifndef assert -#define assert(a) -#endif - -#else - -#if defined(Lynx) && defined(__assert_h) -#undef __assert_h -#endif -#ifdef assert -#undef assert -#endif -#include - -#endif - - -#define GLX_STDOUT stdout -#define GLX_STDERR stderr -#define __glXPrintf printf -#define __glXFprintf fprintf -#define __glXSprintf sprintf -#define __glXVfprintf vfprintf -#define __glXVsprintf vsprintf -#define __glXFopen fopen -#define __glXFclose fclose -#define __glXCos(x) cos(x) -#define __glXSin(x) sin(x) -#define __glXAtan(x) atan(x) -#define __glXAbs(x) abs(x) -#define __glXLog(x) log(x) -#define __glXCeil(x) ceil(x) -#define __glXFloor(x) floor(x) -#define __glXSqrt(x) sqrt(x) -#define __glXPow(x, y) pow(x, y) -#define __glXMemmove(dest, src, n) memmove(dest, src, n) -#define __glXMemcpy(dest, src, n) memcpy(dest, src, n) -#define __glXMemset(s, c, n) memset(s, c, n) -#define __glXStrdup(str) xstrdup(str) -#define __glXStrcpy(dest, src) strcpy(dest, src) -#define __glXStrncpy(dest, src, n) strncpy(dest, src, n) -#define __glXStrcat(dest, src) strcat(dest, src) -#define __glXStrncat(dest, src, n) strncat(dest, src, n) -#define __glXStrcmp(s1, s2) strcmp(s1, s2) -#define __glXStrncmp(s1, s2, n) strncmp(s1, s2, n) -#define __glXStrlen(str) strlen(str) -#define __glXAbort() abort() -#define __glXStrtok(s, delim) strtok(s, delim) -#define __glXStrcspn(s, reject) strcspn(s, reject) -#define __glXGetenv(a) getenv(a) -#define __glXAtoi(a) atoi(a) - -#endif /* _glx_ansic_h_ */ - diff --git a/GL/include/GL/xf86glx.h b/GL/include/GL/xf86glx.h deleted file mode 100644 index 5d018d72b..000000000 --- a/GL/include/GL/xf86glx.h +++ /dev/null @@ -1,39 +0,0 @@ -/* $XFree86: xc/programs/Xserver/GL/include/GL/xf86glx.h,v 1.3 1999/06/14 07:31:41 dawes Exp $ */ -/************************************************************************** - -Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. -All Rights Reserved. - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sub license, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice (including the -next paragraph) shall be included in all copies or substantial portions -of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. -IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR -ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -**************************************************************************/ - -/* - * Authors: - * Kevin E. Martin - * - */ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - -#include "miscstruct.h" diff --git a/GL/include/Makefile.am b/GL/include/Makefile.am deleted file mode 100644 index 1367fb437..000000000 --- a/GL/include/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = GL diff --git a/GL/mesa/X/xf86glx.c b/GL/mesa/X/xf86glx.c index 5085eb95e..6015e15d2 100644 --- a/GL/mesa/X/xf86glx.c +++ b/GL/mesa/X/xf86glx.c @@ -54,7 +54,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include "context.h" #include "xmesaP.h" -#include #include "context.h" #include "glcontextmodes.h" diff --git a/GL/mesa/X/xf86glx_util.c b/GL/mesa/X/xf86glx_util.c index d8afcbcb5..4092a2654 100644 --- a/GL/mesa/X/xf86glx_util.c +++ b/GL/mesa/X/xf86glx_util.c @@ -42,7 +42,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "pixmapstr.h" #include "xf86glx_util.h" #include -#include "GL/xf86glx.h" #ifdef ROUNDUP #undef ROUNDUP diff --git a/configure.ac b/configure.ac index 9d8dfed78..55f002ee4 100644 --- a/configure.ac +++ b/configure.ac @@ -1599,8 +1599,6 @@ AC_OUTPUT([ Makefile GL/Makefile GL/glx/Makefile -GL/include/Makefile -GL/include/GL/Makefile GL/mesa/Makefile GL/mesa/array_cache/Makefile GL/mesa/glapi/Makefile