Merge branch 'sunweaver-pr/libglx-cleanup' into arctica-3.6.x

Attributes GH PR #40: https://github.com/ArcticaProject/nx-libs/pull/40

3 files changed, 79 insertions, 17 deletions

diff --git a/nx-X11/programs/Xserver/GL/mesa/math/Imakefile b/nx-X11/programs/Xserver/GL/mesa/math/Imakefile
index 49720974c..df30ab909 100644
--- a/nx-X11/programs/Xserver/GL/mesa/math/Imakefile
+++ b/nx-X11/programs/Xserver/GL/mesa/math/Imakefile
@@ -1,12 +1,7 @@
 XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/math/Imakefile,v 1.8 2002/11/22 22:56:01 tsi Exp $
 
 #if DoLoadableServer
-#if !BuildModuleInSubdir
 #define IHaveModules
-#elif !defined(IHaveModules)
-#define IHaveSubdirs
-SUBDIRS = module
-#endif
 #endif
 
 #include <Server.tmpl>
@@ -14,11 +9,7 @@ SUBDIRS = module
 #define NeedAllMesaSrc
 #define NeedToLinkMesaSrc
 #define MesaMathBuildDir /**/
-#if !defined(IHaveModules) || !BuildModuleInSubdir
-#include "../../../../../lib/GL/mesa/math/Imakefile.inc"
-#else
-#include "../../../../../../lib/GL/mesa/math/Imakefile.inc"
-#endif
+#include "Imakefile.inc"
 
          SRCS = $(MESA_MATH_SRCS)
          OBJS = $(MESA_MATH_OBJS)
@@ -43,7 +34,6 @@ NormalLibraryObjectRule()
 
 SubdirLibraryRule($(OBJS))
 
-LintLibraryTarget(dri,$(SRCS))
 NormalLintTarget($(SRCS))
 
 DependTarget()
diff --git a/nx-X11/programs/Xserver/GL/mesa/math/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/math/Imakefile.inc
new file mode 100644
index 000000000..7356a4617
--- /dev/null
+++ b/nx-X11/programs/Xserver/GL/mesa/math/Imakefile.inc
@@ -0,0 +1,78 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/math/Imakefile.inc,v 1.1tsi Exp $
+
+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
+
diff --git a/nx-X11/programs/Xserver/GL/mesa/math/module/Imakefile b/nx-X11/programs/Xserver/GL/mesa/math/module/Imakefile
deleted file mode 100644
index e21afd5e5..000000000
--- a/nx-X11/programs/Xserver/GL/mesa/math/module/Imakefile
+++ /dev/null
@@ -1,6 +0,0 @@
-XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/math/module/Imakefile,v 1.1 2002/05/31 18:12:40 dawes Exp $
-
-#define IHaveModules
-
-#include "../Imakefile"
-