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/mi/Imakefile.NX.original | 128 ----------------------- nx-X11/programs/Xserver/mi/Imakefile.X.original | 94 ----------------- 2 files changed, 222 deletions(-) delete mode 100644 nx-X11/programs/Xserver/mi/Imakefile.NX.original delete mode 100644 nx-X11/programs/Xserver/mi/Imakefile.X.original (limited to 'nx-X11/programs/Xserver/mi') diff --git a/nx-X11/programs/Xserver/mi/Imakefile.NX.original b/nx-X11/programs/Xserver/mi/Imakefile.NX.original deleted file mode 100644 index b85a9f98b..000000000 --- a/nx-X11/programs/Xserver/mi/Imakefile.NX.original +++ /dev/null @@ -1,128 +0,0 @@ -/**************************************************************************/ -/* */ -/* Copyright (c) 2001, 2011 NoMachine, http://www.nomachine.com/. */ -/* */ -/* NX-X11, NX protocol compression and NX extensions to this software */ -/* are copyright of NoMachine. Redistribution and use of the present */ -/* software is allowed according to terms specified in the file LICENSE */ -/* which comes in the source distribution. */ -/* */ -/* Check http://www.nomachine.com/licensing.html for applicability. */ -/* */ -/* NX and NoMachine are trademarks of Medialogic S.p.A. */ -/* */ -/* All rights reserved. */ -/* */ -/**************************************************************************/ - -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:53:36 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/Xserver/mi/Imakefile,v 3.34 2002/05/22 21:38:31 herrb Exp $ - -#include - -#if ! HasCbrt -CBRT_SRC = cbrt.c -CBRT_OBJ = cbrt.o -#endif - -#if HasFfs -FFS_DEFINES = -DHAS_FFS -#endif - -#if DoLoadableServer -EXTRAMIINITEXTOBJ = miinitext.o -#else -MIINITEXTSRC = miinitext.c -MIINITEXTOBJ = miinitext.o -#endif - -SRCS = $(CBRT_SRC) mivaltree.c mipolyseg.c mipolyrect.c \ - mipoly.c mipolycon.c mipolygen.c mipolyutil.c \ - mifillrct.c miwideline.c mispans.c \ - miarc.c mizerarc.c mifillarc.c \ - miwindow.c micursor.c miregion.c \ - mipolytext.c mibitblt.c mipolypnt.c mipushpxl.c \ - miexpose.c miglblt.c mizerline.c mizerclip.c mifpolycon.c \ - midash.c mibstore.c mibank.c $(MIINITEXTSRC) mieq.c \ - mipointer.c misprite.c midispcur.c miscrinit.c miclipn.c migc.c \ - micmap.c mioverlay.c - -OBJS = $(CBRT_OBJ) mivaltree.o mipolyseg.o mipolyrect.o \ - mipoly.o mipolycon.o mipolygen.o mipolyutil.o \ - mifillrct.o miwideline.o mispans.o \ - miarc.o mizerarc.o mifillarc.o \ - miwindow.o micursor.o miregion.o \ - mipolytext.o mibitblt.o mipolypnt.o mipushpxl.o \ - miexpose.o miglblt.o mizerline.o mizerclip.o mifpolycon.o \ - midash.o mibstore.o mibank.o $(MIINITEXTOBJ) mieq.o \ - mipointer.o misprite.o midispcur.o miscrinit.o miclipn.o migc.o \ - micmap.o mioverlay.o - -#if (defined (XFree86Version) || defined(XorgVersion)) -/* - * Make sure XINPUT, XF86VidTune, etc aren't defined for the miinitext.o - * used by Xnest, Xvfb - */ - -#if NXLibraries - -/* - * To build the NX agent we need the XINPUT symbol - * in order to build the XInputExtension, since we - * don't use the XF86 module loader. - */ - -EXT_DEFINES = ExtensionDefines -UXF86VIDMODE -UXFreeXDGA -UXF86MISC \ - -UXFree86LOADER - -#else - -EXT_DEFINES = ExtensionDefines -UXINPUT -UXF86VIDMODE -UXFreeXDGA -UXF86MISC \ - -UXFree86LOADER - -#endif - -#endif - -INCLUDES = -I. -I../include -I../../../include/fonts -I../render \ - -I../xfixes -I../damageext -I../miext/damage \ - -I$(XINCLUDESRC) -I$(FONTINCSRC) -I$(EXTINCSRC) -I$(SERVERSRC)/Xext -LINTLIBS = ../dix/llib-ldix.ln ../os/llib-los.ln -DEFINES = $(FFS_DEFINES) - -NormalLibraryObjectRule() -NormalLibraryTarget(mi,$(OBJS)) -LintLibraryTarget(mi,$(SRCS)) -NormalLintTarget($(SRCS)) - -#ifndef Win32Architecture -NormalLibraryTarget(cbrt,cbrt.o) -#endif - -SpecialCObjectRule(miinitext,$(ICONFIGFILES),$(EXT_DEFINES)) -SpecialCObjectRule(miscrinit,$(ICONFIGFILES),$(EXT_DEFINES)) -#ifdef ItsyCompilerBug -SpecialCObjectRule(mipolycon,$(_NOOP_),-O0) -#endif -#if defined(OpenBSDArchitecture) && defined(Sparc64Architecture) -SpecialCObjectRule(mizerclip,NullParameter,-O0) -#endif - -AllTarget($(EXTRAMIINITEXTOBJ)) - -DependTarget() - -InstallDriverSDKNonExecFile(mi.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(mibank.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(mibstore.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(micmap.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(migc.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(miline.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(mipointer.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(mipointrst.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(mizerarc.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(micoord.h,$(DRIVERSDKINCLUDEDIR)) diff --git a/nx-X11/programs/Xserver/mi/Imakefile.X.original b/nx-X11/programs/Xserver/mi/Imakefile.X.original deleted file mode 100644 index a6a3c97fa..000000000 --- a/nx-X11/programs/Xserver/mi/Imakefile.X.original +++ /dev/null @@ -1,94 +0,0 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:53:36 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/Xserver/mi/Imakefile,v 3.34 2002/05/22 21:38:31 herrb Exp $ - -#include - -#if ! HasCbrt -CBRT_SRC = cbrt.c -CBRT_OBJ = cbrt.o -#endif - -#if HasFfs -FFS_DEFINES = -DHAS_FFS -#endif - -#if DoLoadableServer -EXTRAMIINITEXTOBJ = miinitext.o -#else -MIINITEXTSRC = miinitext.c -MIINITEXTOBJ = miinitext.o -#endif - -SRCS = $(CBRT_SRC) mivaltree.c mipolyseg.c mipolyrect.c \ - mipoly.c mipolycon.c mipolygen.c mipolyutil.c \ - mifillrct.c miwideline.c mispans.c \ - miarc.c mizerarc.c mifillarc.c \ - miwindow.c micursor.c miregion.c \ - mipolytext.c mibitblt.c mipolypnt.c mipushpxl.c \ - miexpose.c miglblt.c mizerline.c mizerclip.c mifpolycon.c \ - midash.c mibstore.c mibank.c $(MIINITEXTSRC) mieq.c \ - mipointer.c misprite.c midispcur.c miscrinit.c miclipn.c migc.c \ - micmap.c mioverlay.c - -OBJS = $(CBRT_OBJ) mivaltree.o mipolyseg.o mipolyrect.o \ - mipoly.o mipolycon.o mipolygen.o mipolyutil.o \ - mifillrct.o miwideline.o mispans.o \ - miarc.o mizerarc.o mifillarc.o \ - miwindow.o micursor.o miregion.o \ - mipolytext.o mibitblt.o mipolypnt.o mipushpxl.o \ - miexpose.o miglblt.o mizerline.o mizerclip.o mifpolycon.o \ - midash.o mibstore.o mibank.o $(MIINITEXTOBJ) mieq.o \ - mipointer.o misprite.o midispcur.o miscrinit.o miclipn.o migc.o \ - micmap.o mioverlay.o - -#if (defined (XFree86Version) || defined(XorgVersion)) -/* - * Make sure XINPUT, XF86VidTune, etc aren't defined for the miinitext.o - * used by Xnest, Xvfb - */ -EXT_DEFINES = ExtensionDefines -UXINPUT -UXF86VIDMODE -UXFreeXDGA -UXF86MISC \ - -UXFree86LOADER -#endif - -INCLUDES = -I. -I../include -I../../../include/fonts -I../render \ - -I../xfixes -I../damageext -I../miext/damage \ - -I$(XINCLUDESRC) -I$(FONTINCSRC) -I$(EXTINCSRC) -I$(SERVERSRC)/Xext -LINTLIBS = ../dix/llib-ldix.ln ../os/llib-los.ln -DEFINES = $(FFS_DEFINES) - -NormalLibraryObjectRule() -NormalLibraryTarget(mi,$(OBJS)) -LintLibraryTarget(mi,$(SRCS)) -NormalLintTarget($(SRCS)) - -#ifndef Win32Architecture -NormalLibraryTarget(cbrt,cbrt.o) -#endif - -SpecialCObjectRule(miinitext,$(ICONFIGFILES),$(EXT_DEFINES)) -SpecialCObjectRule(miscrinit,$(ICONFIGFILES),$(EXT_DEFINES)) -#ifdef ItsyCompilerBug -SpecialCObjectRule(mipolycon,$(_NOOP_),-O0) -#endif -#if defined(OpenBSDArchitecture) && defined(Sparc64Architecture) -SpecialCObjectRule(mizerclip,NullParameter,-O0) -#endif - -AllTarget($(EXTRAMIINITEXTOBJ)) - -DependTarget() - -InstallDriverSDKNonExecFile(mi.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(mibank.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(mibstore.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(micmap.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(migc.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(miline.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(mipointer.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(mipointrst.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(mizerarc.h,$(DRIVERSDKINCLUDEDIR)) -InstallDriverSDKNonExecFile(micoord.h,$(DRIVERSDKINCLUDEDIR)) -- cgit v1.2.3