diff options
| -rw-r--r-- | Makefile.am | 23 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | man/Makefile.am | 12 | ||||
| -rw-r--r-- | man/Xmark.man (renamed from Xmark.man) | 0 | ||||
| -rw-r--r-- | man/x11perf.man (renamed from x11perf.man) | 0 | ||||
| -rw-r--r-- | man/x11perfcomp.man (renamed from x11perfcomp.man) | 0 |
6 files changed, 18 insertions, 22 deletions
diff --git a/Makefile.am b/Makefile.am index c14391c..3b6d13b 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 = x11perf bin_SCRIPTS = x11perfcomp @@ -52,34 +53,14 @@ x11perf_SOURCES = \ x11perf.c \ x11perf.h -appman_PRE = \ - x11perfcomp.man \ - x11perf.man \ - Xmark.man - x11perfcomp: x11pcomp.cpp $(AM_V_GEN)$(SED) s/LIBPATH/`echo $(LIBPATH) | sed -e s/\\\\//\\\\\\\\\\\\\//g`/ < $(srcdir)/x11pcomp.cpp | \ $(SED) s/XCOMM/\#/ > $@ - -MAINTAINERCLEANFILES = ChangeLog INSTALL CLEANFILES = $(bin_SCRIPTS) x11perfcomp - EXTRA_DIST = x11pcomp.cpp -appmandir = $(APP_MAN_DIR) - -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) < $< > $@ - +MAINTAINERCLEANFILES = ChangeLog INSTALL .PHONY: ChangeLog INSTALL diff --git a/configure.ac b/configure.ac index 552ea8d..96126f2 100644 --- a/configure.ac +++ b/configure.ac @@ -72,4 +72,7 @@ yes) ;; esac -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..14c63bd --- /dev/null +++ b/man/Makefile.am @@ -0,0 +1,12 @@ + +appmandir = $(APP_MAN_DIR) +appman_PRE = x11perfcomp.man x11perf.man Xmark.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/Xmark.man b/man/Xmark.man index 4e91162..4e91162 100644 --- a/Xmark.man +++ b/man/Xmark.man diff --git a/x11perf.man b/man/x11perf.man index 1fcbf20..1fcbf20 100644 --- a/x11perf.man +++ b/man/x11perf.man diff --git a/x11perfcomp.man b/man/x11perfcomp.man index 4f567d2..4f567d2 100644 --- a/x11perfcomp.man +++ b/man/x11perfcomp.man |