module changes

Obtained from:	sourceforge.net CVS

2 files changed, 58 insertions, 15 deletions

diff --git a/xc/programs/Xserver/GL/glx/Imakefile b/xc/programs/Xserver/GL/glx/Imakefile
index c9e6767c4..e032ee08e 100644
--- a/xc/programs/Xserver/GL/glx/Imakefile
+++ b/xc/programs/Xserver/GL/glx/Imakefile
@@ -1,7 +1,14 @@
-XCOMM $XFree86: xc/programs/Xserver/GL/glx/Imakefile,v 1.6 1999/06/14 14:28:46 dawes Exp $
-XCOMM $PI: xc/programs/Xserver/GL/glx/Imakefile,v 1.11 1999/05/27 03:43:33 jens Exp $
+XCOMM $XFree86: xc/programs/Xserver/GL/glx/Imakefile,v 1.10 2003/08/06 14:04:01 eich Exp $
+
+#if DoLoadableServer
+# if !BuildModuleInSubdir
+#  define IHaveModules
+# elif !defined(IHaveModules)
+#  define IHaveSubdirs
+SUBDIRS = module
+# endif
+#endif
 
-#define IHaveModules
 #include <Server.tmpl>
 
          SRCS = global.c glxbuf.c glxcmds.c glxcmdsswap.c glxext.c \
@@ -22,31 +29,63 @@ XCOMM $PI: xc/programs/Xserver/GL/glx/Imakefile,v 1.11 1999/05/27 03:43:33 jens
                 g_render.o g_renderswap.o g_single.o g_singleswap.o \
                 $(MOBJS)
 
-#if GlxUseSGISI
-     INCLUDES = -I. -I../include -I$(SERVERSRC)/include -I$(XTOP)/include \
-                -I$(SERVERSRC)/mi \
+     INCLUDES = -I$(SERVERSRC)/GL/glx -I$(SERVERSRC)/GL/include -I$(SERVERSRC)/include -I$(INCLUDESRC) \
+                -I$(XINCLUDESRC) -I$(SERVERSRC)/mi \
                 -I$(EXTINCSRC) -I$(FONTINCSRC) -I$(LIBSRC)/GL/include \
-                -I$(XF86SRC) -I$(XF86COMSRC) -I$(XF86OSSRC)
-#else
-     INCLUDES = -I. -I../include -I$(SERVERSRC)/include -I$(XTOP)/include \
-                -I$(SERVERSRC)/mi \
-                -I$(EXTINCSRC) -I$(FONTINCSRC) -I$(LIBSRC)/GL/include \
-                -I$(XF86SRC) -I../mesa/include -I../mesa/src -I../mesa/src/X
-#endif
+                -I$(XF86SRC)
+
 XCOMM If you add "-DDEBUG" in DEFINES, then make sure you also
 XCOMM add DEBUG to the define in ../mesa/src/X/xf86glx.c
       DEFINES = $(GLX_DEFINES)
 
 
-#if DoLoadableServer
+#ifdef IHaveModules
 ModuleObjectRule()
+LibraryModuleTarget(glx,$(OBJS))
 #else
 NormalLibraryObjectRule()
+NormalLibraryTarget(glx,$(OBJS))
 #endif
 SubdirLibraryRule($(OBJS))
-NormalLibraryTarget(glx,$(OBJS))
 
 LintLibraryTarget(glx,$(SRCS))
 NormalLintTarget($(SRCS))
 
 DependTarget()
+
+#ifdef IHaveSubdirs
+MakeSubdirs($(SUBDIRS))
+DependSubdirs($(SUBDIRS))
+#endif
+
+#ifdef LinkDirectory
+LinkSourceFile(global.c,LinkDirectory)
+LinkSourceFile(glxbuf.c,LinkDirectory)
+LinkSourceFile(glxcmds.c,LinkDirectory)
+LinkSourceFile(glxcmdsswap.c,LinkDirectory)
+LinkSourceFile(glxext.c,LinkDirectory)
+LinkSourceFile(glxfb.c,LinkDirectory)
+LinkSourceFile(glximports.c,LinkDirectory)
+LinkSourceFile(glxmem.c,LinkDirectory)
+LinkSourceFile(glxpix.c,LinkDirectory)
+LinkSourceFile(glxscreens.c,LinkDirectory)
+LinkSourceFile(glxutil.c,LinkDirectory)
+LinkSourceFile(render2.c,LinkDirectory)
+LinkSourceFile(render2swap.c,LinkDirectory)
+LinkSourceFile(renderpix.c,LinkDirectory)
+LinkSourceFile(renderpixswap.c,LinkDirectory)
+LinkSourceFile(rensize.c,LinkDirectory)
+LinkSourceFile(rensizetab.c,LinkDirectory)
+LinkSourceFile(single2.c,LinkDirectory)
+LinkSourceFile(single2swap.c,LinkDirectory)
+LinkSourceFile(singlepix.c,LinkDirectory)
+LinkSourceFile(singlepixswap.c,LinkDirectory)
+LinkSourceFile(singlesize.c,LinkDirectory)
+LinkSourceFile(xfont.c,LinkDirectory)
+LinkSourceFile(g_disptab.c,LinkDirectory)
+LinkSourceFile(g_disptab_EXT.c,LinkDirectory)
+LinkSourceFile(g_render.c,LinkDirectory)
+LinkSourceFile(g_renderswap.c,LinkDirectory)
+LinkSourceFile(g_single.c,LinkDirectory)
+LinkSourceFile(g_singleswap.c,LinkDirectory)
+#endif
diff --git a/xc/programs/Xserver/GL/glx/module/Imakefile b/xc/programs/Xserver/GL/glx/module/Imakefile
new file mode 100644
index 000000000..d063bc28d
--- /dev/null
+++ b/xc/programs/Xserver/GL/glx/module/Imakefile
@@ -0,0 +1,4 @@
+#define IHaveModules
+#define LinkDirectory ..
+
+#include "../Imakefile"