Commit f2f11be8 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

download.[ch] is renamed to transfer.[ch], highlevel.[ch] is history

parent e09eda9c
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -53,14 +53,14 @@ cookie.c formdata.h http.c sendf.c \
cookie.h       ftp.c          http.h         sendf.h        url.c \
dict.c         ftp.h          if2ip.c        speedcheck.c   url.h \
dict.h         getdate.c      if2ip.h        speedcheck.h   urldata.h \
download.c     getdate.h      ldap.c         ssluse.c       version.c \
download.h     getenv.c       ldap.h         ssluse.h       \
getdate.h      ldap.c         ssluse.c       version.c \
getenv.c       ldap.h         ssluse.h       \
escape.c       getenv.h       mprintf.c      telnet.c       \
escape.h       getpass.c      netrc.c        telnet.h       \
getinfo.c highlevel.c strequal.c strequal.h easy.c \
getinfo.c transfer.c strequal.c strequal.h easy.c \
security.h security.c krb4.c krb4.h memdebug.c memdebug.h inet_ntoa_r.h

noinst_HEADERS = setup.h highlevel.h
noinst_HEADERS = setup.h transfer.h

# Say $(srcdir), so GNU make does not report an ambiguity with the .y.c rule.
$(srcdir)/getdate.c: getdate.y
+1 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ LIBCURLLIB = libcurl.lib
SOURCES	   = \
	base64.c \
	cookie.c \
	download.c \
	transfer.c \
	escape.c \
	formdata.c \
	ftp.c \
@@ -54,7 +54,6 @@ SOURCES = \
	getinfo.c \
	version.c \
	easy.c \
	highlevel.c \
	strequal.c

OBJECTS = $(SOURCES:.c=.obj)
+1 −2
Original line number Diff line number Diff line
+base64.obj &
+cookie.obj &
+download.obj &
+transfer.obj &
+escape.obj &
+formdata.obj &
+ftp.obj &
@@ -25,5 +25,4 @@
+getinfo.obj &
+version.obj &
+easy.obj &
+highlevel.obj &
+strequal.obj
+4 −4
Original line number Diff line number Diff line
@@ -30,16 +30,16 @@ libcurl_a_SOURCES = arpa_telnet.h file.c getpass.h netrc.h timeval.c base64.c \
	file.h hostip.c progress.c timeval.h base64.h formdata.c hostip.h progress.h	\
	cookie.c formdata.h http.c sendf.c cookie.h ftp.c http.h sendf.h url.c dict.c	\
	ftp.h if2ip.c speedcheck.c url.h dict.h getdate.c if2ip.h speedcheck.h		\
	urldata.h download.c getdate.h ldap.c ssluse.c version.c download.h getenv.c	\
	urldata.h transfer.c getdate.h ldap.c ssluse.c version.c transfer.h getenv.c	\
	ldap.h ssluse.h escape.c getenv.h mprintf.c telnet.c escape.h getpass.c netrc.c	\
	telnet.h getinfo.c highlevel.c strequal.c strequal.h easy.c security.h		\
	telnet.h getinfo.c strequal.c strequal.h easy.c security.h		\
	security.c krb4.c

libcurl_a_OBJECTS =  file.o timeval.o base64.o hostip.o progress.o \
	formdata.o cookie.o http.o sendf.o ftp.o url.o dict.o if2ip.o \
	speedcheck.o getdate.o download.o ldap.o ssluse.o version.o \
	speedcheck.o getdate.o transfer.o ldap.o ssluse.o version.o \
	getenv.o escape.o mprintf.o telnet.o getpass.o netrc.o getinfo.o \
	highlevel.o strequal.o easy.o security.o krb4.o
	strequal.o easy.o security.o krb4.o

LIBRARIES =  $(libcurl_a_LIBRARIES)
SOURCES = $(libcurl_a_SOURCES)
+10 −20
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ LINKSLIBS = libeay32.lib ssleay32.lib RSAglue.lib
RELEASE_OBJS= \
	base64r.obj \
	cookier.obj \
	downloadr.obj \
	transferr.obj \
	escaper.obj \
	formdatar.obj \
	ftpr.obj \
@@ -58,13 +58,12 @@ RELEASE_OBJS= \
	getinfor.obj \
	versionr.obj \
	easyr.obj \
	highlevelr.obj \
	strequalr.obj

DEBUG_OBJS= \
	base64d.obj \
	cookied.obj \
	downloadd.obj \
	transferd.obj \
	escaped.obj \
	formdatad.obj \
	ftpd.obj \
@@ -89,13 +88,12 @@ DEBUG_OBJS= \
	getinfod.obj \
	versiond.obj  \
	easyd.obj \
	highleveld.obj \
	strequald.obj

RELEASE_SSL_OBJS= \
	base64rs.obj \
	cookiers.obj \
	downloadrs.obj \
	transferrs.obj \
	escapers.obj \
	formdatars.obj \
	ftprs.obj \
@@ -120,13 +118,12 @@ RELEASE_SSL_OBJS= \
	getinfors.obj \
	versionrs.obj \
	easyrs.obj \
	highlevelrs.obj \
	strequalrs.obj

LINK_OBJS= \
	base64.obj \
	cookie.obj \
	download.obj \
	transfer.obj \
	escape.obj \
	formdata.obj \
	ftp.obj \
@@ -151,7 +148,6 @@ LINK_OBJS= \
	getinfo.obj \
	version.obj \
	easy.obj \
	highlevel.obj \
	strequal.obj

all : release
@@ -170,8 +166,8 @@ base64r.obj: base64.c
	$(CCR) $(CFLAGS) base64.c
cookier.obj: cookie.c
	$(CCR) $(CFLAGS) cookie.c
downloadr.obj: download.c
	$(CCR) $(CFLAGS) download.c
transferr.obj: transfer.c
	$(CCR) $(CFLAGS) transfer.c
escaper.obj: escape.c
	$(CCR) $(CFLAGS) escape.c
formdatar.obj: formdata.c
@@ -220,8 +216,6 @@ versionr.obj: version.c
	$(CCR) $(CFLAGS) version.c
easyr.obj: easy.c
	$(CCR) $(CFLAGS) easy.c
highlevelr.obj: highlevel.c
	$(CCR) $(CFLAGS) highlevel.c
strequalr.obj: strequal.c
	$(CCR) $(CFLAGS) strequal.c

@@ -230,8 +224,8 @@ base64d.obj: base64.c
	$(CCD) $(CFLAGS) base64.c
cookied.obj: cookie.c
	$(CCD) $(CFLAGS) cookie.c
downloadd.obj: download.c
	$(CCD) $(CFLAGS) download.c
transferd.obj: transfer.c
	$(CCD) $(CFLAGS) transfer.c
escaped.obj: escape.c
	$(CCD) $(CFLAGS) escape.c
formdatad.obj: formdata.c
@@ -280,8 +274,6 @@ versiond.obj: version.c
	$(CCD) $(CFLAGS) version.c
easyd.obj: easy.c
	$(CCD) $(CFLAGS) easy.c
highleveld.obj: highlevel.c
	$(CCD) $(CFLAGS) highlevel.c
strequald.obj: strequal.c
	$(CCD) $(CFLAGS) strequal.c

@@ -291,8 +283,8 @@ base64rs.obj: base64.c
	$(CCRS) $(CFLAGS) base64.c
cookiers.obj: cookie.c
	$(CCRS) $(CFLAGS) cookie.c
downloadrs.obj: download.c
	$(CCRS) $(CFLAGS) download.c
transferrs.obj: transfer.c
	$(CCRS) $(CFLAGS) transfer.c
escapers.obj: escape.c
	$(CCRS) $(CFLAGS) escape.c
formdatars.obj: formdata.c
@@ -341,8 +333,6 @@ versionrs.obj: version.c
	$(CCRS) $(CFLAGS) version.c
easyrs.obj: easy.c
	$(CCRS) $(CFLAGS) easy.c
highlevelrs.obj: highlevel.c
	$(CCRS) $(CFLAGS) highlevel.c
strequalrs.obj: strequal.c
	$(CCRS) $(CFLAGS) strequal.c