X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2FMakefile.in;h=02038e74309f72a4c013435a15dfbfc2a03c1934;hp=7780970919e56f540ec0bee36af0a3a177ef30c8;hb=f78e7c6e6e616cc4ff2bee8a726365fafef2d8ce;hpb=d39e2c447b0d163a5a63f480b23d06edb7a73aa0

diff --git a/sbr/Makefile.in b/sbr/Makefile.in
index 7780970..02038e7 100644
--- a/sbr/Makefile.in
+++ b/sbr/Makefile.in
@@ -8,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@
@@ -17,8 +19,9 @@ etcdir      = @sysconfdir@
 CC       = @CC@
 CFLAGS   = @CFLAGS@
 DEFS     = @DEFS@
-CONFIGDEFS = -DNMHETCDIR='"$(etcdir)"' -DMAILSPOOL='"$(mailspool)"' -DSENDMAILPATH='"$(sendmailpath)"'
-INCLUDES = -I.. -I. -I$(top_srcdir) @CPPFLAGS@
+# 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@
@@ -30,15 +33,9 @@ GNU_LIBTOOL = @GNU_LIBTOOL@
 LINT    = @LINT@
 LINTFLAGS = @LINTFLAGS@
 
-LIBOBJS = @LIBOBJS@
-
-mailspool    = @mailspool@
-sendmailpath = @sendmailpath@
-
 COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CFLAGS)
-COMPILE2 = $(CC) -c $(DEFS) $(CONFIGDEFS) $(INCLUDES) $(CFLAGS)
-
 
+LOCALLIBS = ../config/config.o
 
 .SUFFIXES:
 .SUFFIXES: .c .o
@@ -50,42 +47,34 @@ COMPILE2 = $(CC) -c $(DEFS) $(CONFIGDEFS) $(INCLUDES) $(CFLAGS)
 SIGNAL_H = @SIGNAL_H@
 
 # source for library functions
-SRCS = addrsbr.c ambigsw.c atooi.c brkstring.c  \
-	check_charset.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 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  \
+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 getcpy.c getpass.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_backup.c  \
-	m_convert.c m_draft.c m_getfld.c m_gmprot.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 peekc.c pidwait.c pidstatus.c  \
-	print_help.c print_sw.c print_version.c push.c  \
-	putenv.c refile.c mhbasename.c  \
-	readconfig.c ruserpass.c seq_add.c seq_bits.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 showfile.c signals.c  \
-	smatch.c snprintb.c isprefix.c strcasecmp.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 = snprintf.c strdup.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
 
-OBJS =  $(SRCS:.c=.o) $(LIBOBJS)
-
-# auxiliary files
-AUX = Makefile.in sigmsg.awk dtimep.lex
-
-# all files in this directory included in the distribution
-DIST = $(SRCS) $(COMPAT) $(AUX)
+OBJS =  $(SRCS:.c=.o)
 
 # ========= DEPENDENCIES FOR BUILDING ==========
 
@@ -103,21 +92,20 @@ lint: sigmsg.h
 # Also, not all makes accept $< in non-pattern rules,
 # hence the explicit filenames here.
 dtimep.c: dtimep.lex
-	$(LEX) -n -t $(srcdir)/dtimep.lex > dtimep.c
-
-mts.o: mts.c
-	$(COMPILE2) $(srcdir)/mts.c
+	$(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) 2>/dev/null`  ; \
+	  ar cr libmh.a `$(LORDER) $(OBJS) $(LOCALLIBS) version.o | $(TSORT) 2>/dev/null`  ; \
 	  $(RANLIB) libmh.a  ; \
 	fi
+	rm -f version.o
 
 install:
 
@@ -144,11 +132,3 @@ subdir = sbr
 
 Makefile: Makefile.in ../config.status
 	cd .. && ./config.status $(subdir)/$@
-
-distdir = ../`cat ../distname`/$(subdir)
-nmhdist: $(DIST)
-	@echo "Copying distribution files in $(subdir)"
-	@for file in $(DIST); do \
-	  cp -p $(srcdir)/$$file $(distdir); \
-	done
-