X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2FMakefile.in;h=a920958c18e5f052b2302777499f8dc1563eb4e2;hp=882094e6c72645d5f0d9df3bf0addf8b0b1bf00e;hb=0aef47ae5c03e1d9e3f225efe5ae362e7cf5ee35;hpb=dee387b53ab0d42922f857b60d6f980c9e79d16f

diff --git a/sbr/Makefile.in b/sbr/Makefile.in
index 882094e..a920958 100644
--- a/sbr/Makefile.in
+++ b/sbr/Makefile.in
@@ -34,6 +34,8 @@ GNU_LIBTOOL = @GNU_LIBTOOL@
 LINT	= @LINT@
 LINTFLAGS = @LINTFLAGS@ 
 
+LIBOBJS = @LIBOBJS@
+
 mailspool    = @mailspool@
 sendmailpath = @sendmailpath@
 
@@ -52,12 +54,12 @@ 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			\
+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	\
-	error.c	fdcompare.c folder_addmsg.c folder_delmsgs.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			\
 	getarguments.c getcpy.c getfolder.c getpass.c			\
@@ -65,21 +67,22 @@ SRCS = add.c addrsbr.c ambigsw.c atooi.c brkstring.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		\
+	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 pwd.c refile.c	remdir.c r1bindex.c			\
+	putenv.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
+	m_msgdef.c mf.c utils.c
 
 # source for compatibility functions
-COMPAT = snprintf.c strdup.c strerror.c
+COMPAT = memmove.c snprintf.c strdup.c strerror.c
 
-OBJS =	$(SRCS:.c=.o)
+OBJS =	$(SRCS:.c=.o) $(LIBOBJS)
 
 # auxiliary files
 AUX = Makefile.in sigmsg.awk dtimep.lex
@@ -98,14 +101,18 @@ 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 $< > $@
+	$(LEX) -n -t $(srcdir)/dtimep.lex > dtimep.c
 
 client.o: client.c
-	$(COMPILE2) $<
+	$(COMPILE2) $(srcdir)/client.c
 
 mts.o: mts.c
-	$(COMPILE2) $<
+	$(COMPILE2) $(srcdir)/mts.c
 
 pidstatus.o: sigmsg.h
 
@@ -128,7 +135,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,7 +149,7 @@ superclean: realclean
 subdir = sbr
 
 Makefile: Makefile.in ../config.status
-	cd .. && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
+	cd .. && ./config.status $(subdir)/$@
  
 distdir = ../`cat ../distname`/$(subdir)
 nmhdist: $(DIST)