X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/c485a357cc3bb71a27ed7ed0b6f199f0f05f470a..6902ed178ba54c8e1c410519f7ee576ddb42554c:/Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 1ea4694e..56e1b042 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -26,9 +26,11 @@ ZLIBOBJ=zlib/deflate.o zlib/infblock.o zlib/infcodes.o zlib/inffast.o \
 	zlib/inflate.o zlib/inftrees.o zlib/infutil.o zlib/trees.o \
 	zlib/zutil.o zlib/adler32.o 
 OBJS1=rsync.o generator.o receiver.o cleanup.o sender.o exclude.o util.o main.o checksum.o match.o syscall.o log.o backup.o
-OBJS2=options.o flist.o io.o compat.o hlink.o token.o uidlist.o socket.o fileio.o
+OBJS2=options.o flist.o io.o compat.o hlink.o token.o uidlist.o socket.o fileio.o batch.o
 DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o
-OBJS=$(OBJS1) $(OBJS2) $(DAEMON_OBJ) $(LIBOBJ) $(ZLIBOBJ)
+popt_OBJS=popt/findme.o  popt/popt.o  popt/poptconfig.o \
+	popt/popthelp.o popt/poptparse.o
+OBJS=$(OBJS1) $(OBJS2) $(DAEMON_OBJ) $(LIBOBJ) $(ZLIBOBJ) @BUILD_POPT@
 
 # note that the -I. is needed to handle config.h when using VPATH
 .c.o:
@@ -36,11 +38,6 @@ OBJS=$(OBJS1) $(OBJS2) $(DAEMON_OBJ) $(LIBOBJ) $(ZLIBOBJ)
 	$(CC) -I. -I$(srcdir) $(CFLAGS) -c $< @CC_SHOBJ_FLAG@
 @OBJ_RESTORE@
 
-rsync: @BUILD_LIBPOPT@
-
-popt-1.2/libpopt.a:
-	$(MAKE) -C popt-1.2 libpopt.a
-
 all: rsync
 
 man: rsync.1 rsyncd.conf.5
@@ -59,6 +56,13 @@ install-strip:
 rsync: $(OBJS)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o rsync $(OBJS) $(LIBS)
 
+Makefile: Makefile.in configure config.status
+	echo "WARNING: You need to run ./config.status --recheck"
+
+# don't actually run autoconf, just issue a warning
+configure: configure.in
+	echo "WARNING: you need to rerun autoconf"
+
 rsync.1: rsync.yo
 	yodl2man -o rsync.1 rsync.yo