Fixed make_bcc_file () to use contents of From: in draft, if draft_from masquerade...

[mmh] / sbr / Makefile.in

diff --git a/sbr/Makefile.in b/sbr/Makefile.in
index a2bc3bd..37434d9 100644 (file)
--- a/sbr/Makefile.in
+++ b/sbr/Makefile.in
@@ -10,9 +10,18 @@ top_srcdir = @top_srcdir@
 srcdir     = @srcdir@
 VPATH      = @srcdir@
 
+prefix      = @prefix@
+exec_prefix = @exec_prefix@
+bindir      = @bindir@
+libdir      = @libdir@
+etcdir      = @sysconfdir@
+
 CC       = @CC@
 CFLAGS   = @CFLAGS@
 DEFS     = @DEFS@
+KRB4_INCLUDES = @KRB4_INCLUDES@      # for mts
+HESIOD_INCLUDES = @HESIOD_INCLUDES@  # for mts
+CONFIGDEFS = -DNMHETCDIR='"$(etcdir)"' -DMAILSPOOL='"$(mailspool)"' -DSENDMAILPATH='"$(sendmailpath)"'
 INCLUDES = -I.. -I. -I$(top_srcdir)
 
 LEX    = @LEX@
@@ -22,8 +31,16 @@ TSORT  = @TSORT@
 RANLIB = @RANLIB@
 LIBTOOL = @LIBTOOL@
 GNU_LIBTOOL = @GNU_LIBTOOL@
+LINT   = @LINT@
+LINTFLAGS = @LINTFLAGS@ 
+
+mailspool    = @mailspool@
+sendmailpath = @sendmailpath@
 
 COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CFLAGS)
+COMPILE2 = $(CC) -c $(DEFS) $(CONFIGDEFS) $(INCLUDES) $(KRB4_INCLUDES) $(HESIOD_INCLUDES) $(CFLAGS)
+
+
 
 .SUFFIXES:
 .SUFFIXES: .c .o
@@ -35,12 +52,12 @@ COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CFLAGS)
 SIGNAL_H = @SIGNAL_H@
 
 # source for library functions
-SRCS = add.c addrsbr.c ambigsw.c atooi.c brkstring.c                   \
-       check_charset.c closefds.c concat.c context_del.c               \
+SRCS = addrsbr.c ambigsw.c atooi.c brkstring.c                 \
+       check_charset.c client.c closefds.c concat.c context_del.c      \
        context_find.c context_foil.c context_read.c                    \
        context_replace.c context_save.c copy.c                         \
        copyip.c cpydata.c cpydgst.c discard.c done.c dtime.c dtimep.c  \
-       error.c fdcompare.c folder_addmsg.c folder_delmsgs.c            \
+       error.c ext_hook.c fdcompare.c folder_addmsg.c folder_delmsgs.c \
        folder_free.c folder_pack.c folder_read.c                       \
        folder_realloc.c gans.c getans.c getanswer.c                    \
        getarguments.c getcpy.c getfolder.c getpass.c                   \
@@ -48,21 +65,22 @@ SRCS = add.c addrsbr.c ambigsw.c atooi.c brkstring.c                        \
        fmt_scan.c lock_file.c m_atoi.c m_backup.c                      \
        m_convert.c m_draft.c m_getfld.c m_gmprot.c                     \
        m_maildir.c m_name.c m_scratch.c m_tmpfil.c                     \
-       makedir.c path.c peekc.c pidwait.c pidstatus.c                  \
+       makedir.c mts.c norm_charmap.c                                  \
+       path.c peekc.c pidwait.c pidstatus.c                            \
        print_help.c print_sw.c print_version.c push.c                  \
-       putenv.c pwd.c refile.c remdir.c r1bindex.c                     \
+       putenv.c refile.c       remdir.c r1bindex.c                     \
        readconfig.c ruserpass.c seq_add.c seq_bits.c                   \
        seq_del.c seq_getnum.c seq_list.c seq_nameok.c                  \
        seq_print.c seq_read.c seq_save.c seq_setcur.c                  \
        seq_setprev.c seq_setunseen.c showfile.c signals.c              \
        smatch.c snprintb.c ssequal.c strcasecmp.c                      \
        strindex.c trimcpy.c uprf.c vfgets.c fmt_def.c                  \
-       m_msgdef.c mf.c
+       m_msgdef.c mf.c utils.c
 
 # source for compatibility functions
-COMPAT = snprintf.c strdup.c strerror.c
+COMPAT = snprintf.c strdup.c
 
-OBJS = $(patsubst %.c,%.o,$(SRCS))
+OBJS = $(SRCS:.c=.o)
 
 # auxiliary files
 AUX = Makefile.in sigmsg.awk dtimep.lex
@@ -78,8 +96,19 @@ all: libmh.a
 sigmsg.h: sigmsg.awk
        $(AWK) -f $(srcdir)/sigmsg.awk $(SIGNAL_H) > $@
 
+lint: sigmsg.h
+       $(LINT) $(LINTFLAGS) $(INCLUDES) $(DEFS) $(SRCS)
+
+# Note that some lexes (for example flex 2.5.4) require that there
+# be no space between -o and the output filename.
 dtimep.c: dtimep.lex
-       $(LEX) -nit $< > $@
+       $(LEX) -o$@ dtimep.lex
+
+client.o: client.c
+       $(COMPILE2) client.c
+
+mts.o: mts.c
+       $(COMPILE2) mts.c
 
 pidstatus.o: sigmsg.h
 
@@ -102,7 +131,7 @@ mostlyclean:
        rm -f *.o *~
 
 clean: mostlyclean
-       rm -f libmh.a sigmsg.h
+       rm -f libmh.a sigmsg.h dtimep.c
 
 distclean: clean
        rm -f Makefile
@@ -116,7 +145,7 @@ superclean: realclean
 subdir = sbr
 
 Makefile: Makefile.in ../config.status
-       cd .. && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
+       cd .. && ./config.status $(subdir)/$@
  
 distdir = ../`cat ../distname`/$(subdir)
 nmhdist: $(DIST)