X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=sbr%2FMakefile.in;h=c9494693984b824e92699c6f1c151a8b4bf1d316;hb=3a84d814004fd4557bf4f44952648e9e69bd22a8;hp=d6c2796247c830464d79c5a5fa38c74199a1c0da;hpb=9a33ff618b5901a3af815650d4b84d39ee96e529;p=mmh

diff --git a/sbr/Makefile.in b/sbr/Makefile.in
index d6c2796..c949469 100644
--- a/sbr/Makefile.in
+++ b/sbr/Makefile.in
@@ -1,8 +1,6 @@
 #
 # Makefile for sbr subdirectory
 #
-# $Id$
-#
 
 SHELL = /bin/sh
 
@@ -18,11 +16,10 @@ etcdir      = @sysconfdir@
 
 CC       = @CC@
 CFLAGS   = @CFLAGS@
+DISABLE_UNUSED_MACROS_WARNING = @DISABLE_UNUSED_MACROS_WARNING@
 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)
+INCLUDES = -I. -I$(top_srcdir) @CPPFLAGS@
 
 LEX    = @LEX@
 AWK    = @AWK@
@@ -38,12 +35,12 @@ mailspool    = @mailspool@
 sendmailpath = @sendmailpath@
 
 COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CFLAGS)
-COMPILE2 = $(CC) -c $(DEFS) $(CONFIGDEFS) $(INCLUDES) $(KRB4_INCLUDES) $(HESIOD_INCLUDES) $(CFLAGS)
+COMPILE2 = $(CC) -c $(DEFS) $(CONFIGDEFS) $(INCLUDES) $(CFLAGS)
 
 
 
 .SUFFIXES:
-.SUFFIXES: .c .o
+.SUFFIXES: .c .o .lex
 
 .c.o:
 	$(COMPILE) $<
@@ -56,7 +53,8 @@ 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	\
+	copyip.c cpydata.c cpydgst.c crawl_folders.c			\
+	discard.c done.c dtime.c dtimep.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			\
@@ -64,7 +62,7 @@ SRCS = addrsbr.c ambigsw.c atooi.c brkstring.c			\
 	fmt_addr.c fmt_compile.c fmt_new.c fmt_rfc2047.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			\
+	m_maildir.c m_name.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			\
@@ -75,10 +73,7 @@ SRCS = addrsbr.c ambigsw.c atooi.c brkstring.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 utils.c
-
-# source for compatibility functions
-COMPAT = snprintf.c strdup.c strerror.c
+	m_msgdef.c mf.c utils.c m_mktemp.c
 
 OBJS =	$(SRCS:.c=.o)
 
@@ -86,7 +81,7 @@ OBJS =	$(SRCS:.c=.o)
 AUX = Makefile.in sigmsg.awk dtimep.lex
 
 # all files in this directory included in the distribution
-DIST = $(SRCS) $(COMPAT) $(AUX)
+DIST = $(SRCS) $(AUX)
 
 # ========= DEPENDENCIES FOR BUILDING ==========
 
@@ -99,16 +94,19 @@ sigmsg.h: sigmsg.awk
 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) -o$@ dtimep.lex
+# Note that not all lexes support -o (it is not POSIX); also
+# some lexes will only accept '-n -t', not '-nt'.
+# Also, not all makes accept $< in non-pattern rules,
+# hence the explicit filenames here.
+dtimep.o: dtimep.lex
+	$(LEX) -n -t $(srcdir)/dtimep.lex > dtimep.c
+	$(COMPILE) $(DISABLE_UNUSED_MACROS_WARNING) dtimep.c
 
 client.o: client.c
-	$(COMPILE2) client.c
+	$(COMPILE2) $(srcdir)/client.c
 
 mts.o: mts.c
-	$(COMPILE2) mts.c
+	$(COMPILE2) $(srcdir)/mts.c
 
 pidstatus.o: sigmsg.h
 
@@ -117,7 +115,7 @@ libmh.a: $(OBJS)
 	if test x$(LIBTOOL) != x -a x$(GNU_LIBTOOL) = x ; then \
 	  $(LIBTOOL) -static -c -o libmh.a $(OBJS) ; \
 	else \
-	  ar cr libmh.a `$(LORDER) $(OBJS) | $(TSORT)`  ; \
+	  ar cr libmh.a `$(LORDER) $(OBJS) | $(TSORT) 2>/dev/null`  ; \
 	  $(RANLIB) libmh.a  ; \
 	fi