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. --- nx-X11/lib/GL/mesa/math/Imakefile | 98 ----------------------------------- nx-X11/lib/GL/mesa/math/Imakefile.inc | 82 ----------------------------- 2 files changed, 180 deletions(-) delete mode 100644 nx-X11/lib/GL/mesa/math/Imakefile delete mode 100644 nx-X11/lib/GL/mesa/math/Imakefile.inc (limited to 'nx-X11/lib/GL/mesa/math') diff --git a/nx-X11/lib/GL/mesa/math/Imakefile b/nx-X11/lib/GL/mesa/math/Imakefile deleted file mode 100644 index ab00ae76f..000000000 --- a/nx-X11/lib/GL/mesa/math/Imakefile +++ /dev/null @@ -1,98 +0,0 @@ -XCOMM $XFree86: xc/lib/GL/mesa/src/math/Imakefile,v 1.8 2002/11/25 12:58:55 tsi Exp $ - -#include - -/* - * Need both shared and unshared Mesa objects in the following cases: - * GlxDriverUsesMesa - * GlxBuiltInXMesa - * BuildOSMesaLib - * - * In other cases, only the shared version is needed to link in to loadable - * driver modules. - */ - -#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa)) -#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC) -#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC) -#define DoExtraLib SharedLibGlx -#define DoDebugLib DebugLibGlx -#define DoProfileLib ProfileLibGlx -#else -#define DoNormalLib SharedLibGlxWithoutPIC -#define DoSharedLib !SharedLibGlxWithoutPIC -#define DoExtraLib NO -#define DoDebugLib NO -#define DoProfileLib NO -#endif - -/* Large PIC tables needed for Solaris SPARC builds */ -#if (defined(SunArchitecture) && defined(SparcArchitecture)) -# define LargePICTable YES -#endif - - -#define MesaMathBuildDir /**/ -#define NeedToLinkMesaSrc -#include "Imakefile.inc" - - -#if Malloc0ReturnsNull -ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL -#endif - -#if BuildXF86DRI - DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER - DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I.. \ - -I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri -#endif - -#if defined(i386Architecture) && MesaUseX86Asm - ASM_DIR = x86 - ASM_SRCS = - ASM_OBJS = -#if MesaUseMMX - MMX_DEFS = -DUSE_MMX_ASM -#endif -#if MesaUse3DNow - 3DNOW_DEFS = -DUSE_3DNOW_ASM -#endif -#if MesaUseSSE - SSE_DEFS = -DUSE_SSE_ASM -#endif - ASM_DEFS = -DUSE_X86_ASM $(MMX_DEFS) $(3DNOW_DEFS) $(SSE_DEFS) -#endif - -#ifdef SparcArchitecture - ASM_DIR = sparc - ASM_SRCS = - ASM_OBJS = - ASM_DEFS = -DUSE_SPARC_ASM -#endif - -#ifdef UseCompaqMathLibrary - MATHDEF = -DCCPML -#endif - -MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa/main \ - -I$(MESASRCDIR)/src/mesa/math \ - -I$(MESASRCDIR)/src/mesa/glapi \ - -I$(MESASRCDIR)/src/mesa \ - -I$(MESASRCDIR)/src/mesa/$(ASM_DIR) \ - -I$(MESASRCDIR)/include \ - -I../../../include -I$(XINCLUDESRC) - - DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) $(MATHDEF) - INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES) - SRCS = $(MESA_MATH_SRCS) - OBJS = $(MESA_MATH_OBJS) - - -#include - -LibraryObjectRule() - -SubdirLibraryRule($(OBJS)) -NormalLintTarget($(SRCS)) - -DependTarget() diff --git a/nx-X11/lib/GL/mesa/math/Imakefile.inc b/nx-X11/lib/GL/mesa/math/Imakefile.inc deleted file mode 100644 index cd1dcc427..000000000 --- a/nx-X11/lib/GL/mesa/math/Imakefile.inc +++ /dev/null @@ -1,82 +0,0 @@ -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 \ - $(MESAMATHBUILDDIR)m_debug_norm.c \ - $(MESAMATHBUILDDIR)m_debug_xform.c \ - $(MESAMATHBUILDDIR)m_eval.c \ - $(MESAMATHBUILDDIR)m_matrix.c \ - $(MESAMATHBUILDDIR)m_translate.c \ - $(MESAMATHBUILDDIR)m_vector.c \ - $(MESAMATHBUILDDIR)m_xform.c - -#ifdef NeedToLinkMesaSrc -LinkSourceFile(mathmod.h, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_clip_tmp.h, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_copy_tmp.h, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_debug_clip.c, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_debug.h, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_debug_util.h, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_debug_norm.c, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_debug_xform.c, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_dotprod_tmp.h, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_eval.c, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_eval.h, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_matrix.c, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_matrix.h, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_norm_tmp.h, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_translate.c, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_translate.h, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_trans_tmp.h, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_vector.c, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_vector.h, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_xform.c, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_xform.h, $(MESASRCDIR)/src/mesa/math) -LinkSourceFile(m_xform_tmp.h, $(MESASRCDIR)/src/mesa/math) -#endif - - MESA_MATH_OBJS = $(MESAMATHBUILDDIR)m_debug_clip.o \ - $(MESAMATHBUILDDIR)m_debug_norm.o \ - $(MESAMATHBUILDDIR)m_debug_xform.o \ - $(MESAMATHBUILDDIR)m_eval.o \ - $(MESAMATHBUILDDIR)m_matrix.o \ - $(MESAMATHBUILDDIR)m_translate.o \ - $(MESAMATHBUILDDIR)m_vector.o \ - $(MESAMATHBUILDDIR)m_xform.o - -#if defined(DoSharedLib) && DoSharedLib - MESA_MATH_UOBJS = $(MESAMATHBUILDDIR)unshared/m_debug_clip.o \ - $(MESAMATHBUILDDIR)unshared/m_debug_norm.o \ - $(MESAMATHBUILDDIR)unshared/m_debug_xform.o \ - $(MESAMATHBUILDDIR)unshared/m_eval.o \ - $(MESAMATHBUILDDIR)unshared/m_matrix.o \ - $(MESAMATHBUILDDIR)unshared/m_translate.o \ - $(MESAMATHBUILDDIR)unshared/m_vector.o \ - $(MESAMATHBUILDDIR)unshared/m_xform.o -#else - MATH_MESA_UOBJS = $(MESA_MATH_OBJS) -#endif - - MESA_MATH_DOBJS = $(MESAMATHBUILDDIR)debugger/m_debug_clip.o \ - $(MESAMATHBUILDDIR)debugger/m_debug_norm.o \ - $(MESAMATHBUILDDIR)debugger/m_debug_xform.o \ - $(MESAMATHBUILDDIR)debugger/m_eval.o \ - $(MESAMATHBUILDDIR)debugger/m_matrix.o \ - $(MESAMATHBUILDDIR)debugger/m_translate.o \ - $(MESAMATHBUILDDIR)debugger/m_vector.o \ - $(MESAMATHBUILDDIR)debugger/m_xform.o - - MESA_MATH_POBJS = $(MESAMATHBUILDDIR)profiled/m_debug_clip.o \ - $(MESAMATHBUILDDIR)profiled/m_debug_norm.o \ - $(MESAMATHBUILDDIR)profiled/m_debug_xform.o \ - $(MESAMATHBUILDDIR)profiled/m_eval.o \ - $(MESAMATHBUILDDIR)profiled/m_matrix.o \ - $(MESAMATHBUILDDIR)profiled/m_translate.o \ - $(MESAMATHBUILDDIR)profiled/m_vector.o \ - $(MESAMATHBUILDDIR)profiled/m_xform.o - -- cgit v1.2.3