diff options
Diffstat (limited to 'xc/programs/Xserver/GL/mesa/src/Imakefile')
| -rw-r--r-- | xc/programs/Xserver/GL/mesa/src/Imakefile | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/xc/programs/Xserver/GL/mesa/src/Imakefile b/xc/programs/Xserver/GL/mesa/src/Imakefile index 66c0335c3..06ab5cff2 100644 --- a/xc/programs/Xserver/GL/mesa/src/Imakefile +++ b/xc/programs/Xserver/GL/mesa/src/Imakefile @@ -1,16 +1,29 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/Imakefile,v 1.20 2002/02/25 00:45:42 dawes Exp $ +XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/Imakefile,v 1.22 2002/06/02 01:21:13 dawes Exp $ +#if DoLoadableServer +#if !BuildModuleInSubdir #define IHaveModules -#include <Server.tmpl> +#elif !defined(IHaveModules) + MODSUBDIR = module +#endif +#endif +#if !BuildModuleInSubdir || !defined(IHaveModules) #define IHaveSubdirs + SUBDIRS = math array_cache swrast swrast_setup tnl X $(MODSUBDIR) +#endif + +#include <Server.tmpl> - SUBDIRS = math array_cache swrast swrast_setup tnl X #define NeedAllMesaSrc #define NeedToLinkMesaSrc #define MesaBuildDir /**/ +#if !BuildModuleInSubdir || !defined(IHaveModules) #include "../../../../../lib/GL/mesa/src/Imakefile.inc" +#else +#include "../../../../../../lib/GL/mesa/src/Imakefile.inc" +#endif SRCS = $(COREMESABASESRCS) OBJS = $(COREMESABASEOBJS) @@ -22,15 +35,18 @@ XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/Imakefile,v 1.20 2002/02/25 00:4 DEFINES = $(GLX_DEFINES) -#if DoLoadableServer +#ifdef IHaveModules ModuleObjectRule() #else NormalLibraryObjectRule() #endif +#ifdef IHaveSubdirs MakeSubdirs($(SUBDIRS)) -SubdirLibraryRule($(OBJS)) DependSubdirs($(SUBDIRS)) +#endif + +SubdirLibraryRule($(OBJS)) DependTarget() |