Merge branch 'sunweaver-pr/hw-driver-cleanup' into arctica-3.6.x

Attributes GH PR #41: https://github.com/ArcticaProject/nx-libs/pull/41

6 files changed, 9 insertions, 18 deletions

diff --git a/nx-X11/programs/Xserver/GL/mesa/X/Imakefile b/nx-X11/programs/Xserver/GL/mesa/X/Imakefile
index deae53bb3..ee728b556 100644
--- a/nx-X11/programs/Xserver/GL/mesa/X/Imakefile
+++ b/nx-X11/programs/Xserver/GL/mesa/X/Imakefile
@@ -21,13 +21,6 @@ LinkSourceFile(compsize.c,$(MESASRCDIR)/src/glx/x11)
   COMMON_SRCS = driverfuncs.c
   COMMON_OBJS = driverfuncs.o
 
-#ifndef XFree86Version
-
-/* This appears to be the quickest way to build a non-XFree86 server */
-GLXSRV_DEFINES = -DXFree86Server
-
-#endif
-
      GLX_SRCS = xf86glx.c xf86glx_util.c compsize.c
      GLX_OBJS = xf86glx.o xf86glx_util.o compsize.o
 
diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile
index 5ddfb9b5e..43d49d085 100644
--- a/nx-X11/programs/Xserver/Imakefile
+++ b/nx-X11/programs/Xserver/Imakefile
@@ -34,7 +34,7 @@ XCOMM $XFree86: xc/programs/Xserver/Imakefile,v 3.296 2003/11/23 06:47:00 torrey
 #define dependLib(x)
 #endif
 
-#if (defined (XFree86Version) || defined(XorgVersion))
+#if defined(XorgVersion)
 /* Do not strip server binaries */
 INSTPGMFLAGS = 
 #endif
@@ -89,7 +89,7 @@ INSTPGMFLAGS =
 #if BuildXKB
          XKBEXT = xkb/LibraryTargetName(xkb) dependLib($(OS))
          XKBDIR = xkb
-#if (defined(XFree86Version) || defined(XorgVersion))
+#if defined(XorgVersion)
     XF86XKBOBJS = xkb/xf86KillSrv.o xkb/xf86VT.o xkb/xf86Private.o
 #endif
 #endif
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
diff --git a/nx-X11/programs/Xserver/include/Imakefile b/nx-X11/programs/Xserver/include/Imakefile
index 210067635..d68ef940c 100644
--- a/nx-X11/programs/Xserver/include/Imakefile
+++ b/nx-X11/programs/Xserver/include/Imakefile
@@ -7,7 +7,7 @@ XCOMM $XFree86: xc/programs/Xserver/include/Imakefile,v 3.21 2001/01/17 22:36:56
 
 HEADERS = os.h misc.h
 
-#if defined(XorgVersion) || defined(XFree86Version) \
+#if defined(XorgVersion) \
 	|| defined(BSDOSArchitecture)
 #if DoLoadableServer
 LinkSourceFile(xf86Module.h,$(XF86COMSRC))
diff --git a/nx-X11/programs/Xserver/mi/Imakefile b/nx-X11/programs/Xserver/mi/Imakefile
index 24caa0299..e62fb0005 100644
--- a/nx-X11/programs/Xserver/mi/Imakefile
+++ b/nx-X11/programs/Xserver/mi/Imakefile
@@ -62,7 +62,7 @@ OBJS =	$(CBRT_OBJ) mivaltree.o mipolyseg.o mipolyrect.o \
 	mipointer.o misprite.o midispcur.o miscrinit.o miclipn.o migc.o \
 	micmap.o mioverlay.o
 
-#if (defined (XFree86Version) || defined(XorgVersion))
+#if defined(XorgVersion)
 /* 
  * Make sure XINPUT, XF86VidTune, etc aren't defined for the miinitext.o 
  * used by Xnest, Xvfb 
diff --git a/nx-X11/programs/Xserver/xkb/Imakefile b/nx-X11/programs/Xserver/xkb/Imakefile
index a718545b1..2ac6fe32d 100644
--- a/nx-X11/programs/Xserver/xkb/Imakefile
+++ b/nx-X11/programs/Xserver/xkb/Imakefile
@@ -29,7 +29,7 @@ XKB_DDXDEFS = XkbServerDefines
 NX_DEFINES = -DNXAGENT_SERVER
 #endif
 
-#if (defined(XF86Server) && XF86Server) || (defined(XorgServer) && XorgServer)
+#if (defined(XorgServer) && XorgServer)
 XF86INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC)
    XF86_OBJS = xf86KillSrv.o xf86VT.o xf86Private.o
 #endif
@@ -62,7 +62,7 @@ NormalLibraryTarget(xkb,$(OBJS))
 LintLibraryTarget(xkb,$(SRCS))
 NormalLintTarget($(SRCS))
 
-#if (defined(XF86Server) && XF86Server) || (defined(XorgServer) && XorgServer)
+#if (defined(XorgServer) && XorgServer)
 ObjectFromSpecialSource(xf86KillSrv,ddxKillSrv,-DXF86DDXACTIONS)
 ObjectFromSpecialSource(xf86VT,ddxVT,-DXF86DDXACTIONS)
 ObjectFromSpecialSource(xf86Private,ddxPrivate,-DXF86DDXACTIONS)