From: Martin Pool <mbp@samba.org>
Date: Fri, 23 Feb 2001 00:47:09 +0000 (+0000)
Subject: Change from getopt to popt.
X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/c485a357cc3bb71a27ed7ed0b6f199f0f05f470a

Change from getopt to popt.
Automatically build included libpopt if there is none on the system.
---

diff --git a/Makefile.in b/Makefile.in
index 1a590c79..1ea4694e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -21,7 +21,7 @@ SHELL=/bin/sh
 .SUFFIXES:
 .SUFFIXES: .c .o
 
-LIBOBJ=lib/getopt.o lib/fnmatch.o lib/compat.o lib/snprintf.o lib/mdfour.o
+LIBOBJ=lib/fnmatch.o lib/compat.o lib/snprintf.o lib/mdfour.o
 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 
@@ -36,6 +36,11 @@ 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