X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2FMakefile.in;h=51049c70d186ef9ab21097f0fb19470483cddcba;hp=9539c0fb058551103e34d3029e0f760a8aec2963;hb=d5d94ce76327869346e2b02b7b02a3620ddd38eb;hpb=cc87eac5c0e4025fba81abe8433315df84489c56

diff --git a/sbr/Makefile.in b/sbr/Makefile.in
index 9539c0f..51049c7 100644
--- a/sbr/Makefile.in
+++ b/sbr/Makefile.in
@@ -17,8 +17,9 @@ etcdir      = @sysconfdir@
 CC       = @CC@
 CFLAGS   = @CFLAGS@
 DEFS     = @DEFS@
-# add include dir . for sigmsg.h when building in different directory
-INCLUDES = -I$(top_srcdir) -I. @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@
@@ -32,7 +33,7 @@ LINTFLAGS = @LINTFLAGS@
 
 COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CFLAGS)
 
-
+LOCALLIBS = ../config/version.o ../config/config.o
 
 .SUFFIXES:
 .SUFFIXES: .c .o
@@ -49,8 +50,8 @@ SRCS = addrsbr.c ambigsw.c brkstring.c  \
 	context_find.c context_read.c  \
 	context_replace.c context_save.c \
 	cpydata.c cpydgst.c crawl_folders.c  \
-	discard.c done.c dtime.c dtimep.c  \
-	error.c ext_hook.c folder_addmsg.c folder_delmsgs.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 \
@@ -68,16 +69,11 @@ SRCS = addrsbr.c ambigsw.c brkstring.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
+	mf.c utils.c m_mktemp.c seq_msgstats.c \
+	unquote.c encode_rfc2047.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) $(AUX)
-
 # ========= DEPENDENCIES FOR BUILDING ==========
 
 # default target
@@ -98,12 +94,12 @@ dtimep.c: dtimep.lex
 
 pidstatus.o: sigmsg.h
 
-libmh.a: $(OBJS)
+libmh.a: $(OBJS) $(LOCALLIBS)
 	rm -f $@
 	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) ; \
 	else \
-	  ar cr libmh.a `$(LORDER) $(OBJS) | $(TSORT) 2>/dev/null`  ; \
+	  ar cr libmh.a `$(LORDER) $(OBJS) $(LOCALLIBS) | $(TSORT) 2>/dev/null`  ; \
 	  $(RANLIB) libmh.a  ; \
 	fi
 
@@ -133,10 +129,3 @@ subdir = sbr
 Makefile: Makefile.in ../config.status
 	cd .. && ./config.status $(subdir)/$@
 
-distdir = ../`cat ../distname`/$(subdir)
-mmhdist: $(DIST)
-	@echo "Copying distribution files in $(subdir)"
-	@for file in $(DIST); do \
-	  cp -p $(srcdir)/$$file $(distdir); \
-	done
-