diff options
| author | Yang Tse <yangsita@gmail.com> | 2007-02-20 12:13:14 +0000 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2007-02-20 12:13:14 +0000 |
| commit | e268e8559ef3da2410ec9160559f607b817e0ff9 (patch) | |
| tree | c91ce2e33420556549b61abb74e8c17d8f6d111d /src/Makefile.m32 | |
| parent | 29bb6f65f1ac786b189ca6e860b463c5142bc486 (diff) | |
curl tool was using functions curlx_tvnow and curlx_tvdiff which are not
part of the official libcurl API http://curl.haxx.se/lxr/source/lib/README.curlx
The documented way of using them would be to use timeval.c as a source code file.
The above described method works very well when statically linking libcurl and
apps, curl tool, but has several drawbacks when you build a true shared
libcurl (i.e. Name space clash at linkage stage as functions are defined more
than once. Windows makefiles are not capable of handling this system of
source-level sharing)
So...
Now curlutil.h and curlutil.c define and implement cutil_tvnow and cutil_tvdiff
which replace curlx_tvnow and curlx_tvdiff for the curl tool. Doing this we
avoid the above described problems.
Diffstat (limited to 'src/Makefile.m32')
| -rw-r--r-- | src/Makefile.m32 | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/Makefile.m32 b/src/Makefile.m32 index 49f070ad6..ced5c7003 100644 --- a/src/Makefile.m32 +++ b/src/Makefile.m32 @@ -66,7 +66,7 @@ curl_LDADD += -lwsock32 -lws2_32 -lwinmm -L$(ZLIB_PATH) -lz # Makefile.inc provides the CSOURCES and HHEADERS defines include Makefile.inc -curl_OBJECTS := $(patsubst %.c,%.o,$(notdir $(strip $(CURL_SOURCES) ../lib/timeval.c))) +curl_OBJECTS := $(patsubst %.c,%.o,$(strip $(CURL_SOURCES))) # curlx_OBJECTS := $(patsubst %.c,%.o,$(notdir $(strip $(CURLX_ONES)))) # vpath %.c ../lib @@ -79,9 +79,6 @@ curl.exe: curl.res $(curl_OBJECTS) $(curl_DEPENDENCIES) $(LINK) $< $(curl_OBJECTS) $(curl_LDADD) $(STRIP) $@ -timeval.o: ../lib/timeval.c - $(COMPILE) -c $< - # We don't have nroff normally under win32 # hugehelp.c: ../README.curl ../curl.1 mkhelp.pl # $(RM) hugehelp.c |