[xorg-commit-diffs] xc/programs/Xserver/xkb Imakefile, 1.1.4.2.6.1, 1.1.4.2.6.1.6.1

[Roland Mainz]

Committed by: gisburn

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

Modified Files:
      Tag: XPRINT
	Imakefile 
Log Message:
Resync to 2004-04-10 XORG-RELEASE-1 branch

Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/xkb/Imakefile,v
retrieving revision 1.1.4.2.6.1
retrieving revision 1.1.4.2.6.1.6.1
diff -u -d -r1.1.4.2.6.1 -r1.1.4.2.6.1.6.1
--- a/Imakefile	4 Mar 2004 17:48:45 -0000	1.1.4.2.6.1
+++ b/Imakefile	10 Apr 2004 09:05:46 -0000	1.1.4.2.6.1.6.1
@@ -25,7 +25,7 @@
 
 XKB_DDXDEFS = XkbServerDefines
 
-#if XF86Server
+#if XF86Server || XorgServer
 XF86INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC)
    XF86_OBJS = xf86KillSrv.o xf86VT.o xf86Private.o
 #endif
@@ -58,7 +58,7 @@
 LintLibraryTarget(xkb,$(SRCS))
 NormalLintTarget($(SRCS))
 
-#if XF86Server
+#if XF86Server || XorgServer
 ObjectFromSpecialSource(xf86KillSrv,ddxKillSrv,-DXF86DDXACTIONS)
 ObjectFromSpecialSource(xf86VT,ddxVT,-DXF86DDXACTIONS)
 ObjectFromSpecialSource(xf86Private,ddxPrivate,-DXF86DDXACTIONS)