From 80fa2403ffab3b304c632b07d91339d2b3db461f Mon Sep 17 00:00:00 2001 From: matthieu Date: Thu, 22 May 2008 06:59:23 +0000 Subject: [PATCH] More files that got added by mistake. --- driver/xf86-video-intel/man/Makefile.am.rej | 5 - driver/xf86-video-intel/man/Makefile.am~ | 63 ------ driver/xf86-video-intel/src/Makefile.am.rej | 12 -- driver/xf86-video-intel/src/Makefile.am~ | 202 -------------------- 4 files changed, 282 deletions(-) delete mode 100644 driver/xf86-video-intel/man/Makefile.am.rej delete mode 100644 driver/xf86-video-intel/man/Makefile.am~ delete mode 100644 driver/xf86-video-intel/src/Makefile.am.rej delete mode 100644 driver/xf86-video-intel/src/Makefile.am~ diff --git a/driver/xf86-video-intel/man/Makefile.am.rej b/driver/xf86-video-intel/man/Makefile.am.rej deleted file mode 100644 index eaa66506e..000000000 --- a/driver/xf86-video-intel/man/Makefile.am.rej +++ /dev/null @@ -1,5 +0,0 @@ -@@ -1,4 +1,3 @@ --# $Id: Makefile.am.rej,v 1.1 2008/05/21 20:19:51 matthieu Exp $ - # - # Copyright 2005 Sun Microsystems, Inc. All rights reserved. - # diff --git a/driver/xf86-video-intel/man/Makefile.am~ b/driver/xf86-video-intel/man/Makefile.am~ deleted file mode 100644 index c93419ab4..000000000 --- a/driver/xf86-video-intel/man/Makefile.am~ +++ /dev/null @@ -1,63 +0,0 @@ -# -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. -# -# Permission to use, copy, modify, distribute, and sell this software and its -# documentation for any purpose is hereby granted without fee, provided that -# the above copyright notice appear in all copies and that both that -# copyright notice and this permission notice appear in supporting -# documentation. -# -# The above copyright notice and this permission notice shall be included -# in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR -# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -# OTHER DEALINGS IN THE SOFTWARE. -# -# Except as contained in this notice, the name of the copyright holders shall -# not be used in advertising or otherwise to promote the sale, use or -# other dealings in this Software without prior written authorization -# from the copyright holders. -# - -drivermandir = $(DRIVER_MAN_DIR) - -DRIVER_MAN_DIR_SUFFIX = $(DRIVER_MAN_DIR:@mandir@/man%=%) - -driverman_PRE = @DRIVER_NAME@.man - -driverman_DATA = \ - $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@) \ - i810.@DRIVER_MAN_SUFFIX@ - -EXTRA_DIST = @DRIVER_NAME@.man - -CLEANFILES = $(driverman_DATA) - -SED = sed - -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -MAN_SUBSTS = \ - -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xservername__|Xorg|g' \ - -e 's|__xconfigfile__|xorg.conf|g' \ - -e 's|__projectroot__|$(prefix)|g' \ - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ - -e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \ - -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ - -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' - -SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man - -.man.$(DRIVER_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ - diff --git a/driver/xf86-video-intel/src/Makefile.am.rej b/driver/xf86-video-intel/src/Makefile.am.rej deleted file mode 100644 index c824880f2..000000000 --- a/driver/xf86-video-intel/src/Makefile.am.rej +++ /dev/null @@ -1,12 +0,0 @@ -@@ -191,6 +200,11 @@ - $(INTEL_DRI_SRCS) - endif - -+if XVMC -+intel_drv_la_SOURCES += \ -+ $(INTEL_XVMC_SRCS) -+endif -+ - install-data-local: install-intel_drv_laLTLIBRARIES - (cd $(DESTDIR)$(intel_drv_ladir) && rm -f i810_drv.so && ln -s intel_drv.so i810_drv.so) - diff --git a/driver/xf86-video-intel/src/Makefile.am~ b/driver/xf86-video-intel/src/Makefile.am~ deleted file mode 100644 index 9f1575f38..000000000 --- a/driver/xf86-video-intel/src/Makefile.am~ +++ /dev/null @@ -1,202 +0,0 @@ -# Copyright 2005 Adam Jackson. -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# on the rights to use, copy, modify, merge, publish, distribute, sub -# license, and/or sell copies of the Software, and to permit persons to whom -# the Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice (including the next -# paragraph) shall be included in all copies or substantial portions of the -# Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL -# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -if LIBPCIACCESS -REGDUMPER = reg_dumper -endif - -SUBDIRS = xvmc bios_reader ch7017 ch7xxx ivch sil164 tfp410 $(REGDUMPER) - -# this is obnoxious: -# -module lets us name the module exactly how we want -# -avoid-version prevents gratuitous .0.0.0 version numbers on the end -# _ladir passes a dummy rpath to libtool so the thing will actually link -# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc. - -AM_CFLAGS = @WARN_CFLAGS@ @XORG_CFLAGS@ @DRI_CFLAGS@ @PCIACCESS_CFLAGS@ \ - @XMODES_CFLAGS@ -DI830_XV -DI830_USE_XAA -DI830_USE_EXA - -intel_drv_la_LTLIBRARIES = intel_drv.la -intel_drv_la_LDFLAGS = -module -avoid-version -intel_drv_ladir = @moduledir@/drivers - -XMODE_SRCS=\ - local_xf86Rename.h \ - parser/xf86Parser.h \ - parser/xf86Optrec.h \ - modes/xf86Modes.h \ - modes/xf86Modes.c \ - modes/xf86cvt.c \ - modes/xf86Crtc.h \ - modes/xf86Crtc.c \ - modes/xf86Cursors.c \ - modes/xf86EdidModes.c \ - modes/xf86RandR12.c \ - modes/xf86RandR12.h \ - modes/xf86Rename.h \ - modes/xf86Rotate.c \ - modes/xf86DiDGA.c - -INTEL_DRI_SRCS = \ - i810_dri.c \ - i810_dri.h \ - i830_dri.c \ - i810_hwmc.c \ - i830_dri.h - -INTEL_XVMC_SRCS = \ - i830_hwmc.h \ - i830_hwmc.c \ - i915_hwmc.c \ - i915_hwmc.h - - -intel_drv_la_SOURCES = \ - brw_defines.h \ - brw_structs.h \ - common.h \ - i2c_vid.h \ - i810_accel.c \ - i810_common.h \ - i810_cursor.c \ - i810_dga.c \ - i810_driver.c \ - i810.h \ - i810_io.c \ - i810_memory.c \ - i810_reg.h \ - i810_ring.h \ - i810_video.c \ - i810_wmark.c \ - i830_3d.c \ - i830_accel.c \ - i830_bios.c \ - i830_bios.h \ - i830_common.h \ - i830_crt.c \ - i830_cursor.c \ - i830_debug.c \ - i830_debug.h \ - i830_display.c \ - i830_display.h \ - i830_quirks.c \ - i830_driver.c \ - i830_dvo.c \ - i830.h \ - i830_i2c.c \ - i830_io.c \ - i830_lvds.c \ - i830_memory.c \ - i830_modes.c \ - i830_video.c \ - i830_video.h \ - i830_reg.h \ - i830_ring.h \ - i830_sdvo.c \ - i830_sdvo.h \ - i830_sdvo_regs.h \ - i830_tv.c \ - i915_3d.c \ - i915_3d.h \ - i915_reg.h \ - i915_video.c \ - i965_video.c \ - i830_exa.c \ - i830_xaa.c \ - i830_render.c \ - i915_render.c \ - i965_render.c - -INTEL_G4A = \ - packed_yuv_sf.g4a \ - packed_yuv_wm.g4a \ - exa_sf.g4a \ - exa_sf_mask.g4a \ - exa_wm_src_affine.g4a \ - exa_wm_src_projective.g4a \ - exa_wm_src_sample_argb.g4a \ - exa_wm_src_sample_a.g4a \ - exa_wm_mask_affine.g4a \ - exa_wm_mask_projective.g4a \ - exa_wm_mask_sample_argb.g4a \ - exa_wm_mask_sample_a.g4a \ - exa_wm_noca.g4a \ - exa_wm_ca.g4a \ - exa_wm_ca_srcalpha.g4a \ - exa_wm_write.g4a \ - exa_wm_xy.g4a - -INTEL_G4I = \ - exa_wm.g4i \ - exa_wm_affine.g4i \ - exa_wm_projective.g4i - - -INTEL_G4B = \ - packed_yuv_sf.g4b \ - packed_yuv_wm.g4b \ - exa_sf.g4b \ - exa_sf_mask.g4b \ - exa_wm_src_affine.g4b \ - exa_wm_src_projective.g4b \ - exa_wm_src_sample_argb.g4b \ - exa_wm_src_sample_a.g4b \ - exa_wm_mask_affine.g4b \ - exa_wm_mask_projective.g4b \ - exa_wm_mask_sample_argb.g4b \ - exa_wm_mask_sample_a.g4b \ - exa_wm_noca.g4b \ - exa_wm_ca.g4b \ - exa_wm_ca_srcalpha.g4b \ - exa_wm_write.g4b \ - exa_wm_xy.g4b - -EXTRA_DIST = \ - $(XMODE_SRCS) \ - $(INTEL_G4A) \ - $(INTEL_G4I) \ - $(INTEL_G4B) \ - $(INTEL_DRI_SRCS) \ - $(INTEL_XVMC_SRCS) - -if HAVE_GEN4ASM - -SUFFIXES = .g4a .g4b -.g4a.g4b: - m4 -s $*.g4a > $*.g4m && intel-gen4asm -o $@ $*.g4m && rm $*.g4m - -$(INTEL_G4B): $(INTEL_G4I) - -BUILT_SOURCES= $(INTEL_G4B) - -clean-local: - -rm -f $(INTEL_G4B) -endif - -if XMODES -intel_drv_la_SOURCES += \ - $(XMODE_SRCS) -endif - -if DRI -intel_drv_la_SOURCES += \ - $(INTEL_DRI_SRCS) -endif -