[Xorg-commit] xc/programs/Xserver/hw/darwin/quartz Imakefile,1.1.4.2,1.1.4.3 quartzKeyboard.c,1.1,1.1.4.1

[Kaleb Keithley]

Committed by: kaleb

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

Modified Files:
      Tag: XORG-CURRENT
	Imakefile quartzKeyboard.c 
Log Message:
merge most of XFree86 RC3 (4.3.99.903) from vendor branch.
bug #214


Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/darwin/quartz/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
--- a/Imakefile	18 Dec 2003 19:29:12 -0000	1.1.4.2
+++ b/Imakefile	23 Feb 2004 21:35:10 -0000	1.1.4.3
@@ -1,5 +1,4 @@
-XCOMM $XdotOrg$
-XCOMM $XFree86: xc/programs/Xserver/hw/darwin/quartz/Imakefile,v 1.12 2003/11/11 01:29:47 torrey Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/darwin/quartz/Imakefile,v 1.13 2004/02/10 22:51:23 torrey Exp $
 
 #include <Server.tmpl>
 #define IHaveSubdirs
@@ -47,6 +46,12 @@
 BUILDSTYLE = -buildstyle Deployment
 #endif
 
+#if OSMajorVersion >= 7
+PROJ_TARGET = -project XDarwin.pbproj -target XDarwin
+#else
+PROJ_TARGET = -target XDarwin
+#endif
+
 #if (OSMajorVersion == 1 && OSMinorVersion >= 4) || OSMajorVersion >= 5
 QUARTZDEFINES = -DHAS_CG_MACH_PORT
 #endif
@@ -87,16 +92,16 @@
 
 AllTarget(XDarwin)
 XDarwin:
-	$(PROJ_BUILD) -target XDarwin $(BUILDSTYLE)
+	$(PROJ_BUILD) $(PROJ_TARGET) $(BUILDSTYLE)
 
 install::
-	$(PROJ_BUILD) install -target XDarwin $(BUILDSTYLE) \
+	$(PROJ_BUILD) install $(PROJ_TARGET) $(BUILDSTYLE) \
 		DSTROOT=$(DESTDIR)$(XDARWINROOT)
 
 InstallManPage(XDarwinStartup,$(MANDIR))
 
 clean::
-	$(PROJ_BUILD) "clean" -target XDarwin $(BUILDSTYLE)
+	$(PROJ_BUILD) "clean" $(PROJ_TARGET) $(BUILDSTYLE)
 
 DependTarget()
 

Index: quartzKeyboard.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/darwin/quartz/quartzKeyboard.c,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/quartzKeyboard.c	25 Nov 2003 19:28:28 -0000	1.1
+++ b/quartzKeyboard.c	23 Feb 2004 21:35:10 -0000	1.1.4.1
@@ -32,9 +32,7 @@
    promote the sale, use or other dealings in this Software without
    prior written authorization.
 */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzKeyboard.c,v 1.1 2003/11/01 08:13:08 torrey Exp $ */
-
-#ifdef HAS_KL_API
+/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzKeyboard.c,v 1.2 2004/01/19 01:22:47 torrey Exp $ */
 
 #include "quartzCommon.h"
 
@@ -45,6 +43,8 @@
 #include "keysym.h"
 #include "keysym2ucs.h"
 
+#ifdef HAS_KL_API
+
 #define HACK_MISSING 1
 #define HACK_KEYPAD 1