From 0bbf87d046a74ad1ae8fe0f970f331dae0472d67 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Wed, 19 Jan 2011 10:06:56 -0500 Subject: config: move man pages into their own directory Use services provided by XORG_MANPAGE_SECTIONS. Use standard Makefile for man pages. Change-Id: Iaacaee48391d38edefac74d301d6f114a6ee50da Signed-off-by: Gaetan Nadon --- Makefile.am | 17 +--------------- configure.ac | 5 ++++- man/Makefile.am | 12 ++++++++++++ man/xev.man | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ xev.man | 61 --------------------------------------------------------- 5 files changed, 78 insertions(+), 78 deletions(-) create mode 100644 man/Makefile.am create mode 100644 man/xev.man delete mode 100644 xev.man diff --git a/Makefile.am b/Makefile.am index 26ba697..2b1677b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,6 +19,7 @@ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. +SUBDIRS = man bin_PROGRAMS = xev AM_CFLAGS = $(CWARNFLAGS) $(XEV_CFLAGS) @@ -27,23 +28,7 @@ xev_LDADD = $(XEV_LIBS) xev_SOURCES = \ xev.c -appman_PRE = \ - xev.man - - -appmandir = $(APP_MAN_DIR) - -appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) - -EXTRA_DIST = $(appman_PRE) MAINTAINERCLEANFILES = ChangeLog INSTALL -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) < $< > $@ .PHONY: ChangeLog INSTALL diff --git a/configure.ac b/configure.ac index 4019c34..bc31f6c 100644 --- a/configure.ac +++ b/configure.ac @@ -38,4 +38,7 @@ XORG_DEFAULT_OPTIONS # Checks for pkg-config packages PKG_CHECK_MODULES(XEV, x11) -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..f8a4404 --- /dev/null +++ b/man/Makefile.am @@ -0,0 +1,12 @@ + +appmandir = $(APP_MAN_DIR) +appman_PRE = xev.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/xev.man b/man/xev.man new file mode 100644 index 0000000..d13f022 --- /dev/null +++ b/man/xev.man @@ -0,0 +1,61 @@ +.TH XEV 1 __xorgversion__ +.SH NAME +xev - print contents of X events +.SH SYNOPSIS +.B "xev" +[\-display \fIdisplayname\fP] [\-geometry \fIgeom\fP] +[\-bw \fIpixels\fP] [\-bs \fI{NotUseful,WhenMapped,Always}\fP] +[\-id \fIwindowid\fP] [\-root] [\-s] [\-name \fIstring\fP] [\-rv] +.SH DESCRIPTION +.PP +\fIXev\fP creates a window and then asks the X server to send it +\fIevents\fP whenever anything happens to the window (such as it being +moved, resized, typed in, clicked in, etc.). You can also attach it to an +existing window. It is useful for seeing what causes events to occur and to +display the information that they contain; it is essentially a debugging and +development tool, and should not be needed in normal usage. +.SH OPTIONS +.TP 8 +.B \-display \fIdisplay\fP +This option specifies the X server to contact. +.TP 8 +.B \-geometry \fIgeom\fP +This option specifies the size and/or location of the window, if a window is +to be created. +.TP 8 +.B \-bw \fIpixels\fP +This option specifies the border width for the window. +.TP 8 +.B \-bs \fI{NotUseful,WhenMapped,Always}\fP +This option specifies what kind of backing store to give the window. +The default is NotUseful. Backing store refers to the the pixels saved +off-screen when the X server maintains the contents of a window; NotUseful +means that the xev process will redraw its contents itself, as necessary. +.TP 8 +.B \-id \fIwindowid\fP +This option specifies that the window with the given id should be +monitored, instead of creating a new window. +.TP 8 +.B \-root +This option specifies that the root window should be +monitored, instead of creating a new window. +.TP 8 +.B \-s +This option specifies that save-unders should be enabled on the window. Save +unders are similar to backing store, but they refer rather to the saving of +pixels off-screen when the current window obscures other windows. Save +unders are only advisory, and are normally set for popup dialogs and other +transient windows. +.TP 8 +.B \-name \fIstring\fP +This option specifies the name to assign to the created window. +.TP 8 +.B \-rv +This option specifies that the window should be in reverse video. +.SH "SEE ALSO" +X(__miscmansuffix__), xwininfo(__appmansuffix__), xdpyinfo(__appmansuffix__), Xlib Programmers Manual, X Protocol +Specification +.br +See \fIX(__miscmansuffix__)\fP for a full statement of rights and permissions. +.SH AUTHOR +Jim Fulton, MIT X Consortium diff --git a/xev.man b/xev.man deleted file mode 100644 index d13f022..0000000 --- a/xev.man +++ /dev/null @@ -1,61 +0,0 @@ -.TH XEV 1 __xorgversion__ -.SH NAME -xev - print contents of X events -.SH SYNOPSIS -.B "xev" -[\-display \fIdisplayname\fP] [\-geometry \fIgeom\fP] -[\-bw \fIpixels\fP] [\-bs \fI{NotUseful,WhenMapped,Always}\fP] -[\-id \fIwindowid\fP] [\-root] [\-s] [\-name \fIstring\fP] [\-rv] -.SH DESCRIPTION -.PP -\fIXev\fP creates a window and then asks the X server to send it -\fIevents\fP whenever anything happens to the window (such as it being -moved, resized, typed in, clicked in, etc.). You can also attach it to an -existing window. It is useful for seeing what causes events to occur and to -display the information that they contain; it is essentially a debugging and -development tool, and should not be needed in normal usage. -.SH OPTIONS -.TP 8 -.B \-display \fIdisplay\fP -This option specifies the X server to contact. -.TP 8 -.B \-geometry \fIgeom\fP -This option specifies the size and/or location of the window, if a window is -to be created. -.TP 8 -.B \-bw \fIpixels\fP -This option specifies the border width for the window. -.TP 8 -.B \-bs \fI{NotUseful,WhenMapped,Always}\fP -This option specifies what kind of backing store to give the window. -The default is NotUseful. Backing store refers to the the pixels saved -off-screen when the X server maintains the contents of a window; NotUseful -means that the xev process will redraw its contents itself, as necessary. -.TP 8 -.B \-id \fIwindowid\fP -This option specifies that the window with the given id should be -monitored, instead of creating a new window. -.TP 8 -.B \-root -This option specifies that the root window should be -monitored, instead of creating a new window. -.TP 8 -.B \-s -This option specifies that save-unders should be enabled on the window. Save -unders are similar to backing store, but they refer rather to the saving of -pixels off-screen when the current window obscures other windows. Save -unders are only advisory, and are normally set for popup dialogs and other -transient windows. -.TP 8 -.B \-name \fIstring\fP -This option specifies the name to assign to the created window. -.TP 8 -.B \-rv -This option specifies that the window should be in reverse video. -.SH "SEE ALSO" -X(__miscmansuffix__), xwininfo(__appmansuffix__), xdpyinfo(__appmansuffix__), Xlib Programmers Manual, X Protocol -Specification -.br -See \fIX(__miscmansuffix__)\fP for a full statement of rights and permissions. -.SH AUTHOR -Jim Fulton, MIT X Consortium -- cgit v1.2.3