improved --limit-rate functionality, partly by the new use of curlx_tvnow()

1 files changed, 12 insertions, 11 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 30a735b8e..a83309725 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -31,10 +31,14 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/include -I$(top_builddir)/src \
 
 bin_PROGRAMS = curl
 
-curl_SOURCES = main.c hugehelp.c hugehelp.h urlglob.c writeout.c setup.h \
-	config-win32.h config-mac.h config-vms.h config-riscos.h \
-	urlglob.h version.h writeout.h writeenv.c writeenv.h \
-	getpass.c getpass.h homedir.c homedir.h $(top_srcdir)/lib/strtoofft.c
+# libcurl has sources that provide functions named curlx_* that aren't part of
+# the official API, but we re-use the code here to avoid duplication.
+curlx_ones =  $(top_srcdir)/lib/strtoofft.c $(top_srcdir)/lib/timeval.c
+
+curl_SOURCES = main.c hugehelp.c hugehelp.h urlglob.c writeout.c setup.h   \
+	config-win32.h config-mac.h config-vms.h config-riscos.h urlglob.h \
+	version.h writeout.h writeenv.c writeenv.h getpass.c getpass.h	   \
+	homedir.c homedir.h $(curlx_ones)
 
 curl_LDADD = ../lib/libcurl.la
 curl_DEPENDENCIES = ../lib/libcurl.la
@@ -42,13 +46,10 @@ BUILT_SOURCES = hugehelp.c
 CLEANFILES = hugehelp.c
 NROFF=@NROFF@ @MANOPT@ # figured out by the configure script
 
-EXTRA_DIST = mkhelp.pl makefile.dj \
-	Makefile.vc6 Makefile.b32 Makefile.m32 Makefile.riscos config.h.in \
-	macos/curl.mcp.xml.sit.hqx \
-	macos/MACINSTALL.TXT \
-	macos/src/curl_GUSIConfig.cpp \
-	macos/src/macos_main.cpp \
-	config-amigaos.h makefile.amiga curl.rc \
+EXTRA_DIST = mkhelp.pl makefile.dj Makefile.vc6 Makefile.b32 Makefile.m32 \
+	Makefile.riscos config.h.in macos/curl.mcp.xml.sit.hqx		  \
+	macos/MACINSTALL.TXT macos/src/curl_GUSIConfig.cpp		  \
+	macos/src/macos_main.cpp config-amigaos.h makefile.amiga curl.rc  \
 	Makefile.netware config-netware.h
 
 MANPAGE=$(top_srcdir)/docs/curl.1