diff options
| author | Gisle Vanem <gvanem@broadpark.no> | 2007-12-09 09:44:05 +0000 |
|---|---|---|
| committer | Gisle Vanem <gvanem@broadpark.no> | 2007-12-09 09:44:05 +0000 |
| commit | 2b314064ae8d57866c93c7ac1330c40ca059a046 (patch) | |
| tree | a2c67f5383978b2ef27ab5faf8f6408db41c379e | |
| parent | 439990be88e674a95f1ecddb9dc8585fb068cd50 (diff) | |
Removed building 'libcurl_wc.lib' as this isn't a static-library
in the common sense. Renamed 'OBJ_DIR' to 'WC_Win32.obj'.
| -rw-r--r-- | lib/Makefile.Watcom | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/lib/Makefile.Watcom b/lib/Makefile.Watcom index 89b0ec333..a3fe6fc6b 100644 --- a/lib/Makefile.Watcom +++ b/lib/Makefile.Watcom @@ -1,18 +1,19 @@ # # Watcom / OpenWatcom / Win32 makefile for libcurl. -# G. Vanem <giva@bgnett.no> +# G. Vanem <gvanem@broadpark.no> # # $Id$ -TARGETS = ca-bundle.h libcurl_wc.lib libcurl_wc.dll libcurl_wc_imp.lib +TARGETS = ca-bundle.h libcurl_wc.dll libcurl_wc_imp.lib CC = wcc386 -CFLAGS = -3r -mf -d3 -hc -zff -zgf -zq -zm -zc -s -fr=con -w2 -fpi -oilrtfm -bt=nt -bd & - -d+ -dWIN32 -dCURL_CA_BUNDLE=getenv("CURL_CA_BUNDLE") & +CFLAGS = -3r -mf -d3 -hc -zff -zgf -zq -zm -zc -s -fr=con -w2 -fpi -oilrtfm -bt=nt & + -bd -d+ -dWIN32 -dCURL_CA_BUNDLE=getenv("CURL_CA_BUNDLE") & -dBUILDING_LIBCURL -dWITHOUT_MM_LIB -dHAVE_SPNEGO=1 -dENABLE_IPV6 & -dDEBUG_THREADING_GETADDRINFO -dDEBUG=1 -dCURLDEBUG -d_WIN32_WINNT=0x0501 & - -I. -I..\include -dWINBERAPI=__declspec(cdecl) -dWINLDAPAPI=__declspec(cdecl) + -dWINBERAPI=__declspec(cdecl) -dWINLDAPAPI=__declspec(cdecl) & + -I. -I..\include # # Change to suite. @@ -24,9 +25,8 @@ USE_ZLIB = 0 CFLAGS += -dHAVE_ZLIB_H -dHAVE_LIBZ -I$(ZLIB_ROOT) !endif -OBJ_DIR = Watcom_obj +OBJ_DIR = WC_Win32.obj C_ARG = $(OBJ_DIR)\wcc386.arg -LIB_ARG = $(OBJ_DIR)\wlib.arg LINK_ARG = $(OBJ_DIR)\wlink.arg OBJS = $(OBJ_DIR)\base64.obj $(OBJ_DIR)\connect.obj & @@ -70,17 +70,14 @@ $(OBJ_DIR): ca-bundle.h: @echo /* dummy ca-bundle.h. Not used */ > $@ -libcurl_wc.lib: $(OBJS) $(LIB_ARG) - wlib -q -b -c $@ @$(LIB_ARG) - -libcurl_wc.dll: $(OBJS) $(RESOURCE) $(LINK_ARG) +libcurl_wc.dll libcurl_wc_imp.lib: $(OBJS) $(RESOURCE) $(LINK_ARG) wlink name libcurl_wc.dll @$(LINK_ARG) clean: .SYMBOLIC - rm -f $(OBJS) $(RESOURCE) vclean realclean: clean .SYMBOLIC - - rm -f $(TARGETS) $(C_ARG) $(LIB_ARG) $(LINK_ARG) libcurl_wc.map + - rm -f $(TARGETS) $(C_ARG) $(LINK_ARG) libcurl_wc.map - rmdir $(OBJ_DIR) .ERASE @@ -95,10 +92,6 @@ $(C_ARG): $(__MAKEFILES__) %create $^@ %append $^@ $(CFLAGS) -$(LIB_ARG): $(__MAKEFILES__) - %create $^@ - for %f in ($(OBJS)) do @%append $^@ +- %f - $(LINK_ARG): $(__MAKEFILES__) %create $^@ @%append $^@ system nt dll |