Added -nocontentid (and -contentid, for symmetry) switch to mhbuild. This allows...

[mmh] / mts / Makefile.in

diff --git a/mts/Makefile.in b/mts/Makefile.in
index 328a9ea..fcec813 100644 (file)
--- a/mts/Makefile.in
+++ b/mts/Makefile.in
@@ -17,6 +17,15 @@ etcdir='$(etcdir)' libdir='$(libdir)' mandir='$(mandir)' \
 mailspool='$(mailspool)' sendmailpath='$(sendmailpath)' \
 default_editor='$(default_editor)' default_pager='$(default_pager)'
 
+LORDER = @LORDER@
+TSORT  = @TSORT@
+RANLIB = @RANLIB@
+LIBTOOL = @LIBTOOL@
+GNU_LIBTOOL = @GNU_LIBTOOL@
+
+# object files that go into libmts.a
+OBJS =  smtp/hosts.o smtp/smtp.o
+
 # auxiliary files
 AUX = Makefile.in
 
@@ -24,18 +33,32 @@ AUX = Makefile.in
 DIST = $(AUX)
 
 # subdirectories
-SUBDIRS = smtp sendmail mmdf
+SUBDIRS = smtp
 
-# mail transport agent we are using
-MTS = @MTS@
+# mail transport agent we are using (currently always smtp)
+# MTS = smtp
+# DEPRECATED: smtp/sendmail functionality handled by mts.conf
 
 # ========= DEPENDENCIES FOR BUILDING AND INSTALLING ==========
 
-all install uninstall:
-       for subdir in $(MTS); do \
-         (cd $$subdir && $(MAKE) $(MAKEDEFS) $@) || exit 1; \
+all: all-recursive libmts.a
+
+all-recursive:
+       for subdir in $(SUBDIRS); do \
+         (cd $$subdir && $(MAKE) $(MAKEDEFS) all) || exit 1; \
        done
 
+libmts.a: $(OBJS)
+       rm -f $@
+       if test x$(LIBTOOL) != x -a x$(GNU_LIBTOOL) = x ; then \
+         $(LIBTOOL) -static -c $(OBJS) -o $@  ; \
+       else \
+         ar cr $@ `$(LORDER) $(OBJS) | $(TSORT)`  ; \
+         $(RANLIB) $@  ; \
+       fi 
+
+install uninstall:
+
 # ========== DEPENDENCIES FOR CLEANUP ==========
 
 mostlyclean: mostlyclean-recursive mostlyclean-local
@@ -48,7 +71,7 @@ mostlyclean-local:
        rm -f *~
 
 clean-local: mostlyclean-local
-
+       rm -f libmts.a
 distclean-local: clean-local
        rm -f Makefile
 
@@ -62,12 +85,19 @@ mostlyclean-recursive clean-recursive distclean-recursive realclean-recursive su
          (cd $$subdir && $(MAKE) $(MAKEDEFS) $$target) || exit 1; \
        done
 
+# ========== DEPENDENCIES FOR LINT =================
+
+lint:
+       for subdir in $(SUBDIRS); do \
+         ( cd $$subdir && $(MAKE) $(MAKEDEFS) lint ) || exit 1; \
+       done
+
 # ========== DEPENDENCIES FOR MAINTENANCE ==========
 
 subdir = mts
 
 Makefile: Makefile.in ../config.status
-       cd .. && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
+       cd .. && ./config.status $(subdir)/$@
  
 distdir = ../`cat ../distname`/$(subdir)
 nmhdist: $(DIST)