Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clean up man page generation and remove all traces of the i810 driver 

The i810 compatibility symlink has been broken since libpciaccess, so just
let it die.
This commit is contained in:
Rémi Cardona 2008-11-14 13:55:52 +01:00 committed by Eric Anholt
parent 48b91e0668
commit b345b4e6ad
4 changed files with 3 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
man/Makefile.am
View File

@ -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@

6
src/Makefile.am
View File

@ -220,9 +220,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)

1
src/i810.h
View File

@ -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

19
src/i810_driver.c
View File

@ -472,21 +472,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)
{
@ -681,9 +666,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;
}