[xorg-commit-diffs] xc/programs/Xserver Imakefile, 1.1.4.2.2.8, 1.1.4.2.2.9

[Harold L Hunt II]

Committed by: harold

Update of /cvs/xorg/xc/programs/Xserver
In directory pdx:/tmp/cvs-serv7519

Modified Files:
      Tag: CYGWIN
	Imakefile 
Log Message:
Cleanups for the XWin targets.  Don't link XWin.exe against opengl32 since only XWin_GL.exe needs it.

Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/Imakefile,v
retrieving revision 1.1.4.2.2.8
retrieving revision 1.1.4.2.2.9
diff -u -d -r1.1.4.2.2.8 -r1.1.4.2.2.9
--- a/Imakefile	29 Mar 2004 15:45:32 -0000	1.1.4.2.2.8
+++ b/Imakefile	1 Apr 2004 18:32:59 -0000	1.1.4.2.2.9
@@ -904,13 +904,21 @@
 FBSUBDIR = fb
 SHADOWDIR = miext/shadow
 #if BuildXWinLayer
-XWINLAYERDIR = miext/layer
+LAYERDIR = miext/layer
 XWINLAYERLIB = $(LAYER)
 #else
-XWINLAYERDIR = 
+LAYERDIR = 
 XWINLAYERLIB = 
 #endif
+#if BuildXWinMultiWindowExtWM
 ROOTLESSDIR = miext/rootless
+ROOTLESSLIB = $(ROOTLESSDIR)/LibraryTargetName(rootless) \
+	      $(ROOTLESSDIR)/safeAlpha/LibraryTargetName(safeAlpha) \
+	      $(ROOTLESSDIR)/accel/LibraryTargetName(rlAccel)
+#else
+ROOTLESSDIR = 
+ROOTLESSLIB = 
+#endif
 XWINDDXDIR = hw/xwin
 #if BuildXWinXF86Config
 XWINPARSERDIR = hw/xfree86/parser
@@ -924,16 +932,14 @@
 #else
 XWINOPENGLLIB = 
 #endif
-ROOTLESSLIB = $(ROOTLESSDIR)/LibraryTargetName(rootless) \
-	      $(ROOTLESSDIR)/safeAlpha/LibraryTargetName(safeAlpha) \
-	      $(ROOTLESSDIR)/accel/LibraryTargetName(rlAccel)
+
 XWINLIB = $(XWINDDXDIR)/LibraryTargetName(XWin)
-XWINDIRS = $(STDDIRS) $(FBDIR) $(SHADOWDIR) $(XWINLAYERDIR) $(XWINDDXDIR) \
+XWINDIRS = $(STDDIRS) $(FBDIR) $(SHADOWDIR) $(LAYERDIR) $(XWINDDXDIR) \
 	   $(DEPDIRS) $(XWINPARSERDIR) $(ROOTLESSDIR)
 XWINOBJS = $(XWINDDXDIR)/stubs.o $(XWINDDXDIR)/XWin.res
 XWINLIBS = PreFbLibs $(XWINLIB) FbPostFbLibs $(XWINLIB) $(XWINLAYERLIB) \
            $(SHADOW) $(XWINPARSERLIB) $(ROOTLESSLIB)
-XWINSYSLIBS = $(FONTLIBS) $(LDPRELIBS) $(XLIB) $(SYSLIBS) $(XWINOPENGLLIB) \
+XWINSYSLIBS = $(FONTLIBS) $(LDPRELIBS) $(XLIB) $(SYSLIBS) \
               -lgdi32
 
 /*
@@ -959,7 +965,8 @@
 	     $(LIBCWRAPPER) $(XWINLIBS) $(LOADABLEEXTS),$(XWINSYSLIBS))
 #if defined(GlxUseWindows) && GlxUseWindows 
 ServerTarget(XWin_GL,$(XWINDIRS),$(XWINOBJS), \
-	     $(LIBCWRAPPER) $(XWINLIBS) $(LOADABLEEXTS),$(XWINSYSLIBS)) 
+	     $(LIBCWRAPPER) $(XWINLIBS) $(LOADABLEEXTS),$(XWINSYSLIBS) \
+	     $(XWINOPENGLLIB)) 
 #endif
 
 #ifndef ServerToInstall
@@ -1101,8 +1108,7 @@
 	  $(XVFBDDXDIR) $(XNESTDDXDIR)
 SUBDIRS = $(STDDIRS) $(MFBSUBDIR) $(CFBSUBDIRS) \
 	  $(IPLANDIRS) $(ILBMDIR) $(AFBSUBDIR) \
-          $(LMFCFBDIR) $(DDXDIRS) $(FBSUBDIR) $(KDRIVEDIRS) $(MIEXTDIRS) \
-	  $(XWINPARSERDIR)
+          $(LMFCFBDIR) $(DDXDIRS) $(FBSUBDIR) $(KDRIVEDIRS) $(MIEXTDIRS)
 
 #if  defined(ServerToInstall) && !defined(OS2Architecture)
 install::