[Xorg-commit] xc/programs/Xserver Imakefile,1.1.4.2,1.1.4.3

[Kaleb Keithley]

Committed by: kaleb

Update of /cvs/xorg/xc/programs/Xserver
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/programs/Xserver

Modified Files:
      Tag: XORG-CURRENT
	Imakefile 
Log Message:
merge XFree86 4.3.99.901 (RC1) from vendor branch

Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/Imakefile,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- Imakefile	26 Nov 2003 22:48:40 -0000	1.1.4.2
+++ Imakefile	6 Dec 2003 13:24:23 -0000	1.1.4.3
@@ -1,8 +1,9 @@
+XCOMM $XdotOrg$
 XCOMM $Xorg: Imakefile,v 1.4 2001/03/14 18:42:02 pookie Exp $
 /*
  * Server Master Makefile
  */
-XCOMM $XFree86: xc/programs/Xserver/Imakefile,v 3.295 2003/11/07 13:45:26 tsi Exp $
+XCOMM $XFree86: xc/programs/Xserver/Imakefile,v 3.296 2003/11/23 06:47:00 torrey Exp $
 
 #ifndef InstallXserverSetUID
 #define InstallXserverSetUID NO
@@ -1287,8 +1288,8 @@
 XPRLIBS = $(QUARTZDIR)/xpr/LibraryTargetName(xpr) $(ROOTLESSLIB)
 
 BundleProgramTarget(xpr,XDarwinApp,$(XPRDIRS),$(QUARTZDIR)/xpr/xprScreen.o, \
-	$(XPRLIBS),-framework ApplicationServices $(XPLUGINLIB), \
-	$(XDARWINAPPDIR)/Resources)
+	$(XPRLIBS),-framework ApplicationServices \
+	$(XPLUGINLIB),$(XDARWINAPPDIR)/Resources)
 #endif
 
 CRDIRS = $(QUARTZDIR)/cr $(ROOTLESSDIR) $(ROOTLESSDIR)/safeAlpha
@@ -1296,7 +1297,7 @@
 
 BundleProgramTarget(cr,XDarwinApp,$(CRDIRS),$(QUARTZDIR)/cr/crScreen.o, \
 	$(CRLIBS),-framework ApplicationServices -framework Cocoa \
-	-framework Carbon -ObjC, $(XDARWINAPPDIR)/Resources)
+	-framework Carbon -ObjC,$(XDARWINAPPDIR)/Resources)
 
 FSDIRS = $(QUARTZDIR)/fullscreen $(SHADOWDIR)
 FSLIBS = $(QUARTZDIR)/fullscreen/LibraryTargetName(fullscreen) $(SHADOW)
@@ -1310,13 +1311,13 @@
  * (installed in their own bundles inside XDarwin's)
  */
 BundleProgramTarget(glxAGL,XDarwinApp,GL,GL/glx/glxext.o,GL/glx/libglx.a \
-	GL/apple/libAGLcore.a,-framework AGL -framework OpenGL, \
-	$(XDARWINAPPDIR)/Resources)
+	GL/apple/libAGLcore.a, \
+	-framework AGL -framework OpenGL,$(XDARWINAPPDIR)/Resources)
 
 #if BuildAppleDRI
 BundleProgramTarget(glxCGL,XDarwinApp,GL,GL/glx/glxext.o,GL/glx/libglx.a \
-	GL/apple/libCGLcore.a,-framework OpenGL $(XPLUGINLIB), \
-	$(XDARWINAPPDIR)/Resources)
+	GL/apple/libCGLcore.a, \
+	-framework OpenGL $(XPLUGINLIB),$(XDARWINAPPDIR)/Resources)
 #endif
 
 BundleProgramTarget(glxMesa,XDarwinApp,GL,GL/glx/glxext.o,GL/glx/libglx.a \