diff options
| author | Guenter Knauf <lists@gknw.net> | 2010-08-07 18:32:39 +0200 |
|---|---|---|
| committer | Guenter Knauf <lists@gknw.net> | 2010-08-07 18:33:46 +0200 |
| commit | 6ea043a504d4b3307def90d54f9474ae02e97372 (patch) | |
| tree | 9fe753c1c83abbc4efdae2d4be8639b147579c73 /src/Makefile.Watcom | |
| parent | af4eae77acd6d5d353c583b2616903b7c865daea (diff) | |
| download | gnurl-6ea043a504d4b3307def90d54f9474ae02e97372.tar.gz gnurl-6ea043a504d4b3307def90d54f9474ae02e97372.tar.bz2 gnurl-6ea043a504d4b3307def90d54f9474ae02e97372.zip | |
Fix to overwrite libcurl name.
Diffstat (limited to 'src/Makefile.Watcom')
| -rw-r--r-- | src/Makefile.Watcom | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/Makefile.Watcom b/src/Makefile.Watcom index 05972bcb0..9b3479238 100644 --- a/src/Makefile.Watcom +++ b/src/Makefile.Watcom @@ -10,12 +10,17 @@ SYS_INCL = -I$(%watcom)\h\nt -I$(%watcom)\h SYS_LIBS = $(%watcom)\lib386\nt;$(%watcom)\lib386 !endif -TARGETS = libcurl_wc.dll libcurl_wc_imp.lib libcurl_wc.lib +!ifdef %libname +LIBNAME = $(%libname) +!else +LIBNAME = libcurl +!endif +TARGETS = $(LIBNAME).dll $(LIBNAME)_imp.lib $(LIBNAME).lib CC = wcc386 LD = wlink -RC = wrc AR = wlib +RC = wrc !ifdef __LOADDLL__ ! loaddll wcc386 wccd386 @@ -123,7 +128,7 @@ $(LINK_ARG): $(__MAKEFILES__) # @%append $^@ library clib3r.lib !ifdef %curl_static @%append $^@ library wldap32.lib - @%append $^@ library ..\lib\libcurl.lib + @%append $^@ library ..\lib\$(LIBNAME).lib !ifdef %use_zlib @%append $^@ library $(ZLIB_ROOT)\zlib.lib !endif @@ -131,7 +136,7 @@ $(LINK_ARG): $(__MAKEFILES__) @%append $^@ library $(ARES_ROOT)\cares.lib !endif !else - @%append $^@ library ..\lib\libcurl_imp.lib + @%append $^@ library ..\lib\$(LIBNAME)_imp.lib !endif !ifeq USE_WATT32 1 @%append $^@ library $(%watt_root)\lib\wattcpw_imp.lib |