diff options
| -rw-r--r-- | Makefile.am | 25 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | man/Makefile.am | 22 | ||||
| -rw-r--r-- | man/filenames.sed.c (renamed from filenames.sed.c) | 0 | ||||
| -rw-r--r-- | man/sessreg.man (renamed from sessreg.man) | 0 |
5 files changed, 28 insertions, 24 deletions
diff --git a/Makefile.am b/Makefile.am index 6fc379e..cddffd0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,6 +18,7 @@ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. +SUBDIRS = man bin_PROGRAMS = sessreg AM_CFLAGS = $(CWARNFLAGS) $(SESSREG_CFLAGS) @@ -26,29 +27,6 @@ sessreg_SOURCES = \ sessreg.h \ sessreg.c -appman_PRE = sessreg.man - -appmandir = $(APP_MAN_DIR) - -appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) - -EXTRA_DIST = $(appman_PRE) filenames.sed.c -MAINTAINERCLEANFILES = ChangeLog INSTALL -CLEANFILES = $(appman_DATA) filenames.sed - -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) < $< > $@ - -sessreg.$(APP_MAN_SUFFIX): filenames.sed - -filenames.sed: filenames.sed.c - $(AM_V_GEN)$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(srcdir)/filenames.sed.c | \ - grep 's|__' > $@ - if LINT ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) @@ -57,6 +35,7 @@ lint: $(LINT) $(ALL_LINT_FLAGS) $(sessreg_SOURCES) endif LINT +MAINTAINERCLEANFILES = ChangeLog INSTALL .PHONY: ChangeLog INSTALL diff --git a/configure.ac b/configure.ac index 8ed1eb7..0ec24ac 100644 --- a/configure.ac +++ b/configure.ac @@ -59,4 +59,7 @@ AC_CHECK_FUNCS([updwtmpx utmpxname]) # Checks for pkg-config packages PKG_CHECK_MODULES(SESSREG, xproto) -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..d200a94 --- /dev/null +++ b/man/Makefile.am @@ -0,0 +1,22 @@ + +appmandir = $(APP_MAN_DIR) +appman_PRE = sessreg.man +appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX)) + +EXTRA_DIST = $(appman_PRE) filenames.sed.c +CLEANFILES = $(appman_DATA) filenames.sed +SUFFIXES = .$(APP_MAN_SUFFIX) .man + +AM_CPPFLAGS = -I.. +filenames.sed: filenames.sed.c + $(AM_V_GEN)$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(srcdir)/filenames.sed.c | \ + grep 's|__' > $@ + +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure +MAN_SUBSTS += -f filenames.sed + +sessreg.$(APP_MAN_SUFFIX): filenames.sed + +.man.$(APP_MAN_SUFFIX): + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ diff --git a/filenames.sed.c b/man/filenames.sed.c index 2db7845..2db7845 100644 --- a/filenames.sed.c +++ b/man/filenames.sed.c diff --git a/sessreg.man b/man/sessreg.man index bb1d9c8..bb1d9c8 100644 --- a/sessreg.man +++ b/man/sessreg.man |