From e399356ed17baf7b50da393a3f13682b01bd14a9 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 2 Feb 2015 15:04:01 +0100 Subject: drop .original files from the current code base --- nx-X11/programs/Xserver/xkb/Imakefile.X.original | 102 ----------------------- 1 file changed, 102 deletions(-) delete mode 100644 nx-X11/programs/Xserver/xkb/Imakefile.X.original (limited to 'nx-X11/programs/Xserver/xkb/Imakefile.X.original') diff --git a/nx-X11/programs/Xserver/xkb/Imakefile.X.original b/nx-X11/programs/Xserver/xkb/Imakefile.X.original deleted file mode 100644 index a91f8ff86..000000000 --- a/nx-X11/programs/Xserver/xkb/Imakefile.X.original +++ /dev/null @@ -1,102 +0,0 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:53:45 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/Xserver/xkb/Imakefile,v 3.21 2002/12/09 23:00:42 dawes Exp $ - -#define SGIHyperOpt -#include - -#ifdef SGIArchitecture -EXTRA_ALLOC_DEFINES = -DFORCE_ALLOCA -#endif - -#if BuildXInputExt -XKBXI_SRCS = xkbPrOtherEv.c -XKBXI_OBJS = xkbPrOtherEv.o -#endif - -#ifdef DfltDisableXKB -XKB_DISABLE = -DXKB_DFLT_DISABLED=1 -#else -XKB_DISABLE = -DXKB_DFLT_DISABLED=0 -#endif - -XKB_DDXDEFS = XkbServerDefines - -#if (defined(XF86Server) && XF86Server) || (defined(XorgServer) && XorgServer) -XF86INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) - XF86_OBJS = xf86KillSrv.o xf86VT.o xf86Private.o -#endif - - DDX_SRCS = ddxBeep.c ddxCtrls.c ddxFakeBtn.c ddxFakeMtn.c ddxInit.c \ - ddxKeyClick.c ddxKillSrv.c ddxLEDs.c ddxVT.c ddxLoad.c \ - ddxList.c ddxConfig.c ddxDevBtn.c ddxPrivate.c xkbconfig.c - DDX_OBJS = ddxBeep.o ddxCtrls.o ddxFakeBtn.o ddxFakeMtn.o ddxInit.o \ - ddxKeyClick.o ddxKillSrv.o ddxLEDs.o ddxVT.o ddxLoad.o \ - ddxList.o ddxConfig.o ddxDevBtn.o ddxPrivate.o xkbconfig.o - SRCS = xkb.c xkbUtils.c xkbEvents.c xkbAccessX.c xkbSwap.c \ - xkbLEDs.c xkbInit.c xkbActions.c xkbPrKeyEv.c \ - xkmread.c xkbtext.c xkbfmisc.c xkberrs.c xkbout.c maprules.c \ - XKBMisc.c XKBMAlloc.c XKBAlloc.c XKBGAlloc.c \ - $(XKBXI_SRCS) $(DDX_SRCS) - OBJS = xkb.o xkbUtils.o xkbEvents.o xkbAccessX.o xkbSwap.o \ - xkbLEDs.o xkbInit.o xkbActions.o xkbPrKeyEv.o \ - xkmread.o xkbtext.o xkbfmisc.o xkberrs.o xkbout.o maprules.o \ - XKBMisc.o XKBMAlloc.o XKBAlloc.o XKBGAlloc.o \ - $(XKBXI_OBJS) $(DDX_OBJS) - INCLUDES = -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC) -I$(SERVERSRC)/Xext \ - -I$(SERVERSRC)/mi $(XF86INCLUDES) - LINTLIBS = ../dix/llib-ldix.ln ../os/llib-los.ln - -DEFINES = -DXKB_IN_SERVER $(EXTRA_ALLOC_DEFINES) $(XKB_DDXDEFS) -XKB_DEFINES = -DXKB_BASE_DIRECTORY=\"$(LIBDIR)/xkb\" $(XKB_DISABLE) - -NormalLibraryObjectRule() -NormalLibraryTarget(xkb,$(OBJS)) -LintLibraryTarget(xkb,$(SRCS)) -NormalLintTarget($(SRCS)) - -#if (defined(XF86Server) && XF86Server) || (defined(XorgServer) && XorgServer) -ObjectFromSpecialSource(xf86KillSrv,ddxKillSrv,-DXF86DDXACTIONS) -ObjectFromSpecialSource(xf86VT,ddxVT,-DXF86DDXACTIONS) -ObjectFromSpecialSource(xf86Private,ddxPrivate,-DXF86DDXACTIONS) -AllTarget($(XF86_OBJS)) -#endif - -SpecialCObjectRule(xkbInit,$(ICONFIGFILES),$(XKB_DEFINES)) - -LinkSourceFile(maprules.c,$(XKBFILELIBSRC)) -LinkSourceFile(xkmread.c,$(XKBFILELIBSRC)) -LinkSourceFile(xkbtext.c,$(XKBFILELIBSRC)) -XCOMM avoid clash between XKBMisc.c and xkbmisc.c on NT -LinkFile(xkbfmisc.c,$(XKBFILELIBSRC)/xkbmisc.c) -LinkSourceFile(xkberrs.c,$(XKBFILELIBSRC)) -LinkSourceFile(xkbconfig.c,$(XKBFILELIBSRC)) -LinkSourceFile(xkbout.c,$(XKBFILELIBSRC)) -LinkSourceFile(XKBMisc.c,$(XLIBSRC)) -LinkSourceFile(XKBMAlloc.c,$(XLIBSRC)) -LinkSourceFile(XKBAlloc.c,$(XLIBSRC)) -LinkSourceFile(XKBGAlloc.c,$(XLIBSRC)) - -LinkSourceFile(modinit.h,../Xext/extmod) - -#if BuildLibraries -#if UseConfDirForXkb -LinkConfDirectory(xkb,.,xkb,.) -ODIR = $(CONFDIR) -#else -ODIR = $(LIBDIR) -#endif -#ifdef VarDbDirectory -NDIR = $(VARDBDIR) -#else -NDIR = $(CONFDIR) -#endif -#if !UseConfDirForXkb || defined(VarDbDirectory) -LinkConfDirectoryLong(xkb,xkb,compiled,compiled,$(ODIR),$(NDIR)) -#endif -#endif - -DependTarget() -- cgit v1.2.3