Upgrade from including popt1.2 to a version of popt1.5 trimmed down to

[rsync/rsync.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 1ea4694..223d469 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -28,7 +28,9 @@ ZLIBOBJ=zlib/deflate.o zlib/infblock.o zlib/infcodes.o zlib/inffast.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
 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
@@ -57,7 +54,7 @@ install-strip:
        $(MAKE) INSTALLCMD='$(INSTALLCMD) -s' install
 
 rsync: $(OBJS)
-       $(CC) $(CFLAGS) $(LDFLAGS) -o rsync $(OBJS) $(LIBS)
+       $(CC) $(CFLAGS) $(LDFLAGS) -o rsync $(OBJS) $(LIBS) 
 
 rsync.1: rsync.yo
        yodl2man -o rsync.1 rsync.yo