diff options
Diffstat (limited to 'nx-X11/programs/Xserver/GL/mesa/GLcore')
-rw-r--r-- | nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile | 30 | ||||
-rw-r--r-- | nx-X11/programs/Xserver/GL/mesa/GLcore/module/Imakefile | 53 |
2 files changed, 12 insertions, 71 deletions
diff --git a/nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile b/nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile index 154a5c1a0..e3e91cdb5 100644 --- a/nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile @@ -1,12 +1,7 @@ XCOMM $XFree86: xc/programs/Xserver/GL/mesa/GLcore/Imakefile,v 1.3 2002/05/31 18:12:36 dawes Exp $ #if DoLoadableServer -#if !BuildModuleInSubdir #define IHaveModules -#elif !defined(IHaveModules) -#define IHaveSubdirs -SUBDIRS = module -#endif #endif #include <Server.tmpl> @@ -24,17 +19,17 @@ SUBDIRS = module #define MesaSlangBuildDir ../shader/slang/ #define MesaXBuildDir ../X/ -#include "../../../../../lib/GL/mesa/array_cache/Imakefile.inc" -#include "../../../../../lib/GL/mesa/swrast/Imakefile.inc" -#include "../../../../../lib/GL/mesa/swrast_setup/Imakefile.inc" -#include "../../../../../lib/GL/mesa/tnl/Imakefile.inc" -#include "../../../../../lib/GL/mesa/main/Imakefile.inc" -#include "../../../../../lib/GL/mesa/math/Imakefile.inc" -#include "../../../../../lib/GL/mesa/shader/Imakefile.inc" -#include "../../../../../lib/GL/mesa/shader/grammar/Imakefile.inc" -#include "../../../../../lib/GL/mesa/shader/slang/Imakefile.inc" -#include "../../../../../lib/GL/mesa/drivers/x11/Imakefile.inc" -#include "../../../../../lib/GL/mesa/Imakefile.inc" +#include "../array_cache/Imakefile.inc" +#include "../swrast/Imakefile.inc" +#include "../swrast_setup/Imakefile.inc" +#include "../tnl/Imakefile.inc" +#include "../main/Imakefile.inc" +#include "../math/Imakefile.inc" +#include "../shader/Imakefile.inc" +#include "../shader/grammar/Imakefile.inc" +#include "../shader/slang/Imakefile.inc" +#include "../X/Imakefile.inc" +#include "../Imakefile.inc" #ifdef IHaveModules MSRCS = GLcoremodule.c @@ -51,7 +46,7 @@ SUBDIRS = module ../shader/slang/DONE INCLUDES = -I$(INCLUDESRC) -I$(XINCLUDESRC) -I$(EXTINCSRC) \ - -I$(MESASRCDIR)/include -I$(GLXLIBSRC)/include \ + -I$(MESASRCDIR)/include \ -I$(MESASRCDIR)/src/mesa \ -I$(SERVERSRC)/include @@ -74,4 +69,3 @@ InstallDriverSDKLibraryModule(GLcore,$(DRIVERSDKMODULEDIR),extensions) MakeSubdirs($(SUBDIRS)) DependSubdirs($(SUBDIRS)) #endif - diff --git a/nx-X11/programs/Xserver/GL/mesa/GLcore/module/Imakefile b/nx-X11/programs/Xserver/GL/mesa/GLcore/module/Imakefile deleted file mode 100644 index 18dcdf0a1..000000000 --- a/nx-X11/programs/Xserver/GL/mesa/GLcore/module/Imakefile +++ /dev/null @@ -1,53 +0,0 @@ -XCOMM $XFree86: xc/programs/Xserver/GL/mesa/GLcore/Imakefile,v 1.2 2002/02/25 18:00:38 dawes Exp $ - -#define IHaveModules -#include <Server.tmpl> - -#define NeedAllMesaSrc -#define MesaInXServer -#define MesaBuildDir ../../main/module/ -#define MesaACBuildDir ../../array_cache/module/ -#define MesaMathBuildDir ../../math/module/ -#define MesaSwrastBuildDir ../../swrast/module/ -#define MesaSwrastSetupBuildDir ../../swrast_setup/module/ -#define MesaTnlBuildDir ../../tnl/module/ -#define MesaXBuildDir ../../X/module/ - -#include "../../../../../../lib/GL/mesa/array_cache/Imakefile.inc" -#include "../../../../../../lib/GL/mesa/swrast/Imakefile.inc" -#include "../../../../../../lib/GL/mesa/swrast_setup/Imakefile.inc" -#include "../../../../../../lib/GL/mesa/tnl/Imakefile.inc" -#include "../../../../../../lib/GL/mesa/math/Imakefile.inc" -#include "../../../../../../lib/GL/mesa/drivers/x11/Imakefile.inc" -#include "../../../../../../lib/GL/mesa/Imakefile.inc" - -#if DoLoadableServer - MSRCS = GLcoremodule.c - MOBJS = GLcoremodule.o -#endif - - XOBJS = ../../X/module/?*.o - - OBJS = $(COREMESAOBJS) $(MOBJS) - - DONES = ../../module/DONE ../../X/module/DONE \ - ../../array_cache/module/DONE ../../math/module/DONE \ - ../../swrast/module/DONE \ - ../../swrast_setup/module/DONE ../../tnl/module/DONE - - INCLUDES = -I$(INCLUDESRC) -I$(XINCLUDESRC) -I$(EXTINCSRC) \ - -I$(MESASRCDIR)/include -I$(GLXLIBSRC)/include \ - -I$(MESASRCDIR)/src/mesa \ - -I$(SERVERSRC)/include - - DEFINES = $(GLX_DEFINES) - -ModuleObjectRule() - -DepLibraryModuleTarget(GLcore, $(DONES) $(OBJS),$(OBJS) $(XOBJS)) -InstallLibraryModule(GLcore,$(MODULEDIR),extensions) - -InstallDriverSDKLibraryModule(GLcore,$(DRIVERSDKMODULEDIR),extensions) - -LinkSourceFile(GLcoremodule.c,..) - |