From a13b75f056f9f9efcf6ecb8610b40ddbbb2bbb69 Mon Sep 17 00:00:00 2001 From: marha Date: Wed, 19 Jan 2011 17:29:52 +0000 Subject: xserver pixman mesa git update 19 jan 2011 --- xorg-server/hw/xfree86/fbdevhw/Makefile.am | 46 +++++++++++--------------- xorg-server/hw/xfree86/fbdevhw/fbdevhw.man.pre | 22 ------------ xorg-server/hw/xfree86/fbdevhw/man/Makefile.am | 2 ++ xorg-server/hw/xfree86/fbdevhw/man/fbdevhw.man | 22 ++++++++++++ 4 files changed, 43 insertions(+), 49 deletions(-) delete mode 100644 xorg-server/hw/xfree86/fbdevhw/fbdevhw.man.pre create mode 100644 xorg-server/hw/xfree86/fbdevhw/man/Makefile.am create mode 100644 xorg-server/hw/xfree86/fbdevhw/man/fbdevhw.man (limited to 'xorg-server/hw/xfree86/fbdevhw') diff --git a/xorg-server/hw/xfree86/fbdevhw/Makefile.am b/xorg-server/hw/xfree86/fbdevhw/Makefile.am index 076b9741f..2a038905e 100644 --- a/xorg-server/hw/xfree86/fbdevhw/Makefile.am +++ b/xorg-server/hw/xfree86/fbdevhw/Makefile.am @@ -1,27 +1,19 @@ -module_LTLIBRARIES = libfbdevhw.la - -libfbdevhw_la_LDFLAGS = -avoid-version - -if FBDEVHW -libfbdevhw_la_SOURCES = fbdevhw.c -else -libfbdevhw_la_SOURCES = fbdevhwstub.c -endif - -INCLUDES = $(XORG_INCS) -I$(srcdir)/../i2c - -AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) - -sdk_HEADERS = fbdevhw.h - -include $(top_srcdir)/cpprules.in - -drivermandir = $(DRIVER_MAN_DIR) -driverman_DATA = fbdevhw.$(DRIVER_MAN_SUFFIX) -CLEANFILES = $(driverman_DATA) fbdevhw.man - -fbdevhw.$(DRIVER_MAN_SUFFIX): fbdevhw.man - -$(AM_V_at)rm -f fbdevhw.$(DRIVER_MAN_SUFFIX) - $(AM_V_at)$(LN_S) fbdevhw.man fbdevhw.$(DRIVER_MAN_SUFFIX) - -EXTRA_DIST = fbpriv.h fbdevhw.man.pre README +SUBDIRS = man + +module_LTLIBRARIES = libfbdevhw.la + +libfbdevhw_la_LDFLAGS = -avoid-version + +if FBDEVHW +libfbdevhw_la_SOURCES = fbdevhw.c +else +libfbdevhw_la_SOURCES = fbdevhwstub.c +endif + +INCLUDES = $(XORG_INCS) -I$(srcdir)/../i2c + +AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) + +sdk_HEADERS = fbdevhw.h + +EXTRA_DIST = fbpriv.h README diff --git a/xorg-server/hw/xfree86/fbdevhw/fbdevhw.man.pre b/xorg-server/hw/xfree86/fbdevhw/fbdevhw.man.pre deleted file mode 100644 index deeced860..000000000 --- a/xorg-server/hw/xfree86/fbdevhw/fbdevhw.man.pre +++ /dev/null @@ -1,22 +0,0 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.man,v 1.1 2001/01/24 00:06:34 dawes Exp $ -.TH FBDEVHW __drivermansuffix__ __vendorversion__ -.SH NAME -fbdevhw \- os-specific submodule for framebuffer device access -.SH DESCRIPTION -.B fbdevhw -provides functions for talking to a framebuffer device. It is -os-specific. It is a submodule used by other video drivers. -A -.B fbdevhw -module is currently available for linux framebuffer devices. -.PP -fbdev(__drivermansuffix__) is a non-accelerated driver which runs on top of the -fbdevhw module. fbdevhw can be used by other drivers too, this -is usually activated with `Option "UseFBDev"' in the device section. -.SH "SEE ALSO" -__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), -xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__), -fbdev(__drivermansuffix__) -.SH AUTHORS -Authors include: Gerd Knorr, based on the XF68_FBDev Server code -(Martin Schaller, Geert Uytterhoeven). diff --git a/xorg-server/hw/xfree86/fbdevhw/man/Makefile.am b/xorg-server/hw/xfree86/fbdevhw/man/Makefile.am new file mode 100644 index 000000000..7f22a12b9 --- /dev/null +++ b/xorg-server/hw/xfree86/fbdevhw/man/Makefile.am @@ -0,0 +1,2 @@ +include $(top_srcdir)/manpages.am +driverman_PRE = fbdevhw.man diff --git a/xorg-server/hw/xfree86/fbdevhw/man/fbdevhw.man b/xorg-server/hw/xfree86/fbdevhw/man/fbdevhw.man new file mode 100644 index 000000000..fe5d1e17b --- /dev/null +++ b/xorg-server/hw/xfree86/fbdevhw/man/fbdevhw.man @@ -0,0 +1,22 @@ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.man,v 1.1 2001/01/24 00:06:34 dawes Exp $ +.TH FBDEVHW __drivermansuffix__ __vendorversion__ +.SH NAME +fbdevhw \- os-specific submodule for framebuffer device access +.SH DESCRIPTION +.B fbdevhw +provides functions for talking to a framebuffer device. It is +os-specific. It is a submodule used by other video drivers. +A +.B fbdevhw +module is currently available for linux framebuffer devices. +.PP +fbdev(__drivermansuffix__) is a non-accelerated driver which runs on top of the +fbdevhw module. fbdevhw can be used by other drivers too, this +is usually activated with `Option "UseFBDev"' in the device section. +.SH "SEE ALSO" +__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), +xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__), +fbdev(__drivermansuffix__) +.SH AUTHORS +Authors include: Gerd Knorr, based on the XF68_FBDev Server code +(Martin Schaller, Geert Uytterhoeven). -- cgit v1.2.3