man: refactor common code in the man pages makefiles

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>

4 files changed, 4 insertions, 52 deletions

diff --git a/hw/xfree86/doc/man/Makefile.am b/hw/xfree86/doc/man/Makefile.am
index 4fbc878c8..fe330a72c 100644
--- a/hw/xfree86/doc/man/Makefile.am
+++ b/hw/xfree86/doc/man/Makefile.am
@@ -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) < $< > $@
diff --git a/hw/xfree86/exa/man/Makefile.am b/hw/xfree86/exa/man/Makefile.am
index db287db9b..51da4fd50 100644
--- a/hw/xfree86/exa/man/Makefile.am
+++ b/hw/xfree86/exa/man/Makefile.am
@@ -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) < $< > $@
diff --git a/hw/xfree86/fbdevhw/man/Makefile.am b/hw/xfree86/fbdevhw/man/Makefile.am
index 5da5c5553..7f22a12b9 100644
--- a/hw/xfree86/fbdevhw/man/Makefile.am
+++ b/hw/xfree86/fbdevhw/man/Makefile.am
@@ -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) < $< > $@
diff --git a/hw/xfree86/utils/man/Makefile.am b/hw/xfree86/utils/man/Makefile.am
index fd2af8ed6..7afc5bcca 100644
--- a/hw/xfree86/utils/man/Makefile.am
+++ b/hw/xfree86/utils/man/Makefile.am
@@ -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) < $< > $@