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