diff options
| -rw-r--r-- | Makefile.am | 15 | ||||
| -rw-r--r-- | configure.ac | 11 | ||||
| -rw-r--r-- | man/Makefile.am | 12 | ||||
| -rw-r--r-- | man/xcompmgr.man (renamed from xcompmgr.1) | 2 |
4 files changed, 27 insertions, 13 deletions
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/xcompmgr.1 b/man/xcompmgr.man index 523f60b..5f51ac5 100644 --- a/xcompmgr.1 +++ b/man/xcompmgr.man @@ -1,5 +1,5 @@ .ds q \N'34' -.TH xcompmgr 1 +.TH xcompmgr 1 __xorgversion__ .SH NAME xcompmgr \- sample X compositing manager .SH SYNOPSIS |