diff options
Diffstat (limited to 'xc/programs/Xserver/GL/mesa/src/X/Imakefile')
| -rw-r--r-- | xc/programs/Xserver/GL/mesa/src/X/Imakefile | 30 |
1 files changed, 27 insertions, 3 deletions
diff --git a/xc/programs/Xserver/GL/mesa/src/X/Imakefile b/xc/programs/Xserver/GL/mesa/src/X/Imakefile index 0a19a05e7..16229476f 100644 --- a/xc/programs/Xserver/GL/mesa/src/X/Imakefile +++ b/xc/programs/Xserver/GL/mesa/src/X/Imakefile @@ -1,13 +1,25 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/X/Imakefile,v 1.13 2002/02/25 00:45:43 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/X/Imakefile,v 1.15 2002/06/02 01:21:14 dawes Exp $ +#if DoLoadableServer +#if !BuildModuleInSubdir #define IHaveModules +#elif !defined(IHaveModules) +#define IHaveSubdirs +SUBDIRS = module +#endif +#endif + #include <Server.tmpl> #define NeedAllMesaSrc #define NeedToLinkMesaSrc #define MesaXBuildDir /**/ #define MesaInXServer +#if !BuildModuleInSubdir || !defined(IHaveModules) #include "../../../../../../lib/GL/mesa/src/X/Imakefile.inc" +#else +#include "../../../../../../../lib/GL/mesa/src/X/Imakefile.inc" +#endif LinkSourceFile(compsize.c,$(LIBSRC)/GL/glx) @@ -28,7 +40,8 @@ GLXSRV_DEFINES = -DXFree86Server SRCS = $(DRIVER_SRCS) $(GLX_SRCS) OBJS = $(DRIVER_OBJS) $(GLX_OBJS) - INCLUDES = -I. -I$(INCLUDESRC) -I$(XINCLUDESRC) -I$(EXTINCSRC) \ + INCLUDES = -I$(SERVERSRC)/GL/mesa/src/X -I$(INCLUDESRC) -I$(XINCLUDESRC) \ + -I$(EXTINCSRC) \ -I$(MESASRCDIR)/src -I$(MESASRCDIR)/src/X \ -I$(MESASRCDIR)/include \ -I$(LIBSRC)/GL/glx -I$(LIBSRC)/GL/include \ @@ -37,7 +50,7 @@ GLXSRV_DEFINES = -DXFree86Server DEFINES = $(GLX_DEFINES) $(GLXSRV_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/ -#if DoLoadableServer +#ifdef IHaveModules ModuleObjectRule() #else NormalLibraryObjectRule() @@ -49,3 +62,14 @@ LintLibraryTarget(dri,$(SRCS)) NormalLintTarget($(SRCS)) DependTarget() + +#ifdef IHaveSubdirs +MakeSubdirs($(SUBDIRS)) +DependSubdirs($(SUBDIRS)) +#endif + +#if BuildModuleInSubdir && defined(IHaveModules) +LinkSourceFile(xf86glx.c,..) +LinkSourceFile(xf86glx_util.c,..) +#endif + |