aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-04-10 02:37:19 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-06-25 00:39:27 +0200
commitb4e2ec70982358cfc0ad939367dcbfc1bc3b519b (patch)
tree16d1b0f38c9ffc9100f959565ae00436c8262f93
parent0c29f81f1bbd3c507c847ce4460d316478083213 (diff)
downloadnx-libs-b4e2ec70982358cfc0ad939367dcbfc1bc3b519b.tar.gz
nx-libs-b4e2ec70982358cfc0ad939367dcbfc1bc3b519b.tar.bz2
nx-libs-b4e2ec70982358cfc0ad939367dcbfc1bc3b519b.zip
Xserver/GL/glx/Imakefile: Serialize parameters and make Imakefile changes more trackable.
-rw-r--r--nx-X11/programs/Xserver/GL/glx/Imakefile105
1 files changed, 82 insertions, 23 deletions
diff --git a/nx-X11/programs/Xserver/GL/glx/Imakefile b/nx-X11/programs/Xserver/GL/glx/Imakefile
index bf2d760a0..5683cf51c 100644
--- a/nx-X11/programs/Xserver/GL/glx/Imakefile
+++ b/nx-X11/programs/Xserver/GL/glx/Imakefile
@@ -1,5 +1,7 @@
XCOMM $XFree86: xc/programs/Xserver/GL/glx/Imakefile,v 1.11 2004/01/28 18:11:50 alanh Exp $
+NULL =
+
#if DoLoadableServer
# if !BuildModuleInSubdir
# define IHaveModules
@@ -22,29 +24,86 @@ LinkSourceFile(glcontextmodes.h, $(MESASRCDIR)/src/mesa/drivers/dri/common)
LinkSourceFile(indirect_size.c, $(MESASRCDIR)/src/glx/x11)
LinkSourceFile(indirect_size.h, $(MESASRCDIR)/src/glx/x11)
- SRCS = global.c glxbuf.c glxcmds.c glxcmdsswap.c glxext.c \
- glxfb.c glximports.c glxmem.c glxpix.c glxscreens.c \
- glxutil.c render2.c render2swap.c renderpix.c \
- renderpixswap.c rensize.c rensizetab.c single2.c \
- single2swap.c singlepix.c singlepixswap.c \
- singlesize.c xfont.c g_disptab.c g_disptab_EXT.c \
- g_render.c g_renderswap.c g_single.c g_singleswap.c \
- glcontextmodes.c indirect_size.c $(MSRCS)
-
- OBJS = global.o glxbuf.o glxcmds.o glxcmdsswap.o glxext.o \
- glxfb.o glximports.o glxmem.o glxpix.o glxscreens.o \
- glxutil.o render2.o render2swap.o renderpix.o \
- renderpixswap.o rensize.o rensizetab.o single2.o \
- single2swap.o singlepix.o singlepixswap.o \
- singlesize.o xfont.o g_disptab.o g_disptab_EXT.o \
- g_render.o g_renderswap.o g_single.o g_singleswap.o \
- glcontextmodes.o indirect_size.o $(MOBJS)
-
- INCLUDES = -I$(SERVERSRC)/GL/glx -I$(SERVERSRC)/GL/include -I$(SERVERSRC)/include -I$(INCLUDESRC) -I$(MESASRCDIR)/include \
- -I$(XINCLUDESRC) -I$(SERVERSRC)/mi \
- -I$(EXTINCSRC) -I$(LIBSRC)/GL/include \
- -I$(XF86SRC) \
- `pkg-config --cflags-only-I pixman-1`
+ SRCS = global.c \
+ glxbuf.c \
+ glxcmds.c \
+ glxcmdsswap.c \
+ glxext.c \
+ glxfb.c \
+ glximports.c \
+ glxmem.c \
+ glxpix.c \
+ glxscreens.c \
+ glxutil.c \
+ render2.c \
+ render2swap.c \
+ renderpix.c \
+ renderpixswap.c \
+ rensize.c \
+ rensizetab.c \
+ single2.c \
+ single2swap.c \
+ singlepix.c \
+ singlepixswap.c \
+ singlesize.c \
+ xfont.c \
+ g_disptab.c \
+ g_disptab_EXT.c \
+ g_render.c \
+ g_renderswap.c \
+ g_single.c \
+ g_singleswap.c \
+ glcontextmodes. c \
+ indirect_size.c \
+ $(MSRCS) \
+ $(NULL)
+
+ OBJS = global.o \
+ glxbuf.o \
+ glxcmds.o \
+ glxcmdsswap.o \
+ glxext.o \
+ glxfb.o \
+ glximports.o \
+ glxmem.o \
+ glxpix.o \
+ glxscreens.o \
+ glxutil.o \
+ render2.o \
+ render2swap.o \
+ renderpix.o \
+ renderpixswap.o \
+ rensize.o \
+ rensizetab.o \
+ single2.o \
+ single2swap.o \
+ singlepix.o \
+ singlepixswap.o \
+ singlesize.o \
+ xfont.o \
+ g_disptab.o \
+ g_disptab_EXT.o \
+ g_render.o \
+ g_renderswap.o \
+ g_single.o \
+ g_singleswap.o \
+ glcontextmodes.o \
+ indirect_size.o \
+ $(MOBJS) \
+ $(NULL)
+
+ INCLUDES = -I$(SERVERSRC)/GL/glx \
+ -I$(SERVERSRC)/GL/include \
+ -I$(SERVERSRC)/include \
+ -I$(INCLUDESRC) \
+ -I$(MESASRCDIR)/include \
+ -I$(XINCLUDESRC) \
+ -I$(SERVERSRC)/mi \
+ -I$(EXTINCSRC) \
+ -I$(LIBSRC)/GL/include \
+ -I$(XF86SRC) \
+ `pkg-config --cflags-only-I pixman-1` \
+ $(NULL)
#if defined(DarwinArchitecture) && ((OSMajorVersion == 6 && OSMinorVersion < 3) || OSMajorVersion < 6)
NO_EXT_DEFS = -DMISSING_GL_EXTS