Factor trim format function out

[mmh] / man / Makefile.in

diff --git a/man/Makefile.in b/man/Makefile.in
index e7f58be..adb0e89 100644 (file)
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -30,7 +30,7 @@ INSTALL      = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 
 SED = sed
-SEDMAN = @$(SED) -f man.sed $< > $@
+SEDMAN = $(SED) -f man.sed $< > $@
 
 .SUFFIXES:
 .SUFFIXES: .man1 .man5 .man7 .man8 \
@@ -49,44 +49,43 @@ SEDMAN = @$(SED) -f man.sed $< > $@
        $(SEDMAN)
 
 # man pages to install in $(mandir)/$(manext1)
-MAN1SRC = ali. anno. burst. comp. dist. flist. flists. folder. folders.    \
-       forw. inc. mark. mh-chart. mhbuild. mhl. mhlist. mmh.               \
-       mhmail. mhparam. mhpath. mhshow. mhstore. msgchk. new. fnext.       \
+MAN1SRC = ali. anno. burst. comp. dist. flist. flists. folder. folders. \
+       forw. inc. mark. mhbuild. mhl. mhlist. mhsign. mhpgp. mmh. mmhwrap. \
+       mhmail. mhparam. mhpath. mhstore. new. fnext. \
        fprev. unseen. next. packf. pick. prev. prompter. rcvdist. rcvpack. \
-       rcvstore. refile. repl. rmf. rmm. scan. send. sendfiles.    \
-       show. slocal. sortm. whatnow.
+       rcvstore. refile. repl. rmf. rmm. scan. send. sendfiles. \
+       show. slocal. sortm. whatnow. whom. whatnow2.
 
-MAN5SRC = mh-alias. mh-format. mh-mail. mh-profile. mh-tailor.
+MAN5SRC = mh-alias. mh-format. mh-mail. mh-profile.
 
-MAN7SRC = mmh-intro. mh-draft. mh-sequence. 
+MAN7SRC = mmh-intro. mh-chart. mh-draft. mh-sequence. 
 
-MAN8SRC = ap. dp. fmtdump. post.
+MAN8SRC = spost. ap. dp. fmtdump.
 
 MAN1 = $(MAN1SRC:.=.$(manext1))
 MAN5 = $(MAN5SRC:.=.$(manext5))
 MAN7 = $(MAN7SRC:.=.$(manext7))
 MAN8 = $(MAN8SRC:.=.$(manext8))
 
-# source for man pages
-DIST_MAN1 = $(MAN1SRC:.=.man1)
-DIST_MAN5 = $(MAN5SRC:.=.man5)
-DIST_MAN7 = $(MAN7SRC:.=.man7)
-DIST_MAN8 = $(MAN8SRC:.=.man8)
-
-# auxiliary files
-AUX = Makefile.in
-
-# all files in this directory included in the distribution
-DIST = $(DIST_MAN1) $(DIST_MAN5) $(DIST_MAN7) $(DIST_MAN8) $(AUX)
+ALLPROGS = $(MAN1) $(MAN8)
 
 # ========= DEFAULT TARGET ==========
 
 all: $(MAN1) $(MAN5) $(MAN7) $(MAN8)
 
+mh-chart.man7: $(ALLPROGS)
+       $(srcdir)/mh-chart-gen.sh $(ALLPROGS) >$@
+
+titles:
+       $(srcdir)/gettitles.sh 1 >titles1.temp
+       $(srcdir)/gettitles.sh 5 >titles5.temp
+       $(srcdir)/gettitles.sh 7 >titles7.temp
+       $(srcdir)/gettitles.sh 8 >titles8.temp
+
 $(MAN1) $(MAN5) $(MAN7) $(MAN8): man.sed
 
 # create the sed file for building man pages
-man.sed: Makefile
+man.sed: Makefile titles
        @echo 's,%nmhwarning%,THIS FILE HAS BEEN AUTOMATICALLY GENERATED.  DO NOT EDIT.,g' > $@
        @echo 's,%nmhversion%,mmh-$(VERSION),g' >> $@
        @echo 's,%nmhdate%,$(DATE),g' >> $@
@@ -112,6 +111,11 @@ man.sed: Makefile
        @echo ' s,%mhl_format%,,g' >> $@
        @echo '/%mhl_reply%/r $(top_srcdir)/etc/mhl.reply' >> $@
        @echo ' s,%mhl_reply%,,g' >> $@
+       @echo '/^%titles1%$$/r titles1.temp' >> $@
+       @echo '/^%titles5%$$/r titles5.temp' >> $@
+       @echo '/^%titles7%$$/r titles7.temp' >> $@
+       @echo '/^%titles8%$$/r titles8.temp' >> $@
+       @echo '/^%titles[0-9]%$$/d' >> $@
 
 # ========= INSTALL TARGETS =========
 
@@ -179,7 +183,9 @@ mostlyclean:
        rm -f *~
 
 clean: mostlyclean
-       rm -f man.sed *.$(manext1) *.$(manext5) *.$(manext7) *.$(manext8)
+       rm -f $(MAN1) $(MAN5) $(MAN7) $(MAN8)
+       rm -f man.sed mh-chart.man7
+       rm -f titles[0-9].temp
 
 distclean: clean
        rm -f Makefile
@@ -197,10 +203,3 @@ subdir = man
 Makefile: Makefile.in ../config.status
        cd .. && ./config.status $(subdir)/$@
 
-distdir = ../`cat ../distname`/$(subdir)
-mmhdist: $(DIST)
-       @echo "Copying distribution files in $(subdir)"
-       @for file in $(DIST); do \
-         cp -p $(srcdir)/$$file $(distdir); \
-       done
-