Changed types and added casts so that build is clean with gcc -Wsign-compare.

[mmh] / sbr / Makefile.in

diff --git a/sbr/Makefile.in b/sbr/Makefile.in
index e2f8cb4..c949469 100644 (file)
--- a/sbr/Makefile.in
+++ b/sbr/Makefile.in
@@ -16,9 +16,10 @@ etcdir      = @sysconfdir@
 
 CC       = @CC@
 CFLAGS   = @CFLAGS@
+DISABLE_UNUSED_MACROS_WARNING = @DISABLE_UNUSED_MACROS_WARNING@
 DEFS     = @DEFS@
 CONFIGDEFS = -DNMHETCDIR='"$(etcdir)"' -DMAILSPOOL='"$(mailspool)"' -DSENDMAILPATH='"$(sendmailpath)"'
-INCLUDES = -I.. -I. -I$(top_srcdir) @CPPFLAGS@
+INCLUDES = -I. -I$(top_srcdir) @CPPFLAGS@
 
 LEX    = @LEX@
 AWK    = @AWK@
@@ -30,8 +31,6 @@ GNU_LIBTOOL = @GNU_LIBTOOL@
 LINT   = @LINT@
 LINTFLAGS = @LINTFLAGS@ 
 
-LIBOBJS = @LIBOBJS@
-
 mailspool    = @mailspool@
 sendmailpath = @sendmailpath@
 
@@ -41,7 +40,7 @@ COMPILE2 = $(CC) -c $(DEFS) $(CONFIGDEFS) $(INCLUDES) $(CFLAGS)
 
 
 .SUFFIXES:
-.SUFFIXES: .c .o
+.SUFFIXES: .c .o .lex
 
 .c.o:
        $(COMPILE) $<
@@ -63,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                  \
@@ -76,16 +75,13 @@ SRCS = addrsbr.c ambigsw.c atooi.c brkstring.c                      \
        strindex.c trimcpy.c uprf.c vfgets.c fmt_def.c                  \
        m_msgdef.c mf.c utils.c m_mktemp.c
 
-# source for compatibility functions
-COMPAT = memmove.c snprintf.c strdup.c strerror.c
-
-OBJS = $(SRCS:.c=.o) $(LIBOBJS)
+OBJS = $(SRCS:.c=.o)
 
 # auxiliary files
 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 ==========
 
@@ -102,8 +98,9 @@ lint: sigmsg.h
 # some lexes will only accept '-n -t', not '-nt'.
 # Also, not all makes accept $< in non-pattern rules,
 # hence the explicit filenames here.
-dtimep.c: dtimep.lex
+dtimep.o: dtimep.lex
        $(LEX) -n -t $(srcdir)/dtimep.lex > dtimep.c
+       $(COMPILE) $(DISABLE_UNUSED_MACROS_WARNING) dtimep.c
 
 client.o: client.c
        $(COMPILE2) $(srcdir)/client.c
@@ -118,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