From 14bfab3bb34f5ab75f2ac6c4acb3b67201e89a69 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Mon, 20 Oct 2014 17:57:04 -0700 Subject: config: move man pages into their own directory Use services provided by XORG_MANPAGE_SECTIONS. Use standard Makefile for man pages. Signed-off-by: Alan Coopersmith --- Makefile.am | 15 ++++++------ configure.ac | 11 +++++---- man/Makefile.am | 12 ++++++++++ man/xcompmgr.man | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ xcompmgr.1 | 69 -------------------------------------------------------- 5 files changed, 95 insertions(+), 81 deletions(-) create mode 100644 man/Makefile.am create mode 100644 man/xcompmgr.man delete mode 100644 xcompmgr.1 diff --git a/Makefile.am b/Makefile.am index 38a0c9f..25d5adb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,20 +1,19 @@ +SUBDIRS = man + bin_PROGRAMS = xcompmgr -man_MANS = xcompmgr.1 AM_CFLAGS = $(CWARNFLAGS) $(XCOMPMGR_CFLAGS) xcompmgr_LDADD = $(XCOMPMGR_LIBS) -lm -EXTRA_DIST = \ - autogen.sh \ - ChangeLog \ - ${man_MANS} +MAINTAINERCLEANFILES = ChangeLog INSTALL -MAINTAINERCLEANFILES=ChangeLog +.PHONY: ChangeLog INSTALL -.PHONY: ChangeLog +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog +dist-hook: ChangeLog INSTALL diff --git a/configure.ac b/configure.ac index 3546d8c..84ac99d 100644 --- a/configure.ac +++ b/configure.ac @@ -11,12 +11,15 @@ AC_CONFIG_HEADERS([config.h]) # Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) -# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS +# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) -XORG_MACROS_VERSION(1.3) + [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.8) XORG_DEFAULT_OPTIONS PKG_CHECK_MODULES(XCOMPMGR, xcomposite xfixes xdamage xrender xext) -AC_OUTPUT([Makefile]) +AC_CONFIG_FILES([ + Makefile + man/Makefile]) +AC_OUTPUT diff --git a/man/Makefile.am b/man/Makefile.am new file mode 100644 index 0000000..988f6ff --- /dev/null +++ b/man/Makefile.am @@ -0,0 +1,12 @@ + +appmandir = $(APP_MAN_DIR) +appman_PRE = xcompmgr.man +appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX)) + +EXTRA_DIST = $(appman_PRE) +CLEANFILES = $(appman_DATA) +SUFFIXES = .$(APP_MAN_SUFFIX) .man + +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure +.man.$(APP_MAN_SUFFIX): + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ diff --git a/man/xcompmgr.man b/man/xcompmgr.man new file mode 100644 index 0000000..5f51ac5 --- /dev/null +++ b/man/xcompmgr.man @@ -0,0 +1,69 @@ +.ds q \N'34' +.TH xcompmgr 1 __xorgversion__ +.SH NAME +xcompmgr \- sample X compositing manager +.SH SYNOPSIS +.BI "xcompmgr [\-d " display "] [\-r " radius "]" +.BI "[\-o " opacity "] [\-l " left-offset "]" +.BI "[\-t " top-offset "] [\-acCfFnsS]" +.SH DESCRIPTION +.B xcompmgr +is a sample compositing manager for X servers supporting the XFIXES, DAMAGE, +and COMPOSITE extensions. It enables basic eye-candy effects. +.SH OPTIONS +.TP +.BI \-d\ display +Specifies the display to manage. +.TP +.BI \-r\ radius +Specifies the blur radius for client-side shadows. +.TP +.BI \-o\ opacity +Specifies the opacity for client-side shadows. +.TP +.BI \-l\ left-offset +Specifies the left offset for client-side shadows. +.TP +.BI \-t\ top-offset +Specifies the top offset for client-side shadows. +.TP +.BI \-I\ fade-in-step +Specifies the opacity change between steps while fading in. +.TP +.BI \-O\ fade-out-step +Specifies the opacity change between steps while fading out. +.TP +.BI \-D\ fade-delta +Specifies the time (in milliseconds) between steps in a fade. +.TP +.BI \-a +Automatic server-side compositing. This instructs the server to use the +standard composition rules. Useful for debugging. +.TP +.BI \-c +Client-side compositing with soft shadows and translucency support. +.TP +.BI \-f +When \-c is specified, enables a smooth fade effect for transient windows like +menus, and for all windows on hide and restore events. +.TP +.BI \-n +Simple client-side compositing. This is the default mode. +.TP +.BI \-s +Server-side compositing with hard-edged shadows. +.TP +.BI \-C +When \-c is specified, attempts to avoid painting shadows on panels and docks. +.TP +.BI \-F +When \-f is specified, also enables the fade effect when windows change their +opacity, as with transset(1). +.TP +.BI \-S +Enables synchronous operation. Useful for debugging. +.SH BUGS +Probably. Please report any you find to http://bugs.freedesktop.org/. +.SH AUTHORS +Keith Packard, with contributions from Matthew Allum, Eric Anholt, Dan Doel, +Thomas Luebking, Matthew Hawn, Ely Levy, Phil Blundell, and Carl Worth. diff --git a/xcompmgr.1 b/xcompmgr.1 deleted file mode 100644 index 523f60b..0000000 --- a/xcompmgr.1 +++ /dev/null @@ -1,69 +0,0 @@ -.ds q \N'34' -.TH xcompmgr 1 -.SH NAME -xcompmgr \- sample X compositing manager -.SH SYNOPSIS -.BI "xcompmgr [\-d " display "] [\-r " radius "]" -.BI "[\-o " opacity "] [\-l " left-offset "]" -.BI "[\-t " top-offset "] [\-acCfFnsS]" -.SH DESCRIPTION -.B xcompmgr -is a sample compositing manager for X servers supporting the XFIXES, DAMAGE, -and COMPOSITE extensions. It enables basic eye-candy effects. -.SH OPTIONS -.TP -.BI \-d\ display -Specifies the display to manage. -.TP -.BI \-r\ radius -Specifies the blur radius for client-side shadows. -.TP -.BI \-o\ opacity -Specifies the opacity for client-side shadows. -.TP -.BI \-l\ left-offset -Specifies the left offset for client-side shadows. -.TP -.BI \-t\ top-offset -Specifies the top offset for client-side shadows. -.TP -.BI \-I\ fade-in-step -Specifies the opacity change between steps while fading in. -.TP -.BI \-O\ fade-out-step -Specifies the opacity change between steps while fading out. -.TP -.BI \-D\ fade-delta -Specifies the time (in milliseconds) between steps in a fade. -.TP -.BI \-a -Automatic server-side compositing. This instructs the server to use the -standard composition rules. Useful for debugging. -.TP -.BI \-c -Client-side compositing with soft shadows and translucency support. -.TP -.BI \-f -When \-c is specified, enables a smooth fade effect for transient windows like -menus, and for all windows on hide and restore events. -.TP -.BI \-n -Simple client-side compositing. This is the default mode. -.TP -.BI \-s -Server-side compositing with hard-edged shadows. -.TP -.BI \-C -When \-c is specified, attempts to avoid painting shadows on panels and docks. -.TP -.BI \-F -When \-f is specified, also enables the fade effect when windows change their -opacity, as with transset(1). -.TP -.BI \-S -Enables synchronous operation. Useful for debugging. -.SH BUGS -Probably. Please report any you find to http://bugs.freedesktop.org/. -.SH AUTHORS -Keith Packard, with contributions from Matthew Allum, Eric Anholt, Dan Doel, -Thomas Luebking, Matthew Hawn, Ely Levy, Phil Blundell, and Carl Worth. -- cgit v1.2.3-70-g09d2