diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | cxpm/Makefile.am | 17 | ||||
| -rw-r--r-- | man/Makefile.am | 34 | ||||
| -rw-r--r-- | man/cxpm.man (renamed from cxpm/cxpm.man) | 2 | ||||
| -rw-r--r-- | man/sxpm.man (renamed from sxpm/sxpm.man) | 30 | ||||
| -rw-r--r-- | sxpm/Makefile.am | 19 |
7 files changed, 55 insertions, 50 deletions
diff --git a/Makefile.am b/Makefile.am index a289a24..1f17762 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ # Daniel Stone disowns all copyright on this file; no warranty is given as to its # suitability or otherwise. -SUBDIRS = doc include src sxpm cxpm +SUBDIRS = doc include man src sxpm cxpm ACLOCAL_AMFLAGS = -I m4 diff --git a/configure.ac b/configure.ac index b45c94f..3514053 100644 --- a/configure.ac +++ b/configure.ac @@ -61,6 +61,7 @@ fi AC_CONFIG_FILES([Makefile doc/Makefile include/Makefile + man/Makefile src/Makefile sxpm/Makefile cxpm/Makefile diff --git a/cxpm/Makefile.am b/cxpm/Makefile.am index e7481a0..4c74ae6 100644 --- a/cxpm/Makefile.am +++ b/cxpm/Makefile.am @@ -5,26 +5,11 @@ AM_CFLAGS = $(CWARNFLAGS) $(XPM_CFLAGS) cxpm_SOURCES = cxpm.c -# Man page -appmandir = $(APP_MAN_DIR) - -appman_PRE = cxpm.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) < $< > $@ - if USE_GETTEXT noinst_DATA = cxpm.po cxpm.po: $(cxpm_SOURCES:%=$(srcdir)/%) $(AM_V_GEN)xgettext -c"L10N_Comments" -d cxpm -n $(cxpm_SOURCES:%=$(srcdir)/%) -CLEANFILES += cxpm.po +CLEANFILES = cxpm.po endif diff --git a/man/Makefile.am b/man/Makefile.am new file mode 100644 index 0000000..5734e51 --- /dev/null +++ b/man/Makefile.am @@ -0,0 +1,34 @@ +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. +# + +appmandir = $(APP_MAN_DIR) +appman_PRE = sxpm.man cxpm.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/cxpm/cxpm.man b/man/cxpm.man index 21d63fd..8a4c8f6 100644 --- a/cxpm/cxpm.man +++ b/man/cxpm.man @@ -29,7 +29,7 @@ cxpm \- Check an XPM (X PixMap) file - XPM 1, 2, or 3. .SH SYNOPSIS \fBcxpm\fR -[\|\fIfilename\fP\|] +[\|\fIfilename\fP\|] .SH DESCRIPTION .PP The \fBcxpm\fP program can be used to check the format of any XPM (version 1, 2, diff --git a/sxpm/sxpm.man b/man/sxpm.man index 49cf306..229d749 100644 --- a/sxpm/sxpm.man +++ b/man/sxpm.man @@ -29,22 +29,22 @@ sxpm \- Show an XPM (X PixMap) file and/or convert XPM 1 or 2 files to XPM 3. .SH SYNOPSIS \fBsxpm\fR -[\|\fB-d\fR displayname\|] -[\|\fB-g\fR geometry\|] -[\|\fB-hints\fR\|] -[\|\fB-icon\fR filename\|] +[\|\fB-d\fR displayname\|] +[\|\fB-g\fR geometry\|] +[\|\fB-hints\fR\|] +[\|\fB-icon\fR filename\|] [\|\fB-plaid\| | \|\fRfilename\| | \|-\|] -[\|\fB-o\fR filename\| | \|\fB-o\fR -\|] -[\|\fB-pcmap\fR\|] -[\|\fB-closecolors\fR\|] -[\|\fB-nod\fR\|] -[\|\fB-nom\fR\|] -[\|\fB-mono | -grey4 | -grey | -color\fR\|] -[\|\fB-sc\fR symbol color\|] -[\|\fB-sp\fR symbol pixel\|] -[\|\fB-cp\fR color pixel\|] -[\|\fB-rgb\fR filename\|] -[\|\fB-v\fR\|] +[\|\fB-o\fR filename\| | \|\fB-o\fR -\|] +[\|\fB-pcmap\fR\|] +[\|\fB-closecolors\fR\|] +[\|\fB-nod\fR\|] +[\|\fB-nom\fR\|] +[\|\fB-mono | -grey4 | -grey | -color\fR\|] +[\|\fB-sc\fR symbol color\|] +[\|\fB-sp\fR symbol pixel\|] +[\|\fB-cp\fR color pixel\|] +[\|\fB-rgb\fR filename\|] +[\|\fB-v\fR\|] .SH DESCRIPTION .PP The \fIsxpm\fP program can be used to view any XPM (version 1, 2, or 3) file diff --git a/sxpm/Makefile.am b/sxpm/Makefile.am index 8241e87..7181bde 100644 --- a/sxpm/Makefile.am +++ b/sxpm/Makefile.am @@ -9,32 +9,17 @@ sxpm_SOURCES = sxpm.c LDADD = $(SXPM_LIBS) $(top_builddir)/src/libXpm.la -# Man page -appmandir = $(APP_MAN_DIR) - -appman_PRE = sxpm.man -appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) - -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) < $< > $@ - if USE_GETTEXT noinst_DATA = sxpm.po sxpm.po: $(sxpm_SOURCES:%=$(srcdir)/%) $(AM_V_GEN)xgettext -c"L10N_Comments" -d sxpm -n $(sxpm_SOURCES:%=$(srcdir)/%) -CLEANFILES += sxpm.po +CLEANFILES = sxpm.po endif endif EXTRA_DIST = \ plaid_ext.xpm \ plaid_mask.xpm \ - plaid.xpm \ - sxpm.man + plaid.xpm |