Revert "Update to 7.40.1"
[platform/upstream/curl.git] / src / Makefile.Watcom
index a475cfb..8d9754f 100644 (file)
@@ -3,35 +3,65 @@
 #  G. Vanem <gvanem@broadpark.no>
 #
 
+.ERASE
+
+!if $(__VERSION__) < 1280
+!message !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!message ! This Open Watcom version is too old and is no longer supported !
+!message !     Please download latest version from www.openwatcom.org     !
+!message !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!error Unsupported version of Open Watcom
+!endif
+
 !ifndef %watcom
 !error WATCOM environment variable not set!
+!endif
+
+# In order to process Makefile.inc wmake must be called with -u switch!
+!ifndef %MAKEFLAGS
+!error You MUST call wmake with the -u switch!
+!endif
+
+!ifdef %libname
+LIBNAME = $(%libname)
 !else
-SYS_INCL = -I$(%watcom)\h\nt -I$(%watcom)\h
-SYS_LIBS = $(%watcom)\lib386\nt;$(%watcom)\lib386
+LIBNAME = libcurl
 !endif
 
-TARGETS = libcurl_wc.dll libcurl_wc_imp.lib libcurl_wc.lib
+TARGETS = curl.exe
 
 CC = wcc386
 LD = wlink
-RC = wrc
 AR = wlib
+RC = wrc
 
 !ifdef __LOADDLL__
 !  loaddll wcc386  wccd386
 !  loaddll wpp386  wppd386
-!  loaddll wlink   wlinkd
 !  loaddll wlib    wlibd
+!  loaddll wlink   wlinkd
 !endif
 
+!ifdef __UNIX__
+CP = cp
+MD = mkdir -p
+!else
+CP = copy 2>NUL
 MD = mkdir
-RM = del /q /f >NUL 2>&1
-RD = rmdir /q /s >NUL 2>&1
-CP = copy
+!endif
+!if $(__VERSION__) > 1290
+RD = rm -rf
+!else ifdef __UNIX__
+RD = rm -rf
+!else
+RD = rmdir /q /s 2>NUL
+!endif
+
+SYS_INCL = -I"$(%watcom)/h/nt" -I"$(%watcom)/h"
 
 CFLAGS = -3r -mf -hc -zff -zgf -zq -zm -s -fr=con -w2 -fpi -oilrtfm &
          -wcd=201 -bt=nt -bc -d+ -dWIN32 -dHAVE_STRTOLL             &
-         -I..\include -I..\lib $(SYS_INCL)
+         -I"../include" -I"../lib" $(SYS_INCL)
 
 !ifdef %debug
 DEBUG  = -dDEBUG=1 -dDEBUGBUILD
@@ -44,154 +74,139 @@ CFLAGS += -d0
 CFLAGS += -d_WIN32_WINNT=0x0501 -dENABLE_IPV6
 !endif
 
-OBJ_DIR  = WC_Win32.obj
-LINK_ARG = $(OBJ_DIR)\wlink.arg
+!ifdef %use_ssl
+CFLAGS += -wcd=138 -dUSE_OPENSSL -dUSE_SSLEAY -I"$(OPENSSL_ROOT)/inc32"
+!endif
 
-# In order to process Makefile.inc wmake must be called with -u switch!
-!ifneq __MAKEOPTS__ -u
-!error You MUST call wmake with the -u switch!
+!ifdef %curl_static
+CFLAGS += -DCURL_STATICLIB
 !else
-!include Makefile.inc
+CFLAGS += -br
+!endif
+
+#
+# Change to suite.
+#
+!ifdef %zlib_root
+ZLIB_ROOT = $(%zlib_root)
+!else
+ZLIB_ROOT = ../../zlib-1.2.8
 !endif
-# Unfortunately, we can't include Makefile.inc here because wmake doesn't
-# use backslash as the line continuation character by default
-CURL_SOURCES = main.c hugehelp.c urlglob.c writeout.c writeenv.c &
-       getpass.c homedir.c curlutil.c os-specific.c
 
-CURLX_SOURCES = rawstr.c nonblock.c
+!ifdef %libssh2_root
+LIBSSH2_ROOT = $(%libssh2_root)
+!else
+LIBSSH2_ROOT = ../../libssh2-1.4.3
+!endif
 
-OBJS = $(CURL_SOURCES:.c=.obj)
-!ifdef %curl_static
-CFLAGS += -DCURL_STATICLIB
+!ifdef %librtmp_root
+LIBRTMP_ROOT = $(%librtmp_root)
+!else
+LIBRTMP_ROOT = ../../rtmpdump-2.3
+!endif
+
+!ifdef %openssl_root
+OPENSSL_ROOT = $(%openssl_root)
 !else
-OBJS += $(CURLX_SOURCES:.c=.obj)
+OPENSSL_ROOT = ../../openssl-0.9.8y
+!endif
+
+!ifdef %ares_root
+ARES_ROOT = $(%ares_root)
+!else
+ARES_ROOT = ../ares
+!endif
+
+OBJ_DIR  = WC_Win32.obj
+LINK_ARG = $(OBJ_DIR)/wlink.arg
+
+!include Makefile.inc
+
+OBJS1 = $(OBJ_DIR)/$(CURL_CFILES)
+!ifndef %curl_static
+OBJS1 += $(CURLX_CFILES:../lib/=)
 !endif
-OBJS = $OBJ_DIR\$(OBJS: = $OBJ_DIR\)
+OBJS2 = $(OBJS1: = $(OBJ_DIR)/)
+OBJS = $(OBJS2:.c=.obj)
 
-RESOURCE = $(OBJ_DIR)\curl.res
+RESOURCE = $(OBJ_DIR)/curl.res
 
-all: hugehelp.c $(OBJ_DIR) curl.exe .SYMBOLIC
+DIRS = $(OBJ_DIR)
+
+all: tool_hugehelp.c $(DIRS) $(TARGETS) .SYMBOLIC
        @echo Welcome to cURL
 
-hugehelp.c: hugehelp.c.cvs
+clean: .SYMBOLIC
+       -rm -f $(OBJS)
+       -rm -f $(RESOURCE) $(LINK_ARG)
+
+vclean distclean: clean .SYMBOLIC
+       -$(RD) $(OBJ_DIR)
+       -rm -f curl.exe curl.sym tool_hugehelp.c
+
+tool_hugehelp.c: tool_hugehelp.c.cvs
        $(CP) $[@ $^@
 
-hugehelp.c.cvs: .EXISTSONLY
-       $(CP) hugehelp.c $^@
+tool_hugehelp.c.cvs: .EXISTSONLY
+       $(CP) tool_hugehelp.c $^@
 
-$(OBJ_DIR):
+$(DIRS):
        -$(MD) $^@
 
-curl.exe: $(OBJS) $(RESOURCE) $(LINK_ARG)
-       $(LD) name $^@ @$(LINK_ARG)
-
-$(LINK_ARG): $(__MAKEFILES__)
-       %create $^@
-       @%append $^@ system nt
-       @%append $^@ file { $(OBJS) }
-       @%append $^@ option quiet, map, caseexact, eliminate,
-       @%append $^@ res=$(RESOURCE) libpath $(SYS_LIBS)
-#      @%append $^@ library clib3r.lib
-!ifdef %curl_static
-       @%append $^@ library wldap32.lib
-       @%append $^@ library ..\lib\libcurl_wc.lib
+curl.exe: $(OBJS) $(RESOURCE)
+       %create $(LINK_ARG)
+       @%append $(LINK_ARG) system nt
+!ifdef %debug
+       @%append $(LINK_ARG) debug all
+       @%append $(LINK_ARG) option symfile
+!endif
+       @%append $(LINK_ARG) option quiet, caseexact, eliminate
+       @%append $(LINK_ARG) option map=$(OBJ_DIR)/$^&.map
+       @%append $(LINK_ARG) option res=$(RESOURCE)
+       @%append $(LINK_ARG) file { $(OBJS) }
+!ifndef %curl_static
+       @%append $(LINK_ARG) library ../lib/$(LIBNAME)_imp.lib
 !else
-       @%append $^@ library ..\lib\libcurl_wc_imp.lib
+       @%append $(LINK_ARG) library ../lib/$(LIBNAME).lib
+       @%append $(LINK_ARG) library wldap32.lib
+! ifdef %use_zlib
+       @%append $(LINK_ARG) library '$(ZLIB_ROOT)/zlib.lib'
+! endif
+! ifdef %use_rtmp
+       @%append $(LINK_ARG) library '$(LIBRTMP_ROOT)/librtmp/librtmp.lib'
+       @%append $(LINK_ARG) library winmm.lib
+! endif
+! ifdef %use_ssh2
+       @%append $(LINK_ARG) library '$(LIBSSH2_ROOT)/win32/libssh2.lib'
+! endif
+! ifdef %use_ssl
+       @%append $(LINK_ARG) library '$(OPENSSL_ROOT)/out32/libeay32.lib'
+       @%append $(LINK_ARG) library '$(OPENSSL_ROOT)/out32/ssleay32.lib'
+! endif
+! ifdef %use_ares
+       @%append $(LINK_ARG) library '$(ARES_ROOT)/cares.lib'
+! endif
+! ifdef %use_winidn
+!  if $(__VERSION__) > 1290
+       @%append $(LINK_ARG) library normaliz.lib
+!  else
+       @%append $(LINK_ARG) import '_IdnToAscii@20' 'NORMALIZ.DLL'.'IdnToAscii'
+       @%append $(LINK_ARG) import '_IdnToUnicode@20' 'NORMALIZ.DLL'.'IdnToUnicode'
+!  endif
+! endif
 !endif
 !ifeq USE_WATT32 1
-       @%append $^@ library $(%watt_root)\lib\wattcpw_imp.lib
+       @%append $(LINK_ARG) library '$(%watt_root)/lib/wattcpw_imp.lib'
 !else
-       @%append $^@ library ws2_32.lib
+       @%append $(LINK_ARG) library ws2_32.lib
 !endif
-
-clean: .SYMBOLIC
-       -$(RM) $(OBJS)
-       -$(RM) $(RESOURCE) $(LINK_ARG)
-
-vclean realclean: clean .SYMBOLIC
-       -$(RD) $(OBJ_DIR)
-       -$(RM) curl.exe curl.map hugehelp.c
+       $(LD) name $^@ @$(LINK_ARG)
 
 $(RESOURCE): curl.rc
-       $(RC) $(DEBUG) -q -r -zm -I..\include $(SYS_INCL) $[@ -fo=$^@
-
-.ERASE
-.c{$(OBJ_DIR)}.obj:
-       $(CC) $(CFLAGS) $[@ -fo=$^@
+       $(RC) $(DEBUG) -q -r -zm -bt=nt -I"../include" $(SYS_INCL) $[@ -fo=$^@
 
-.ERASE
-$(OBJ_DIR)\rawstr.obj: ..\lib\rawstr.c
-       $(CC) $(CFLAGS) $[@ -fo=$^@
+# suffix search path - vpath-like hack
+.c: ../lib
 
-.ERASE
-$(OBJ_DIR)\nonblock.obj: ..\lib\nonblock.c
+.c{$(OBJ_DIR)}.obj:
        $(CC) $(CFLAGS) $[@ -fo=$^@
-
-#
-# Dependencies based on "gcc -MM .."
-#
-$(OBJ_DIR)\getpass.obj: getpass.c setup.h config-win32.h ..\lib\setup_once.h getpass.h &
-  ..\lib\memdebug.h ..\lib\setup.h ..\lib\config-win32.h &
-  ..\include\curl\curlbuild.h ..\include\curl\curlrules.h &
-  ..\include\curl\curl.h ..\include\curl\curlver.h &
-  ..\include\curl\curlrules.h ..\include\curl\easy.h &
-  ..\include\curl\multi.h ..\include\curl\curl.h
-
-$(OBJ_DIR)\homedir.obj: homedir.c setup.h config-win32.h ..\lib\setup_once.h homedir.h &
-  ..\lib\memdebug.h ..\lib\setup.h ..\lib\config-win32.h &
-  ..\include\curl\curlbuild.h ..\include\curl\curlrules.h &
-  ..\include\curl\curl.h ..\include\curl\curlver.h &
-  ..\include\curl\curlrules.h ..\include\curl\easy.h &
-  ..\include\curl\multi.h ..\include\curl\curl.h
-
-$(OBJ_DIR)\hugehelp.obj: hugehelp.c
-
-$(OBJ_DIR)\main.obj: main.c setup.h config-win32.h ..\lib\setup_once.h &
-  ..\include\curl\curl.h ..\include\curl\curlver.h &
-  ..\include\curl\curlbuild.h ..\include\curl\curlrules.h &
-  ..\include\curl\easy.h ..\include\curl\multi.h ..\include\curl\curl.h &
-  urlglob.h writeout.h getpass.h homedir.h curlutil.h hugehelp.h &
-  version.h ..\include\curl\curlver.h ..\lib\curlx.h &
-  ..\include\curl\mprintf.h ..\lib\strequal.h ..\lib\strtoofft.h &
-  ..\lib\setup.h ..\lib\config-win32.h ..\include\curl\curlbuild.h &
-  ..\include\curl\curlrules.h ..\lib\timeval.h ..\lib\memdebug.h &
-  os-specific.h
-
-$(OBJ_DIR)\urlglob.obj: urlglob.c setup.h config-win32.h ..\lib\setup_once.h &
-  ..\include\curl\curl.h ..\include\curl\curlver.h &
-  ..\include\curl\curlbuild.h ..\include\curl\curlrules.h &
-  ..\include\curl\easy.h ..\include\curl\multi.h ..\include\curl\curl.h &
-  ..\include\curl\mprintf.h urlglob.h ..\lib\memdebug.h ..\lib\setup.h &
-  ..\lib\config-win32.h ..\include\curl\curlbuild.h &
-  ..\include\curl\curlrules.h os-specific.h
-
-$(OBJ_DIR)\writeenv.obj: writeenv.c setup.h config-win32.h ..\lib\setup_once.h
-
-$(OBJ_DIR)\writeout.obj: writeout.c setup.h config-win32.h ..\lib\setup_once.h &
-  ..\include\curl\curl.h ..\include\curl\curlver.h &
-  ..\include\curl\curlbuild.h ..\include\curl\curlrules.h &
-  ..\include\curl\easy.h ..\include\curl\multi.h ..\include\curl\curl.h &
-  ..\include\curl\mprintf.h writeout.h
-
-$(OBJ_DIR)\curlutil.obj: curlutil.c setup.h config-win32.h ..\lib\setup_once.h &
-  curlutil.h
-
-$(OBJ_DIR)\os-specific.obj: os-specific.c os-specific.h setup.h config-win32.h &
-  ..\lib\setup_once.h
-
-$(OBJ_DIR)\rawstr.obj: ..\lib\rawstr.c ..\lib\setup.h ..\lib\config-win32.h &
-  ..\include\curl\curlbuild.h ..\include\curl\curlrules.h ..\lib\setup_once.h &
-  ..\include\curl\curl.h ..\include\curl\curlver.h ..\include\curl\curlrules.h &
-  ..\include\curl\easy.h ..\include\curl\multi.h ..\include\curl\curl.h &
-  ..\lib\strerror.h ..\lib\urldata.h ..\lib\cookie.h ..\lib\formdata.h &
-  ..\lib\timeval.h ..\lib\http_chunks.h ..\lib\hostip.h ..\lib\hash.h &
-  ..\lib\llist.h ..\lib\splay.h ..\include\curl\mprintf.h
-
-$(OBJ_DIR)\nonblock.obj: ..\lib\nonblock.c ..\lib\setup.h ..\lib\config-win32.h &
-  ..\include\curl\curlbuild.h ..\include\curl\curlrules.h ..\lib\setup_once.h &
-  ..\include\curl\curl.h ..\include\curl\curlver.h ..\include\curl\curlrules.h &
-  ..\include\curl\easy.h ..\include\curl\multi.h ..\include\curl\curl.h &
-  ..\lib\strerror.h ..\lib\urldata.h ..\lib\cookie.h ..\lib\formdata.h &
-  ..\lib\timeval.h ..\lib\http_chunks.h ..\lib\hostip.h ..\lib\hash.h &
-  ..\lib\llist.h ..\lib\splay.h ..\include\curl\mprintf.h ..\lib\nonblock.h
-