From 25c4abc730f7d2407c33fcd5c48a6a82c541c921 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Tue, 17 Aug 2010 09:00:28 -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 | 43 +++++++++++++++---------------------- man/XScreenSaverAllocInfo.man | 1 + man/XScreenSaverGetRegistered.man | 1 + man/XScreenSaverQueryExtension.man | 1 + man/XScreenSaverQueryInfo.man | 1 + man/XScreenSaverQueryVersion.man | 1 + man/XScreenSaverRegister.man | 1 + man/XScreenSaverSelectInput.man | 1 + man/XScreenSaverSetAttributes.man | 1 + man/XScreenSaverSuspend.man | 1 + man/XScreenSaverUnregister.man | 1 + man/XScreenSaverUnsetAttributes.man | 1 + 12 files changed, 28 insertions(+), 26 deletions(-) create mode 100644 man/XScreenSaverAllocInfo.man create mode 100644 man/XScreenSaverGetRegistered.man create mode 100644 man/XScreenSaverQueryExtension.man create mode 100644 man/XScreenSaverQueryInfo.man create mode 100644 man/XScreenSaverQueryVersion.man create mode 100644 man/XScreenSaverRegister.man create mode 100644 man/XScreenSaverSelectInput.man create mode 100644 man/XScreenSaverSetAttributes.man create mode 100644 man/XScreenSaverSuspend.man create mode 100644 man/XScreenSaverUnregister.man create mode 100644 man/XScreenSaverUnsetAttributes.man diff --git a/man/Makefile.am b/man/Makefile.am index b84aff5..8bdb115 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -23,18 +23,27 @@ libmandir = $(LIB_MAN_DIR) -LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%) +libman_PRE = \ + Xss.man \ + $(Xss_shadows:=.man) -libman_PRE = Xss.man - -BUILT_SOURCES = $(Xss_shadowmen) +Xss_shadows = \ + XScreenSaverQueryExtension \ + XScreenSaverQueryVersion \ + XScreenSaverAllocInfo \ + XScreenSaverQueryInfo \ + XScreenSaverSelectInput \ + XScreenSaverSetAttributes \ + XScreenSaverUnsetAttributes \ + XScreenSaverRegister \ + XScreenSaverUnregister \ + XScreenSaverGetRegistered \ + XScreenSaverSuspend EXTRA_DIST = $(libman_PRE) +CLEANFILES = $(libman_DATA) -CLEANFILES = $(libman_DATA) $(BUILT_SOURCES) - -libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \ - $(Xss_shadowmen) +libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) SUFFIXES = .$(LIB_MAN_SUFFIX) .man @@ -42,21 +51,3 @@ SUFFIXES = .$(LIB_MAN_SUFFIX) .man .man.$(LIB_MAN_SUFFIX): $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ -# Generate man page shadow files (Replaces InstallManPageAliases from Imake) - -Xss_shadows = \ - XScreenSaverQueryExtension \ - XScreenSaverQueryVersion \ - XScreenSaverAllocInfo \ - XScreenSaverQueryInfo \ - XScreenSaverSelectInput \ - XScreenSaverSetAttributes \ - XScreenSaverUnsetAttributes \ - XScreenSaverRegister \ - XScreenSaverUnregister \ - XScreenSaverGetRegistered \ - XScreenSaverSuspend - -Xss_shadowmen = $(Xss_shadows:=.@LIB_MAN_SUFFIX@) -$(Xss_shadowmen): - $(AM_V_GEN)echo ".so man$(LIB_MAN_DIR_SUFFIX)/Xss.$(LIB_MAN_SUFFIX)" > $@ diff --git a/man/XScreenSaverAllocInfo.man b/man/XScreenSaverAllocInfo.man new file mode 100644 index 0000000..0b94d09 --- /dev/null +++ b/man/XScreenSaverAllocInfo.man @@ -0,0 +1 @@ +.so man__libmansuffix__/Xss.__libmansuffix__ diff --git a/man/XScreenSaverGetRegistered.man b/man/XScreenSaverGetRegistered.man new file mode 100644 index 0000000..0b94d09 --- /dev/null +++ b/man/XScreenSaverGetRegistered.man @@ -0,0 +1 @@ +.so man__libmansuffix__/Xss.__libmansuffix__ diff --git a/man/XScreenSaverQueryExtension.man b/man/XScreenSaverQueryExtension.man new file mode 100644 index 0000000..0b94d09 --- /dev/null +++ b/man/XScreenSaverQueryExtension.man @@ -0,0 +1 @@ +.so man__libmansuffix__/Xss.__libmansuffix__ diff --git a/man/XScreenSaverQueryInfo.man b/man/XScreenSaverQueryInfo.man new file mode 100644 index 0000000..0b94d09 --- /dev/null +++ b/man/XScreenSaverQueryInfo.man @@ -0,0 +1 @@ +.so man__libmansuffix__/Xss.__libmansuffix__ diff --git a/man/XScreenSaverQueryVersion.man b/man/XScreenSaverQueryVersion.man new file mode 100644 index 0000000..0b94d09 --- /dev/null +++ b/man/XScreenSaverQueryVersion.man @@ -0,0 +1 @@ +.so man__libmansuffix__/Xss.__libmansuffix__ diff --git a/man/XScreenSaverRegister.man b/man/XScreenSaverRegister.man new file mode 100644 index 0000000..0b94d09 --- /dev/null +++ b/man/XScreenSaverRegister.man @@ -0,0 +1 @@ +.so man__libmansuffix__/Xss.__libmansuffix__ diff --git a/man/XScreenSaverSelectInput.man b/man/XScreenSaverSelectInput.man new file mode 100644 index 0000000..0b94d09 --- /dev/null +++ b/man/XScreenSaverSelectInput.man @@ -0,0 +1 @@ +.so man__libmansuffix__/Xss.__libmansuffix__ diff --git a/man/XScreenSaverSetAttributes.man b/man/XScreenSaverSetAttributes.man new file mode 100644 index 0000000..0b94d09 --- /dev/null +++ b/man/XScreenSaverSetAttributes.man @@ -0,0 +1 @@ +.so man__libmansuffix__/Xss.__libmansuffix__ diff --git a/man/XScreenSaverSuspend.man b/man/XScreenSaverSuspend.man new file mode 100644 index 0000000..0b94d09 --- /dev/null +++ b/man/XScreenSaverSuspend.man @@ -0,0 +1 @@ +.so man__libmansuffix__/Xss.__libmansuffix__ diff --git a/man/XScreenSaverUnregister.man b/man/XScreenSaverUnregister.man new file mode 100644 index 0000000..0b94d09 --- /dev/null +++ b/man/XScreenSaverUnregister.man @@ -0,0 +1 @@ +.so man__libmansuffix__/Xss.__libmansuffix__ diff --git a/man/XScreenSaverUnsetAttributes.man b/man/XScreenSaverUnsetAttributes.man new file mode 100644 index 0000000..0b94d09 --- /dev/null +++ b/man/XScreenSaverUnsetAttributes.man @@ -0,0 +1 @@ +.so man__libmansuffix__/Xss.__libmansuffix__ -- cgit v1.2.1