aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/GL/mesa/shader/grammar
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2015-06-16 23:58:50 +0200
committerMihai Moldovan <ionic@ionic.de>2015-06-16 23:58:50 +0200
commit51b60ea7a1eaf1983c6a0d8095bf187a5f100f8b (patch)
tree567c82168ede70dfc7532e93be9bc61159fb9753 /nx-X11/programs/Xserver/GL/mesa/shader/grammar
parent5a64974cc5f0e9001cb0ddba4cb2c956ba43f7df (diff)
parent5cd80d272ba366686a3b28c5915cb5bf3ada8985 (diff)
downloadnx-libs-51b60ea7a1eaf1983c6a0d8095bf187a5f100f8b.tar.gz
nx-libs-51b60ea7a1eaf1983c6a0d8095bf187a5f100f8b.tar.bz2
nx-libs-51b60ea7a1eaf1983c6a0d8095bf187a5f100f8b.zip
Merge branch 'sunweaver-pr/libglx-cleanup' into arctica-3.6.x
Attributes GH PR #40: https://github.com/ArcticaProject/nx-libs/pull/40
Diffstat (limited to 'nx-X11/programs/Xserver/GL/mesa/shader/grammar')
-rw-r--r--nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile12
-rw-r--r--nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile.inc25
2 files changed, 26 insertions, 11 deletions
diff --git a/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile b/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile
index c16b3ddad..56cfb4bc9 100644
--- a/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile
+++ b/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile
@@ -1,10 +1,5 @@
#if DoLoadableServer
-#if !BuildModuleInSubdir
#define IHaveModules
-#elif !defined(IHaveModules)
-#define IHaveSubdirs
-SUBDIRS = module
-#endif
#endif
#include <Server.tmpl>
@@ -12,11 +7,7 @@ SUBDIRS = module
#define NeedAllMesaSrc
#define NeedToLinkMesaSrc
#define MesaGrammarBuildDir /**/
-#if !defined(IHaveModules) || !BuildModuleInSubdir
-#include "../../../../../../lib/GL/mesa/shader/grammar/Imakefile.inc"
-#else
-#include "../../../../../../../lib/GL/mesa/shader/grammar/Imakefile.inc"
-#endif
+#include "Imakefile.inc"
SRCS = $(MESA_GRAMMAR_SRCS)
OBJS = $(MESA_GRAMMAR_OBJS)
@@ -42,7 +33,6 @@ NormalLibraryObjectRule()
SubdirLibraryRule($(OBJS))
-LintLibraryTarget(dri,$(SRCS))
NormalLintTarget($(SRCS))
DependTarget()
diff --git a/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile.inc
new file mode 100644
index 000000000..e1196201d
--- /dev/null
+++ b/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile.inc
@@ -0,0 +1,25 @@
+XCOMM $XFree86$
+
+MESAGRAMMARBUILDDIR=MesaGrammarBuildDir
+
+ MESA_GRAMMAR_SRCS = $(MESAGRAMMARBUILDDIR)grammar_mesa.c
+
+#ifdef NeedToLinkMesaSrc
+LinkSourceFile(grammar.c, $(MESASRCDIR)/src/mesa/shader/grammar)
+LinkSourceFile(grammar.h, $(MESASRCDIR)/src/mesa/shader/grammar)
+LinkSourceFile(grammar_syn.h, $(MESASRCDIR)/src/mesa/shader/grammar)
+LinkSourceFile(grammar_mesa.c, $(MESASRCDIR)/src/mesa/shader/grammar)
+LinkSourceFile(grammar_mesa.h, $(MESASRCDIR)/src/mesa/shader/grammar)
+#endif
+
+ MESA_GRAMMAR_OBJS = $(MESAGRAMMARBUILDDIR)grammar_mesa.o
+
+#if defined(DoSharedLib) && DoSharedLib
+ MESA_GRAMMAR_UOBJS = $(MESAGRAMMARBUILDDIR)unshared/grammar_mesa.o
+#else
+ MESA_GRAMMAR_UOBJS = $(MESA_GRAMMAR_OBJS)
+#endif
+
+ MESA_GRAMMAR_DOBJS = $(MESAGRAMMARBUILDDIR)debugger/grammar_mesa.o
+
+ MESA_GRAMMAR_POBJS = $(MESAGRAMMARBUILDDIR)profiled/grammar_mesa.o