X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2FMakefile.in;h=0f84568b97256f9ed274fb0c4ac885f2f2a25a20;hp=17d82e89d1e64fc81099cfdb5d937bc902df9106;hb=da304a48a24d7cc7fafae13c994d94ad3d6483f2;hpb=81a21a9a97d8633f6d6231e31fdb6e328d0d3ff2

diff --git a/sbr/Makefile.in b/sbr/Makefile.in
index 17d82e8..0f84568 100644
--- a/sbr/Makefile.in
+++ b/sbr/Makefile.in
@@ -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)
+INCLUDES = -I.. -I. -I$(top_srcdir) @CPPFLAGS@
 
 LEX    = @LEX@
 AWK    = @AWK@
@@ -34,11 +33,13 @@ 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) $(KRB4_INCLUDES) $(HESIOD_INCLUDES) $(CFLAGS)
+COMPILE2 = $(CC) -c $(DEFS) $(CONFIGDEFS) $(INCLUDES) $(HESIOD_INCLUDES) $(CFLAGS)
 
 
 
@@ -52,11 +53,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	\
+	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			\
 	folder_realloc.c gans.c	getans.c getanswer.c			\
@@ -68,19 +70,19 @@ SRCS = add.c addrsbr.c ambigsw.c atooi.c brkstring.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 utils.c
+	m_msgdef.c mf.c utils.c m_mktemp.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
@@ -99,16 +101,18 @@ sigmsg.h: sigmsg.awk
 lint: sigmsg.h
 	$(LINT) $(LINTFLAGS) $(INCLUDES) $(DEFS) $(SRCS)
 
-# Note that some lexes (for example flex 2.5.4) require that there
-# be no space between -o and the output filename.
+# 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) -o$@ dtimep.lex
+	$(LEX) -n -t $(srcdir)/dtimep.lex > dtimep.c
 
 client.o: client.c
-	$(COMPILE2) client.c
+	$(COMPILE2) $(srcdir)/client.c
 
 mts.o: mts.c
-	$(COMPILE2) mts.c
+	$(COMPILE2) $(srcdir)/mts.c
 
 pidstatus.o: sigmsg.h