git.tremily.us Git - gentoo.git/blob

   1 From 63ca3cc11b28f328aafc4564f5df51698e09a7d3 Mon Sep 17 00:00:00 2001
   2 From: =?utf-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org>
   3 Date: Fri, 14 Nov 2008 13:55:52 +0100
   4 Subject: [PATCH] clean up man page generation and remove all traces of the i810 driver
   5
   6 ---
   7  man/Makefile.am   |   20 ++------------------
   8  src/Makefile.am   |    6 ------
   9  src/i810.h        |    1 -
  10  src/i810_driver.c |   19 +------------------
  11  4 files changed, 3 insertions(+), 43 deletions(-)
  12
  13 diff --git a/man/Makefile.am b/man/Makefile.am
  14 index 7432d5a..ac08621 100644
  15 --- a/man/Makefile.am
  16 +++ b/man/Makefile.am
  17 @@ -25,21 +25,12 @@
  18  #
  19
  20  drivermandir = $(DRIVER_MAN_DIR)
  21 +driverman_DATA = $(DRIVER_NAME).$(DRIVER_MAN_SUFFIX)
  22
  23 -DRIVER_MAN_DIR_SUFFIX = $(DRIVER_MAN_DIR:@mandir@/man%=%)
  24 -
  25 -driverman_PRE = @DRIVER_NAME@.man
  26 -
  27 -driverman_DATA = \
  28 -       $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@) \
  29 -       i810.@DRIVER_MAN_SUFFIX@
  30 -
  31 -EXTRA_DIST = @DRIVER_NAME@.man
  32 +EXTRA_DIST = $(DRIVER_NAME).man
  33
  34  CLEANFILES = $(driverman_DATA)
  35
  36 -SED = sed
  37 -
  38  # Strings to replace in man pages
  39  XORGRELSTRING = @PACKAGE_STRING@
  40    XORGMANNAME = X Version 11
  41 @@ -60,10 +51,3 @@ SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
  42
  43  .man.$(DRIVER_MAN_SUFFIX):
  44         sed $(MAN_SUBSTS) < $< > $@
  45 -
  46 -BUILT_SOURCES = shadows.DONE
  47 -
  48 -shadows.DONE:
  49 -       -rm -f i810.@DRIVER_MAN_SUFFIX@
  50 -       echo .so man$(DRIVER_MAN_DIR_SUFFIX)/intel.$(DRIVER_MAN_SUFFIX) > \
  51 -               i810.@DRIVER_MAN_SUFFIX@
  52 diff --git a/src/Makefile.am b/src/Makefile.am
  53 index 232ac53..8e3cfad 100644
  54 --- a/src/Makefile.am
  55 +++ b/src/Makefile.am
  56 @@ -222,9 +222,3 @@ if XVMC
  57  intel_drv_la_SOURCES += \
  58         $(INTEL_XVMC_SRCS)
  59  endif
  60 -
  61 -install-data-local: install-intel_drv_laLTLIBRARIES
  62 -       (cd $(DESTDIR)$(intel_drv_ladir) && rm -f i810_drv.so && ln -s intel_drv.so i810_drv.so)
  63 -
  64 -uninstall-local:
  65 -       (cd $(DESTDIR)$(intel_drv_ladir) && rm -f i810_drv.so)
  66 diff --git a/src/i810.h b/src/i810.h
  67 index 7ea2043..c88771e 100644
  68 --- a/src/i810.h
  69 +++ b/src/i810.h
  70 @@ -70,7 +70,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  71  #define I810_VERSION 4000
  72  #define I810_NAME "intel"
  73  #define I810_DRIVER_NAME "intel"
  74 -#define I810_LEGACY_DRIVER_NAME "i810"
  75
  76  #define INTEL_VERSION_MAJOR PACKAGE_VERSION_MAJOR
  77  #define INTEL_VERSION_MINOR PACKAGE_VERSION_MINOR
  78 diff --git a/src/i810_driver.c b/src/i810_driver.c
  79 index cc28ad8..404789d 100644
  80 --- a/src/i810_driver.c
  81 +++ b/src/i810_driver.c
  82 @@ -466,21 +466,6 @@ static XF86ModuleVersionInfo intelVersRec = {
  83
  84  _X_EXPORT XF86ModuleData intelModuleData = { &intelVersRec, i810Setup, NULL };
  85
  86 -static XF86ModuleVersionInfo i810VersRec = {
  87 -   "i810",
  88 -   MODULEVENDORSTRING,
  89 -   MODINFOSTRING1,
  90 -   MODINFOSTRING2,
  91 -   XORG_VERSION_CURRENT,
  92 -   INTEL_VERSION_MAJOR, INTEL_VERSION_MINOR, INTEL_VERSION_PATCH,
  93 -   ABI_CLASS_VIDEODRV,
  94 -   ABI_VIDEODRV_VERSION,
  95 -   MOD_CLASS_VIDEODRV,
  96 -   {0, 0, 0, 0}
  97 -};
  98 -
  99 -_X_EXPORT XF86ModuleData i810ModuleData = { &i810VersRec, i810Setup, NULL };
 100 -
 101  static pointer
 102  i810Setup(pointer module, pointer opts, int *errmaj, int *errmin)
 103  {
 104 @@ -715,9 +700,7 @@ I810Probe(DriverPtr drv, int flags)
 105      * driver, and return if there are none.
 106      */
 107     if ((numDevSections =
 108 -       xf86MatchDevice(I810_DRIVER_NAME, &devSections)) <= 0 &&
 109 -       (numDevSections =
 110 -       xf86MatchDevice(I810_LEGACY_DRIVER_NAME, &devSections)) <= 0) {
 111 +       xf86MatchDevice(I810_DRIVER_NAME, &devSections)) <= 0 ) {
 112        return FALSE;
 113     }
 114
 115 --
 116 1.6.0.3
 117