bring back the Imakefile changes from the XFree86 CVS

5 files changed, 105 insertions, 15 deletions

diff --git a/xc/programs/Xserver/GL/mesa/src/array_cache/Imakefile b/xc/programs/Xserver/GL/mesa/src/array_cache/Imakefile
index eafe62420..6a8a3f89a 100644
--- a/xc/programs/Xserver/GL/mesa/src/array_cache/Imakefile
+++ b/xc/programs/Xserver/GL/mesa/src/array_cache/Imakefile
@@ -1,12 +1,24 @@
-XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/array_cache/Imakefile,v 1.3 2002/02/28 17:52:18 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/array_cache/Imakefile,v 1.7 2002/10/30 17:58:55 alanh Exp $
 
+#if DoLoadableServer
+#if !BuildModuleInSubdir
 #define IHaveModules
+#elif !defined(IHaveModules)
+#define IHaveSubdirs
+SUBDIRS = module
+#endif
+#endif
+
 #include <Server.tmpl>
 
 #define NeedAllMesaSrc
 #define NeedToLinkMesaSrc
 #define MesaACBuildDir /**/
+#if !BuildModuleInSubdir || !defined(IHaveModules)
 #include "../../../../../../lib/GL/mesa/src/array_cache/Imakefile.inc"
+#else
+#include "../../../../../../../lib/GL/mesa/src/array_cache/Imakefile.inc"
+#endif
 
          SRCS = $(MESA_AC_SRCS)
          OBJS = $(MESA_AC_OBJS)
@@ -16,13 +28,13 @@ XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/array_cache/Imakefile,v 1.3 2002
 		-I$(MESASRCDIR)/src/math \
 		-I$(MESASRCDIR)/include \
                 -I$(SERVERSRC)/include -I$(XINCLUDESRC) \
-                -I../../../include -I../../../glx \
+                -I$(SERVERSRC)/GL/include -I$(SERVERSRC)/GL/glx \
                 -I$(LIBSRC)/GL/include \
                 -I$(XF86SRC) -I$(INCLUDESRC)
 
       DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/
 
-#if DoLoadableServer
+#ifdef IHaveModules
 ModuleObjectRule()
 #else
 NormalLibraryObjectRule()
@@ -34,3 +46,9 @@ LintLibraryTarget(dri,$(SRCS))
 NormalLintTarget($(SRCS))
 
 DependTarget()
+
+#ifdef IHaveSubdirs
+MakeSubdirs($(SUBDIRS))
+DependSubdirs($(SUBDIRS))
+#endif
+
diff --git a/xc/programs/Xserver/GL/mesa/src/math/Imakefile b/xc/programs/Xserver/GL/mesa/src/math/Imakefile
index 6c6238678..02afc5793 100644
--- a/xc/programs/Xserver/GL/mesa/src/math/Imakefile
+++ b/xc/programs/Xserver/GL/mesa/src/math/Imakefile
@@ -1,12 +1,24 @@
-XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/math/Imakefile,v 1.3 2002/02/28 17:52:18 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/math/Imakefile,v 1.7 2002/10/30 17:58:55 alanh Exp $
 
+#if DoLoadableServer
+#if !BuildModuleInSubdir
 #define IHaveModules
+#elif !defined(IHaveModules)
+#define IHaveSubdirs
+SUBDIRS = module
+#endif
+#endif
+
 #include <Server.tmpl>
 
 #define NeedAllMesaSrc
 #define NeedToLinkMesaSrc
 #define MesaMathBuildDir /**/
+#if !BuildModuleInSubdir || !defined(IHaveModules)
 #include "../../../../../../lib/GL/mesa/src/math/Imakefile.inc"
+#else
+#include "../../../../../../../lib/GL/mesa/src/math/Imakefile.inc"
+#endif
 
          SRCS = $(MESA_MATH_SRCS)
          OBJS = $(MESA_MATH_OBJS)
@@ -15,13 +27,13 @@ XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/math/Imakefile,v 1.3 2002/02/28
 		-I$(MESASRCDIR)/src/math \
 		-I$(MESASRCDIR)/include \
                 -I$(SERVERSRC)/include -I$(XINCLUDESRC) \
-                -I../../../include -I../../../glx \
+                -I$(SERVERSRC)/GL/include -I$(SERVERSRC)/GL/glx \
                 -I$(LIBSRC)/GL/include \
                 -I$(XF86SRC) -I$(INCLUDESRC)
 
       DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/
 
-#if DoLoadableServer
+#ifdef IHaveModules
 ModuleObjectRule()
 #else
 NormalLibraryObjectRule()
@@ -33,3 +45,9 @@ LintLibraryTarget(dri,$(SRCS))
 NormalLintTarget($(SRCS))
 
 DependTarget()
+
+#ifdef IHaveSubdirs
+MakeSubdirs($(SUBDIRS))
+DependSubdirs($(SUBDIRS))
+#endif
+
diff --git a/xc/programs/Xserver/GL/mesa/src/swrast/Imakefile b/xc/programs/Xserver/GL/mesa/src/swrast/Imakefile
index 04d3d657e..89349c589 100644
--- a/xc/programs/Xserver/GL/mesa/src/swrast/Imakefile
+++ b/xc/programs/Xserver/GL/mesa/src/swrast/Imakefile
@@ -1,12 +1,24 @@
-XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/swrast/Imakefile,v 1.3 2002/02/28 17:52:18 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/swrast/Imakefile,v 1.7 2002/10/30 17:58:56 alanh Exp $
 
+#if DoLoadableServer
+#if !BuildModuleInSubdir
 #define IHaveModules
+#elif !defined(IHaveModules)
+#define IHaveSubdirs
+SUBDIRS = module
+#endif
+#endif
+
 #include <Server.tmpl>
 
 #define NeedAllMesaSrc
 #define NeedToLinkMesaSrc
 #define MesaSwrastBuildDir /**/
+#if !BuildModuleInSubdir || !defined(IHaveModules)
 #include "../../../../../../lib/GL/mesa/src/swrast/Imakefile.inc"
+#else
+#include "../../../../../../../lib/GL/mesa/src/swrast/Imakefile.inc"
+#endif
 
 
          SRCS = $(MESA_SWRAST_SRCS)
@@ -17,13 +29,13 @@ XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/swrast/Imakefile,v 1.3 2002/02/2
 		-I$(MESASRCDIR)/src/swrast_setup \
 		-I$(MESASRCDIR)/include \
                 -I$(SERVERSRC)/include -I$(XINCLUDESRC) \
-                -I../../../include -I../../../glx \
+                -I$(SERVERSRC)/GL/include -I$(SERVERSRC)/GL/glx \
                 -I$(LIBSRC)/GL/include \
                 -I$(XF86SRC) -I$(INCLUDESRC)
 
       DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/
 
-#if DoLoadableServer
+#ifdef IHaveModules
 ModuleObjectRule()
 #else
 NormalLibraryObjectRule()
@@ -35,3 +47,9 @@ LintLibraryTarget(dri,$(SRCS))
 NormalLintTarget($(SRCS))
 
 DependTarget()
+
+#ifdef IHaveSubdirs
+MakeSubdirs($(SUBDIRS))
+DependSubdirs($(SUBDIRS))
+#endif
+
diff --git a/xc/programs/Xserver/GL/mesa/src/swrast_setup/Imakefile b/xc/programs/Xserver/GL/mesa/src/swrast_setup/Imakefile
index dfa2ece31..9519aa5ea 100644
--- a/xc/programs/Xserver/GL/mesa/src/swrast_setup/Imakefile
+++ b/xc/programs/Xserver/GL/mesa/src/swrast_setup/Imakefile
@@ -1,12 +1,24 @@
-XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/swrast_setup/Imakefile,v 1.3 2002/02/28 17:52:18 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/swrast_setup/Imakefile,v 1.7 2002/10/30 17:58:56 alanh Exp $
 
+#if DoLoadableServer
+#if !BuildModuleInSubdir
 #define IHaveModules
+#elif !defined(IHaveModules)
+#define IHaveSubdirs
+SUBDIRS = module
+#endif
+#endif
+
 #include <Server.tmpl>
 
 #define NeedAllMesaSrc
 #define NeedToLinkMesaSrc
 #define MesaSwrastSetupBuildDir /**/
+#if !BuildModuleInSubdir || !defined(IHaveModules)
 #include "../../../../../../lib/GL/mesa/src/swrast_setup/Imakefile.inc"
+#else
+#include "../../../../../../../lib/GL/mesa/src/swrast_setup/Imakefile.inc"
+#endif
 
          SRCS = $(MESA_SWR_SETUP_SRCS)
          OBJS = $(MESA_SWR_SETUP_OBJS)
@@ -15,13 +27,13 @@ XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/swrast_setup/Imakefile,v 1.3 200
 		-I$(MESASRCDIR)/src/swrast_setup \
 		-I$(MESASRCDIR)/include \
                 -I$(SERVERSRC)/include -I$(XINCLUDESRC) \
-                -I../../../include -I../../../glx \
+                -I$(SERVERSRC)/GL/include -I$(SERVERSRC)/GL/glx \
                 -I$(LIBSRC)/GL/include \
                 -I$(XF86SRC) -I$(INCLUDESRC)
 
       DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/
 
-#if DoLoadableServer
+#ifdef IHaveModules
 ModuleObjectRule()
 #else
 NormalLibraryObjectRule()
@@ -33,3 +45,9 @@ LintLibraryTarget(dri,$(SRCS))
 NormalLintTarget($(SRCS))
 
 DependTarget()
+
+#ifdef IHaveSubdirs
+MakeSubdirs($(SUBDIRS))
+DependSubdirs($(SUBDIRS))
+#endif
+
diff --git a/xc/programs/Xserver/GL/mesa/src/tnl/Imakefile b/xc/programs/Xserver/GL/mesa/src/tnl/Imakefile
index 137670dc1..35e4aa40a 100644
--- a/xc/programs/Xserver/GL/mesa/src/tnl/Imakefile
+++ b/xc/programs/Xserver/GL/mesa/src/tnl/Imakefile
@@ -1,12 +1,24 @@
-XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/tnl/Imakefile,v 1.3 2002/02/28 17:52:19 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/tnl/Imakefile,v 1.7 2002/10/30 17:58:56 alanh Exp $
 
+#if DoLoadableServer
+#if !BuildModuleInSubdir
 #define IHaveModules
+#elif !defined(IHaveModules)
+#define IHaveSubdirs
+SUBDIRS = module
+#endif
+#endif
+
 #include <Server.tmpl>
 
 #define NeedAllMesaSrc
 #define NeedToLinkMesaSrc
 #define MesaTnlBuildDir /**/
+#if !BuildModuleInSubdir || !defined(IHaveModules)
 #include "../../../../../../lib/GL/mesa/src/tnl/Imakefile.inc"
+#else
+#include "../../../../../../../lib/GL/mesa/src/tnl/Imakefile.inc"
+#endif
 
 
          SRCS = $(MESA_TNL_SRCS)
@@ -18,13 +30,13 @@ XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/tnl/Imakefile,v 1.3 2002/02/28 1
 		-I$(MESASRCDIR)/src/tnl \
 		-I$(MESASRCDIR)/include \
                 -I$(SERVERSRC)/include -I$(XINCLUDESRC) \
-                -I../../../include -I../../../glx \
+                -I$(SERVERSRC)/GL/include -I$(SERVERSRC)/GL/glx \
                 -I$(LIBSRC)/GL/include \
                 -I$(XF86SRC) -I$(INCLUDESRC)
 
       DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/
 
-#if DoLoadableServer
+#ifdef IHaveModules
 ModuleObjectRule()
 #else
 NormalLibraryObjectRule()
@@ -36,3 +48,9 @@ LintLibraryTarget(dri,$(SRCS))
 NormalLintTarget($(SRCS))
 
 DependTarget()
+
+#ifdef IHaveSubdirs
+MakeSubdirs($(SUBDIRS))
+DependSubdirs($(SUBDIRS))
+#endif
+