aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/Xext
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2015-06-21 10:50:31 +0200
committerMihai Moldovan <ionic@ionic.de>2015-06-21 10:50:31 +0200
commitfb2a4e4c510a80630722834f2cf408f8b731b4ef (patch)
tree3418ca9ac7561a45bae51c45dc272b61de0c5015 /nx-X11/programs/Xserver/Xext
parentcc92f77e9a3f20516de4276ecf8e178974ca1593 (diff)
parent26091f4bd6b975eaabafc042c7af50b22042e508 (diff)
downloadnx-libs-fb2a4e4c510a80630722834f2cf408f8b731b4ef.tar.gz
nx-libs-fb2a4e4c510a80630722834f2cf408f8b731b4ef.tar.bz2
nx-libs-fb2a4e4c510a80630722834f2cf408f8b731b4ef.zip
Merge branch 'sunweaver-pr/hw-driver-cleanup' into arctica-3.6.x
Attributes GH PR #41: https://github.com/ArcticaProject/nx-libs/pull/41
Diffstat (limited to 'nx-X11/programs/Xserver/Xext')
-rw-r--r--nx-X11/programs/Xserver/Xext/Imakefile8
1 files changed, 3 insertions, 5 deletions
diff --git a/nx-X11/programs/Xserver/Xext/Imakefile b/nx-X11/programs/Xserver/Xext/Imakefile
index f44edb172..eb4588e37 100644
--- a/nx-X11/programs/Xserver/Xext/Imakefile
+++ b/nx-X11/programs/Xserver/Xext/Imakefile
@@ -55,15 +55,13 @@ SUBDIRS = extmod
#endif
#if BuildXF86VidModeExt && \
- ((defined(XF86Server) && XF86Server) || \
- (defined(XorgServer) && XorgServer))
+ (defined(XorgServer) && XorgServer)
VIDMODESRCS = xf86vmode.c
VIDMODEOBJS = xf86vmode.o
#endif
#if BuildXF86MiscExt && \
- ((defined(XF86Server) && XF86Server) || \
- (defined(XorgServer) && XorgServer))
+ (defined(XorgServer) && XorgServer)
XF86MISCSRCS = xf86misc.c
XF86MISCOBJS = xf86misc.o
#endif
@@ -157,7 +155,7 @@ NX_DEFINES = -DNXAGENT_SERVER
#endif
-#if (defined(XFree86Version) || defined(XorgVersion))
+#if defined(XorgVersion)
/* XXX Check if this can be eliminated */
XF86INCLUDES = -I$(XF86COMSRC)
#endif