hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-10-09 23:22:22 +00:00
Code Issues Projects Releases Wiki Activity

man: refactor common code in the man pages makefiles

Browse source 
Create a manpages.am makefile snippet in the root dir.
Each man page makefile includes manpages.am.

Now all man pages in xserver are generated the same way
using the same method as all of other xorg modules.
All ".man.pre" files in git are ".man" now.
Links are no longer created between different file types.

Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Rémi Cardona <remi@gentoo.org>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Gaetan Nadon 2011-01-09 20:28:29 -05:00 • committed by Keith Packard
commit 885a333009
13 changed files with 49 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

24
hw/xfree86/doc/man/Makefile.am
View file

@ -1,25 +1,3 @@
appmandir = $(APP_MAN_DIR)
include $(top_srcdir)/manpages.am
appman_PRE = Xorg.man
appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX))
filemandir = $(FILE_MAN_DIR)
fileman_PRE = xorg.conf.man
fileman_DATA = $(fileman_PRE:man=$(FILE_MAN_SUFFIX))
EXTRA_DIST = $(appman_PRE) $(fileman_PRE)
CLEANFILES = $(appman_DATA) $(fileman_DATA)
SUFFIXES = .$(APP_MAN_SUFFIX) .$(FILE_MAN_SUFFIX) .man
# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
MAN_SUBSTS += -e 's|__logdir__|$(logdir)|g' \
-e 's|__datadir__|$(datadir)|g' \
-e 's|__mandir__|$(mandir)|g' \
-e 's|__sysconfdir__|$(sysconfdir)|g' \
-e 's|__xconfigdir__|$(__XCONFIGDIR__)|g' \
-e 's|__xkbdir__|$(XKB_BASE_DIRECTORY)|g' \
-e 's|__modulepath__|$(DEFAULT_MODULE_PATH)|g'
.man.$(APP_MAN_SUFFIX):
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
.man.$(FILE_MAN_SUFFIX):
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@

11
hw/xfree86/exa/man/Makefile.am
View file

@ -1,11 +1,2 @@
drivermandir = $(DRIVER_MAN_DIR)
include $(top_srcdir)/manpages.am
driverman_PRE = exa.man
driverman_DATA = $(driverman_PRE:man=$(DRIVER_MAN_SUFFIX))
EXTRA_DIST = $(driverman_PRE)
CLEANFILES = $(driverman_DATA)
SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
.man.$(DRIVER_MAN_SUFFIX):
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@

11
hw/xfree86/fbdevhw/man/Makefile.am
View file

@ -1,11 +1,2 @@
drivermandir = $(DRIVER_MAN_DIR)
include $(top_srcdir)/manpages.am
driverman_PRE = fbdevhw.man
driverman_DATA = $(driverman_PRE:man=$(DRIVER_MAN_SUFFIX))
EXTRA_DIST = $(driverman_PRE)
CLEANFILES = $(driverman_DATA)
SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
.man.$(DRIVER_MAN_SUFFIX):
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@

10
hw/xfree86/utils/man/Makefile.am
View file

@ -1,10 +1,2 @@
appmandir = $(APP_MAN_DIR)
include $(top_srcdir)/manpages.am
appman_PRE = cvt.man gtf.man
appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX))
EXTRA_DIST = $(appman_PRE)
CLEANFILES = $(appman_DATA)
SUFFIXES = .$(APP_MAN_SUFFIX) .man
.man.$(APP_MAN_SUFFIX):
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@