From 247ad2a3865ba503e6c77444f855c71e7a210f13 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Tue, 17 Aug 2010 07:57:08 -0400 Subject: man: store shadow man pages in git rather than generating them Simplify the build process and the makefile. Local fix in CVS for bug 5628 is not required as the problem has been fixed in util-macros d9062e4077ebfd0985baf8418f3d0f111b9ddbba Signed-off-by: Gaetan Nadon --- man/Makefile.am | 55 +++++++++++++++-------------------- man/XRRConfigCurrentConfiguration.man | 1 + man/XRRConfigCurrentRate.man | 1 + man/XRRConfigRates.man | 1 + man/XRRConfigRotations.man | 1 + man/XRRConfigSizes.man | 1 + man/XRRConfigTimes.man | 1 + man/XRRFreeScreenConfigInfo.man | 1 + man/XRRGetScreenInfo.man | 1 + man/XRRQueryExtension.man | 1 + man/XRRQueryVersion.man | 1 + man/XRRRootToScreen.man | 1 + man/XRRSelectInput.man | 1 + man/XRRSetScreenConfig.man | 1 + man/XRRSetScreenConfigAndRate.man | 1 + 15 files changed, 37 insertions(+), 32 deletions(-) create mode 100644 man/XRRConfigCurrentConfiguration.man create mode 100644 man/XRRConfigCurrentRate.man create mode 100644 man/XRRConfigRates.man create mode 100644 man/XRRConfigRotations.man create mode 100644 man/XRRConfigSizes.man create mode 100644 man/XRRConfigTimes.man create mode 100644 man/XRRFreeScreenConfigInfo.man create mode 100644 man/XRRGetScreenInfo.man create mode 100644 man/XRRQueryExtension.man create mode 100644 man/XRRQueryVersion.man create mode 100644 man/XRRRootToScreen.man create mode 100644 man/XRRSelectInput.man create mode 100644 man/XRRSetScreenConfig.man create mode 100644 man/XRRSetScreenConfigAndRate.man diff --git a/man/Makefile.am b/man/Makefile.am index 7370502..5e7f29c 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -23,42 +23,33 @@ libmandir = $(LIB_MAN_DIR) -LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%) - -libman_PRE = Xrandr.man - -libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \ - $(Xrandr_shadowmen) - -BUILT_SOURCES = $(Xrandr_shadowmen) +libman_PRE = \ + Xrandr.man \ + $(Xrandr_shadows:=.man) + +Xrandr_shadows = \ + XRRQueryExtension \ + XRRQueryVersion \ + XRRGetScreenInfo \ + XRRFreeScreenConfigInfo \ + XRRSetScreenConfig \ + XRRSetScreenConfigAndRate \ + XRRConfigRotations \ + XRRConfigTimes \ + XRRConfigSizes \ + XRRConfigRates \ + XRRConfigCurrentConfiguration \ + XRRConfigCurrentRate \ + XRRRootToScreen \ + XRRSelectInput + +libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) EXTRA_DIST = $(libman_PRE) - -CLEANFILES = $(libman_DATA) $(BUILT_SOURCES) +CLEANFILES = $(libman_DATA) SUFFIXES = .$(LIB_MAN_SUFFIX) .man +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure .man.$(LIB_MAN_SUFFIX): $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ - -# Generate man page shadow files (Replaces InstallManPageAliases from Imake) - -Xrandr_shadows = \ - XRRQueryExtension \ - XRRQueryVersion \ - XRRGetScreenInfo \ - XRRFreeScreenConfigInfo \ - XRRSetScreenConfig \ - XRRSetScreenConfigAndRate \ - XRRConfigRotations \ - XRRConfigTimes \ - XRRConfigSizes \ - XRRConfigRates \ - XRRConfigCurrentConfiguration \ - XRRConfigCurrentRate \ - XRRRootToScreen \ - XRRSelectInput - -Xrandr_shadowmen = $(Xrandr_shadows:=.@LIB_MAN_SUFFIX@) -$(Xrandr_shadowmen): - $(AM_V_GEN)echo ".so man$(LIB_MAN_DIR_SUFFIX)/Xrandr.$(LIB_MAN_SUFFIX)" > $@ diff --git a/man/XRRConfigCurrentConfiguration.man b/man/XRRConfigCurrentConfiguration.man new file mode 100644 index 0000000..e02ca38 --- /dev/null +++ b/man/XRRConfigCurrentConfiguration.man @@ -0,0 +1 @@ +.so man__libmansuffix__/Xrandr.__libmansuffix__ diff --git a/man/XRRConfigCurrentRate.man b/man/XRRConfigCurrentRate.man new file mode 100644 index 0000000..e02ca38 --- /dev/null +++ b/man/XRRConfigCurrentRate.man @@ -0,0 +1 @@ +.so man__libmansuffix__/Xrandr.__libmansuffix__ diff --git a/man/XRRConfigRates.man b/man/XRRConfigRates.man new file mode 100644 index 0000000..e02ca38 --- /dev/null +++ b/man/XRRConfigRates.man @@ -0,0 +1 @@ +.so man__libmansuffix__/Xrandr.__libmansuffix__ diff --git a/man/XRRConfigRotations.man b/man/XRRConfigRotations.man new file mode 100644 index 0000000..e02ca38 --- /dev/null +++ b/man/XRRConfigRotations.man @@ -0,0 +1 @@ +.so man__libmansuffix__/Xrandr.__libmansuffix__ diff --git a/man/XRRConfigSizes.man b/man/XRRConfigSizes.man new file mode 100644 index 0000000..e02ca38 --- /dev/null +++ b/man/XRRConfigSizes.man @@ -0,0 +1 @@ +.so man__libmansuffix__/Xrandr.__libmansuffix__ diff --git a/man/XRRConfigTimes.man b/man/XRRConfigTimes.man new file mode 100644 index 0000000..e02ca38 --- /dev/null +++ b/man/XRRConfigTimes.man @@ -0,0 +1 @@ +.so man__libmansuffix__/Xrandr.__libmansuffix__ diff --git a/man/XRRFreeScreenConfigInfo.man b/man/XRRFreeScreenConfigInfo.man new file mode 100644 index 0000000..e02ca38 --- /dev/null +++ b/man/XRRFreeScreenConfigInfo.man @@ -0,0 +1 @@ +.so man__libmansuffix__/Xrandr.__libmansuffix__ diff --git a/man/XRRGetScreenInfo.man b/man/XRRGetScreenInfo.man new file mode 100644 index 0000000..e02ca38 --- /dev/null +++ b/man/XRRGetScreenInfo.man @@ -0,0 +1 @@ +.so man__libmansuffix__/Xrandr.__libmansuffix__ diff --git a/man/XRRQueryExtension.man b/man/XRRQueryExtension.man new file mode 100644 index 0000000..e02ca38 --- /dev/null +++ b/man/XRRQueryExtension.man @@ -0,0 +1 @@ +.so man__libmansuffix__/Xrandr.__libmansuffix__ diff --git a/man/XRRQueryVersion.man b/man/XRRQueryVersion.man new file mode 100644 index 0000000..e02ca38 --- /dev/null +++ b/man/XRRQueryVersion.man @@ -0,0 +1 @@ +.so man__libmansuffix__/Xrandr.__libmansuffix__ diff --git a/man/XRRRootToScreen.man b/man/XRRRootToScreen.man new file mode 100644 index 0000000..e02ca38 --- /dev/null +++ b/man/XRRRootToScreen.man @@ -0,0 +1 @@ +.so man__libmansuffix__/Xrandr.__libmansuffix__ diff --git a/man/XRRSelectInput.man b/man/XRRSelectInput.man new file mode 100644 index 0000000..e02ca38 --- /dev/null +++ b/man/XRRSelectInput.man @@ -0,0 +1 @@ +.so man__libmansuffix__/Xrandr.__libmansuffix__ diff --git a/man/XRRSetScreenConfig.man b/man/XRRSetScreenConfig.man new file mode 100644 index 0000000..e02ca38 --- /dev/null +++ b/man/XRRSetScreenConfig.man @@ -0,0 +1 @@ +.so man__libmansuffix__/Xrandr.__libmansuffix__ diff --git a/man/XRRSetScreenConfigAndRate.man b/man/XRRSetScreenConfigAndRate.man new file mode 100644 index 0000000..e02ca38 --- /dev/null +++ b/man/XRRSetScreenConfigAndRate.man @@ -0,0 +1 @@ +.so man__libmansuffix__/Xrandr.__libmansuffix__ -- cgit v1.2.3