diff options
-rw-r--r-- | Makefile.am | 18 | ||||
-rw-r--r-- | configure.ac | 5 | ||||
-rw-r--r-- | man/Makefile.am | 12 | ||||
-rw-r--r-- | man/ico.man (renamed from ico.man) | 0 |
4 files changed, 17 insertions, 18 deletions
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/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) < $< > $@ |