From 542ff68e43a33a5c1849f9a88d2d5cc6d0827d04 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Sat, 14 Aug 2010 20:12:57 -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 | 17 +++++------------ man/XCompositeCreateRegionFromBorderClip.man | 1 + man/XCompositeGetOverlayWindow.man | 1 + man/XCompositeNameWindowPixmap.man | 1 + man/XCompositeQueryExtension.man | 1 + man/XCompositeQueryVersion.man | 1 + man/XCompositeRedirectSubwindows.man | 1 + man/XCompositeRedirectWindow.man | 1 + man/XCompositeReleaseOverlayWindow.man | 1 + man/XCompositeUnredirectSubwindows.man | 1 + man/XCompositeUnredirectWindow.man | 1 + man/XCompositeVersion.man | 1 + 12 files changed, 16 insertions(+), 12 deletions(-) create mode 100644 man/XCompositeCreateRegionFromBorderClip.man create mode 100644 man/XCompositeGetOverlayWindow.man create mode 100644 man/XCompositeNameWindowPixmap.man create mode 100644 man/XCompositeQueryExtension.man create mode 100644 man/XCompositeQueryVersion.man create mode 100644 man/XCompositeRedirectSubwindows.man create mode 100644 man/XCompositeRedirectWindow.man create mode 100644 man/XCompositeReleaseOverlayWindow.man create mode 100644 man/XCompositeUnredirectSubwindows.man create mode 100644 man/XCompositeUnredirectWindow.man create mode 100644 man/XCompositeVersion.man diff --git a/man/Makefile.am b/man/Makefile.am index b768742..0a0b7d1 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -1,12 +1,11 @@ libmandir = $(LIB_MAN_DIR) -LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%) - libman_xml = Xcomposite.xml -libman_PRE = $(libman_xml:xml=man) +libman_PRE = $(libman_xml:xml=man) \ + $(Xcomposite_shadows:=.man) -Xcomposite_man_aliases = \ +Xcomposite_shadows = \ XCompositeQueryExtension \ XCompositeQueryVersion \ XCompositeVersion \ @@ -19,22 +18,16 @@ Xcomposite_man_aliases = \ XCompositeGetOverlayWindow \ XCompositeReleaseOverlayWindow -Xcomposite_shadowmen = $(Xcomposite_man_aliases:=.@LIB_MAN_SUFFIX@) - if INSTALL_MANPAGES libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \ - $(Xcomposite_shadowmen) + $(Xcomposite_shadows:=.@LIB_MAN_SUFFIX@) endif EXTRA_DIST = $(libman_PRE) $(libman_xml) CLEANFILES = $(libman_DATA) -MAINTAINERCLEANFILES = $(libman_PRE) - -# Generate man page shadow files (Replaces InstallManPageAliases from Imake) -$(Xcomposite_shadowmen): - $(AM_V_GEN) echo .so man$(LIB_MAN_DIR_SUFFIX)/Xcomposite.$(LIB_MAN_SUFFIX) > $@ +MAINTAINERCLEANFILES = $(libman_xml:xml=man) SUFFIXES = .$(LIB_MAN_SUFFIX) .man .xml diff --git a/man/XCompositeCreateRegionFromBorderClip.man b/man/XCompositeCreateRegionFromBorderClip.man new file mode 100644 index 0000000..789aba8 --- /dev/null +++ b/man/XCompositeCreateRegionFromBorderClip.man @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcomposite.__libmansuffix__ diff --git a/man/XCompositeGetOverlayWindow.man b/man/XCompositeGetOverlayWindow.man new file mode 100644 index 0000000..789aba8 --- /dev/null +++ b/man/XCompositeGetOverlayWindow.man @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcomposite.__libmansuffix__ diff --git a/man/XCompositeNameWindowPixmap.man b/man/XCompositeNameWindowPixmap.man new file mode 100644 index 0000000..789aba8 --- /dev/null +++ b/man/XCompositeNameWindowPixmap.man @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcomposite.__libmansuffix__ diff --git a/man/XCompositeQueryExtension.man b/man/XCompositeQueryExtension.man new file mode 100644 index 0000000..789aba8 --- /dev/null +++ b/man/XCompositeQueryExtension.man @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcomposite.__libmansuffix__ diff --git a/man/XCompositeQueryVersion.man b/man/XCompositeQueryVersion.man new file mode 100644 index 0000000..789aba8 --- /dev/null +++ b/man/XCompositeQueryVersion.man @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcomposite.__libmansuffix__ diff --git a/man/XCompositeRedirectSubwindows.man b/man/XCompositeRedirectSubwindows.man new file mode 100644 index 0000000..789aba8 --- /dev/null +++ b/man/XCompositeRedirectSubwindows.man @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcomposite.__libmansuffix__ diff --git a/man/XCompositeRedirectWindow.man b/man/XCompositeRedirectWindow.man new file mode 100644 index 0000000..789aba8 --- /dev/null +++ b/man/XCompositeRedirectWindow.man @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcomposite.__libmansuffix__ diff --git a/man/XCompositeReleaseOverlayWindow.man b/man/XCompositeReleaseOverlayWindow.man new file mode 100644 index 0000000..789aba8 --- /dev/null +++ b/man/XCompositeReleaseOverlayWindow.man @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcomposite.__libmansuffix__ diff --git a/man/XCompositeUnredirectSubwindows.man b/man/XCompositeUnredirectSubwindows.man new file mode 100644 index 0000000..789aba8 --- /dev/null +++ b/man/XCompositeUnredirectSubwindows.man @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcomposite.__libmansuffix__ diff --git a/man/XCompositeUnredirectWindow.man b/man/XCompositeUnredirectWindow.man new file mode 100644 index 0000000..789aba8 --- /dev/null +++ b/man/XCompositeUnredirectWindow.man @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcomposite.__libmansuffix__ diff --git a/man/XCompositeVersion.man b/man/XCompositeVersion.man new file mode 100644 index 0000000..789aba8 --- /dev/null +++ b/man/XCompositeVersion.man @@ -0,0 +1 @@ +.so man__libmansuffix__/Xcomposite.__libmansuffix__ -- cgit v1.2.1