X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2FMakefile.in;h=58cf5c7d46c3d5fd559f980152d66fba9f7fcfa2;hp=b27b12697d44a5a656f31a18d82abfe5e49b95f0;hb=5b483b0b8517541a8359d7049b4497c6efcb117e;hpb=a259594cc41e41bfbb90562d3977b8194d1446f5

diff --git a/sbr/Makefile.in b/sbr/Makefile.in
index b27b126..58cf5c7 100644
--- a/sbr/Makefile.in
+++ b/sbr/Makefile.in
@@ -1,8 +1,6 @@
 #
 # Makefile for sbr subdirectory
 #
-# $Id$
-#
 
 SHELL = /bin/sh
 
@@ -10,6 +8,8 @@ top_srcdir = @top_srcdir@
 srcdir     = @srcdir@
 VPATH      = @srcdir@
 
+VERSION = `$(top_srcdir)/version.sh $(top_srcdir)`
+
 prefix      = @prefix@
 exec_prefix = @exec_prefix@
 bindir      = @bindir@
@@ -19,10 +19,9 @@ 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)
+# add include dir . for sigmsg.h and .. for config.h when building
+# in different directory
+INCLUDES = -I$(top_srcdir) -I. -I.. @CPPFLAGS@
 
 LEX    = @LEX@
 AWK    = @AWK@
@@ -31,16 +30,12 @@ TSORT  = @TSORT@
 RANLIB = @RANLIB@
 LIBTOOL = @LIBTOOL@
 GNU_LIBTOOL = @GNU_LIBTOOL@
-LINT	= @LINT@
-LINTFLAGS = @LINTFLAGS@ 
-
-mailspool    = @mailspool@
-sendmailpath = @sendmailpath@
+LINT    = @LINT@
+LINTFLAGS = @LINTFLAGS@
 
 COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CFLAGS)
-COMPILE2 = $(CC) -c $(DEFS) $(CONFIGDEFS) $(INCLUDES) $(KRB4_INCLUDES) $(HESIOD_INCLUDES) $(CFLAGS)
-
 
+LOCALLIBS = ../config/config.o
 
 .SUFFIXES:
 .SUFFIXES: .c .o
@@ -52,40 +47,34 @@ COMPILE2 = $(CC) -c $(DEFS) $(CONFIGDEFS) $(INCLUDES) $(KRB4_INCLUDES) $(HESIOD_
 SIGNAL_H = @SIGNAL_H@
 
 # source for library functions
-SRCS = add.c 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	ext_hook.o 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			\
-	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			\
-	makedir.c mts.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			\
-	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
-
-# source for compatibility functions
-COMPAT = snprintf.c strdup.c strerror.c
-
-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)
+SRCS = addrsbr.c ambigsw.c brkstring.c  \
+	charset.c concat.c context_del.c  \
+	context_find.c context_read.c  \
+	context_replace.c context_save.c \
+	cpydata.c crawl_folders.c  \
+	dtime.c dtimep.c  \
+	error.c execprog.c ext_hook.c folder_addmsg.c folder_delmsgs.c  \
+	folder_free.c folder_read.c  \
+	folder_realloc.c gans.c getans.c getanswer.c  \
+	getarguments.c \
+	fmt_addr.c fmt_compile.c fmt_new.c fmt_rfc2047.c  \
+	fmt_scan.c lock_file.c m_atoi.c \
+	m_convert.c m_draft.c m_getfld2.c m_gmprot.c  \
+	m_name.c \
+	makedir.c mts.c norm_charmap.c  \
+	path.c pidwait.c pidstatus.c  \
+	print_help.c print_sw.c print_version.c \
+	putenv.c mhbasename.c  \
+	readconfig.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 signals.c  \
+	smatch.c snprintb.c strcasecmp.c  \
+	strindex.c trim.c trimcpy.c uprf.c vfgets.c fmt_def.c  \
+	mf.c utils.c m_mktemp.c seq_msgstats.c \
+	unquote.c encode_rfc2047.c parse_msgs.c
+
+OBJS =  $(SRCS:.c=.o)
 
 # ========= DEPENDENCIES FOR BUILDING ==========
 
@@ -98,25 +87,25 @@ sigmsg.h: sigmsg.awk
 lint: sigmsg.h
 	$(LINT) $(LINTFLAGS) $(INCLUDES) $(DEFS) $(SRCS)
 
+# 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.c: dtimep.lex
-	$(LEX) -nt $< > $@
-
-client.o: client.c
-	$(COMPILE2) $<
-
-mts.o: mts.c
-	$(COMPILE2) $<
+	$(LEX) -n -t $(srcdir)/dtimep.lex > $@
 
 pidstatus.o: sigmsg.h
 
-libmh.a: $(OBJS)
+libmh.a: $(OBJS) $(LOCALLIBS) version.c
 	rm -f $@
+	$(COMPILE) -DVERSION="\"$(VERSION)\"" -o version.o $(srcdir)/version.c
 	if test x$(LIBTOOL) != x -a x$(GNU_LIBTOOL) = x ; then \
-	  $(LIBTOOL) -static -c -o libmh.a $(OBJS) ; \
+	  $(LIBTOOL) -static -c -o libmh.a $(OBJS) $(LOCALLIBS) version.o; \
 	else \
-	  ar cr libmh.a `$(LORDER) $(OBJS) | $(TSORT)`  ; \
+	  ar cr libmh.a `$(LORDER) $(OBJS) $(LOCALLIBS) version.o | $(TSORT) 2>/dev/null`  ; \
 	  $(RANLIB) libmh.a  ; \
 	fi
+	rm -f version.o
 
 install:
 
@@ -128,7 +117,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
@@ -142,12 +131,4 @@ superclean: realclean
 subdir = sbr
 
 Makefile: Makefile.in ../config.status
-	cd .. && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
- 
-distdir = ../`cat ../distname`/$(subdir)
-nmhdist: $(DIST)
-	@echo "Copying distribution files in $(subdir)"
-	@for file in $(DIST); do \
-	  cp -p $(srcdir)/$$file $(distdir); \
-	done
-
+	cd .. && ./config.status $(subdir)/$@