From 7abead5688c1958822e3084a5c9854eb52ac58ec Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Wed, 19 Jan 2011 10:06:55 -0500 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: Gaetan Nadon --- Makefile.am | 18 +----------- configure.ac | 5 +++- ico.man | 90 --------------------------------------------------------- man/Makefile.am | 12 ++++++++ man/ico.man | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 107 insertions(+), 108 deletions(-) delete mode 100644 ico.man create mode 100644 man/Makefile.am create mode 100644 man/ico.man diff --git a/Makefile.am b/Makefile.am index 24945d9..8130a58 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 = ico AM_CFLAGS = $(ICO_CFLAGS) $(CWARNFLAGS) @@ -34,18 +35,7 @@ ico_SOURCES = \ objpyr.h \ polyinfo.h -appman_PRE = \ - ico.man - - - -appmandir = $(APP_MAN_DIR) - -appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) - -EXTRA_DIST = $(appman_PRE) MAINTAINERCLEANFILES = ChangeLog INSTALL -CLEANFILES = $(appman_DATA) .PHONY: ChangeLog INSTALL @@ -56,9 +46,3 @@ ChangeLog: $(CHANGELOG_CMD) dist-hook: ChangeLog INSTALL - -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/configure.ac b/configure.ac index e3e95e0..7a23166 100644 --- a/configure.ac +++ b/configure.ac @@ -42,4 +42,7 @@ XTHREADLIB=`$PKG_CONFIG --variable=xthreadlib x11` AC_SUBST(XTHREADLIB) -AC_OUTPUT([Makefile]) +AC_CONFIG_FILES([ + Makefile + man/Makefile]) +AC_OUTPUT diff --git a/ico.man b/ico.man deleted file mode 100644 index 34d6254..0000000 --- a/ico.man +++ /dev/null @@ -1,90 +0,0 @@ -.TH ICO 1 __xorgversion__ -.SH NAME -ico \- animate an icosahedron or other polyhedron -.SH SYNOPSIS -.B ico -[-display display] [-geometry geometry] -[-r] [-d pattern] [-i] [-dbl] [-faces] [-noedges] -[-sleep n] [-obj object] [-objhelp] [-colors color-list] -.SH DESCRIPTION -.I Ico -displays a wire-frame rotating polyhedron, with hidden lines removed, -or a solid-fill polyhedron with hidden faces removed. -There are a number of different polyhedra available; -adding a new polyhedron to the program is quite simple. -.SH OPTIONS -.TP -.B -r -Display on the root window instead of creating a new window. -.TP -.B -d pattern -Specify a bit pattern for drawing dashed lines for wire frames. -.TP -.B -i -Use inverted colors for wire frames. -.TP -.B -dbl -Use double buffering on the display. -This works for either wire frame or solid fill drawings. -For solid fill drawings, using this switch results in substantially -smoother movement. -Note that this requires twice as many bit planes as without double buffering. -Since some colors are typically allocated by other programs, -most eight-bit-plane displays will probably be limited to eight colors -when using double buffering. -.TP -.B -faces -Draw filled faces instead of wire frames. -.TP -.B -noedges -Don't draw the wire frames. -Typically used only when -faces is used. -.TP -.B -sleep \fIn\fP -Sleep n seconds between each move of the object. -.TP -.B -obj \fIobject\fP -Specify what object to draw. -If no object is specified, an icosahedron is drawn. -.TP -.B -objhelp -Print out a list of the available objects, along with information -about each object. -.TP -.B -colors \fIcolor color ...\fP -Specify what colors should be used to draw the filled faces of the object. -If less colors than faces are given, the colors are reused. -.SH PROGRAM TERMINATION -.LP -Pressing "q" will close a window. If compiled with threads support, the -program will stop only when all threads terminate. You can also close an -animation window using the ICCCM \fIdelete\fP message (depending on your -window manager, you will have a decoration button or menu to send such -message). -.SH ADDING POLYHEDRA -.LP -If you have the source to ico, it is very easy to add more polyhedra. -Each polyhedron is defined in an include file by the name of objXXX.h, -where XXX is something related to the name of the polyhedron. -The format of the include file is defined in the file polyinfo.h. -Look at the file objcube.h to see what the exact format of an objXXX.h -file should be, then create your objXXX.h file in that format. -.LP -After making the new objXXX.h file (or copying in a new one from elsewhere), -simply do a 'make depend'. -This will recreate the file allobjs.h, which lists all of the objXXX.h -files. -Doing a 'make' after this will rebuild ico with the new object information. -.SH "SEE ALSO" -X(__miscmansuffix__) -.SH BUGS -.LP -Pyramids and tetrahedrons with filled faces do not display correctly. -.LP -A separate color cell is allocated for each name in the -colors list, even -when the same name may be specified twice. Color allocation fails in -TrueColor displays and option \fI-faces\fP does not work well. -.SH COPYRIGHT -Copyright 1994 X Consortium -.br -See \fIX(__miscmansuffix__)\fP for a full statement of rights and permissions. diff --git a/man/Makefile.am b/man/Makefile.am new file mode 100644 index 0000000..9a96775 --- /dev/null +++ b/man/Makefile.am @@ -0,0 +1,12 @@ + +appmandir = $(APP_MAN_DIR) +appman_PRE = ico.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/ico.man b/man/ico.man new file mode 100644 index 0000000..34d6254 --- /dev/null +++ b/man/ico.man @@ -0,0 +1,90 @@ +.TH ICO 1 __xorgversion__ +.SH NAME +ico \- animate an icosahedron or other polyhedron +.SH SYNOPSIS +.B ico +[-display display] [-geometry geometry] +[-r] [-d pattern] [-i] [-dbl] [-faces] [-noedges] +[-sleep n] [-obj object] [-objhelp] [-colors color-list] +.SH DESCRIPTION +.I Ico +displays a wire-frame rotating polyhedron, with hidden lines removed, +or a solid-fill polyhedron with hidden faces removed. +There are a number of different polyhedra available; +adding a new polyhedron to the program is quite simple. +.SH OPTIONS +.TP +.B -r +Display on the root window instead of creating a new window. +.TP +.B -d pattern +Specify a bit pattern for drawing dashed lines for wire frames. +.TP +.B -i +Use inverted colors for wire frames. +.TP +.B -dbl +Use double buffering on the display. +This works for either wire frame or solid fill drawings. +For solid fill drawings, using this switch results in substantially +smoother movement. +Note that this requires twice as many bit planes as without double buffering. +Since some colors are typically allocated by other programs, +most eight-bit-plane displays will probably be limited to eight colors +when using double buffering. +.TP +.B -faces +Draw filled faces instead of wire frames. +.TP +.B -noedges +Don't draw the wire frames. +Typically used only when -faces is used. +.TP +.B -sleep \fIn\fP +Sleep n seconds between each move of the object. +.TP +.B -obj \fIobject\fP +Specify what object to draw. +If no object is specified, an icosahedron is drawn. +.TP +.B -objhelp +Print out a list of the available objects, along with information +about each object. +.TP +.B -colors \fIcolor color ...\fP +Specify what colors should be used to draw the filled faces of the object. +If less colors than faces are given, the colors are reused. +.SH PROGRAM TERMINATION +.LP +Pressing "q" will close a window. If compiled with threads support, the +program will stop only when all threads terminate. You can also close an +animation window using the ICCCM \fIdelete\fP message (depending on your +window manager, you will have a decoration button or menu to send such +message). +.SH ADDING POLYHEDRA +.LP +If you have the source to ico, it is very easy to add more polyhedra. +Each polyhedron is defined in an include file by the name of objXXX.h, +where XXX is something related to the name of the polyhedron. +The format of the include file is defined in the file polyinfo.h. +Look at the file objcube.h to see what the exact format of an objXXX.h +file should be, then create your objXXX.h file in that format. +.LP +After making the new objXXX.h file (or copying in a new one from elsewhere), +simply do a 'make depend'. +This will recreate the file allobjs.h, which lists all of the objXXX.h +files. +Doing a 'make' after this will rebuild ico with the new object information. +.SH "SEE ALSO" +X(__miscmansuffix__) +.SH BUGS +.LP +Pyramids and tetrahedrons with filled faces do not display correctly. +.LP +A separate color cell is allocated for each name in the -colors list, even +when the same name may be specified twice. Color allocation fails in +TrueColor displays and option \fI-faces\fP does not work well. +.SH COPYRIGHT +Copyright 1994 X Consortium +.br +See \fIX(__miscmansuffix__)\fP for a full statement of rights and permissions. -- cgit v1.2.3