moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

build: updated dependencies in makefiles.

Browse Source
This commit is contained in:
Guenter Knauf 2014-12-05 14:54:25 +01:00
parent aa0e2ac451
commit ccfa139c71
14 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/INSTALL
View File

@ -209,7 +209,7 @@ Win32
environment variables, for example: environment variables, for example:
set ZLIB_PATH=c:\zlib-1.2.8 set ZLIB_PATH=c:\zlib-1.2.8
set OPENSSL_PATH=c:\openssl-0.9.8y set OPENSSL_PATH=c:\openssl-0.9.8zc
set LIBSSH2_PATH=c:\libssh2-1.4.3 set LIBSSH2_PATH=c:\libssh2-1.4.3
ATTENTION: if you want to build with libssh2 support you have to use latest ATTENTION: if you want to build with libssh2 support you have to use latest
@ -317,7 +317,7 @@ Win32
Before running nmake define the OPENSSL_PATH environment variable with Before running nmake define the OPENSSL_PATH environment variable with
the root/base directory of OpenSSL, for example: the root/base directory of OpenSSL, for example:
set OPENSSL_PATH=c:\openssl-0.9.8y set OPENSSL_PATH=c:\openssl-0.9.8zc
Then run 'nmake vc-ssl' or 'nmake vc-ssl-dll' in curl's root Then run 'nmake vc-ssl' or 'nmake vc-ssl-dll' in curl's root
directory. 'nmake vc-ssl' will create a libcurl static and dynamic directory. 'nmake vc-ssl' will create a libcurl static and dynamic

2
docs/examples/Makefile.m32
View File

@ -38,7 +38,7 @@ ZLIB_PATH = ../../../zlib-1.2.8
endif endif
# Edit the path below to point to the base of your OpenSSL package. # Edit the path below to point to the base of your OpenSSL package.
ifndef OPENSSL_PATH ifndef OPENSSL_PATH
OPENSSL_PATH = ../../../openssl-0.9.8y OPENSSL_PATH = ../../../openssl-0.9.8zc
endif endif
# Edit the path below to point to the base of your LibSSH2 package. # Edit the path below to point to the base of your LibSSH2 package.
ifndef LIBSSH2_PATH ifndef LIBSSH2_PATH

2
docs/examples/Makefile.netware
View File

@ -19,7 +19,7 @@ endif
# Edit the path below to point to the base of your OpenSSL package. # Edit the path below to point to the base of your OpenSSL package.
ifndef OPENSSL_PATH ifndef OPENSSL_PATH
OPENSSL_PATH = ../../../openssl-0.9.8y OPENSSL_PATH = ../../../openssl-0.9.8zc
endif endif
# Edit the path below to point to the base of your LibSSH2 package. # Edit the path below to point to the base of your LibSSH2 package.

2
lib/Makefile.Watcom
View File

@ -113,7 +113,7 @@ LIBRTMP_ROOT = ../../rtmpdump-2.3
!ifdef %openssl_root !ifdef %openssl_root
OPENSSL_ROOT = $(%openssl_root) OPENSSL_ROOT = $(%openssl_root)
!else !else
OPENSSL_ROOT = ../../openssl-0.9.8y OPENSSL_ROOT = ../../openssl-0.9.8zc
!endif !endif
!ifdef %ares_root !ifdef %ares_root

2
lib/Makefile.b32
View File

@ -27,7 +27,7 @@ ZLIB_PATH = ..\..\zlib-1.2.8
# Edit the path below to point to the base of your OpenSSL package. # Edit the path below to point to the base of your OpenSSL package.
!ifndef OPENSSL_PATH !ifndef OPENSSL_PATH
OPENSSL_PATH = ..\..\openssl-0.9.8y OPENSSL_PATH = ..\..\openssl-0.9.8zc
!endif !endif
# Set libcurl static lib, dll and import lib # Set libcurl static lib, dll and import lib

4
lib/Makefile.m32
View File

@ -18,7 +18,7 @@ ZLIB_PATH = ../../zlib-1.2.8
endif endif
# Edit the path below to point to the base of your OpenSSL package. # Edit the path below to point to the base of your OpenSSL package.
ifndef OPENSSL_PATH ifndef OPENSSL_PATH
OPENSSL_PATH = ../../openssl-0.9.8y OPENSSL_PATH = ../../openssl-0.9.8zc
endif endif
# Edit the path below to point to the base of your LibSSH2 package. # Edit the path below to point to the base of your LibSSH2 package.
ifndef LIBSSH2_PATH ifndef LIBSSH2_PATH
@ -44,7 +44,7 @@ LDAP_SDK = c:/novell/ndk/cldapsdk/win32
endif endif
# Edit the path below to point to the base of your nghttp2 package. # Edit the path below to point to the base of your nghttp2 package.
ifndef NGHTTP2_PATH ifndef NGHTTP2_PATH
NGHTTP2_PATH = ../../nghttp2-0.6.4 NGHTTP2_PATH = ../../nghttp2-0.6.7
endif endif
PROOT = .. PROOT = ..

4
lib/Makefile.netware
View File

@ -19,7 +19,7 @@ endif
# Edit the path below to point to the base of your OpenSSL package. # Edit the path below to point to the base of your OpenSSL package.
ifndef OPENSSL_PATH ifndef OPENSSL_PATH
OPENSSL_PATH = ../../openssl-0.9.8y OPENSSL_PATH = ../../openssl-0.9.8zc
endif endif
# Edit the path below to point to the base of your LibSSH2 package. # Edit the path below to point to the base of your LibSSH2 package.
@ -44,7 +44,7 @@ endif
# Edit the path below to point to the base of your nghttp2 package. # Edit the path below to point to the base of your nghttp2 package.
ifndef NGHTTP2_PATH ifndef NGHTTP2_PATH
NGHTTP2_PATH = ../../nghttp2-0.6.4 NGHTTP2_PATH = ../../nghttp2-0.6.7
endif endif
# Edit the path below to point to the base of your fbopenssl package. # Edit the path below to point to the base of your fbopenssl package.

2
lib/Makefile.vc6
View File

@ -65,7 +65,7 @@
!INCLUDE ..\winbuild\Makefile.msvc.names !INCLUDE ..\winbuild\Makefile.msvc.names
!IFNDEF OPENSSL_PATH !IFNDEF OPENSSL_PATH
OPENSSL_PATH = ../../openssl-0.9.8y OPENSSL_PATH = ../../openssl-0.9.8zc
!ENDIF !ENDIF
!IFNDEF LIBSSH2_PATH !IFNDEF LIBSSH2_PATH

4
lib/Makefile.vxworks
View File

@ -33,8 +33,8 @@ BUILD_TYPE := debug
USER_CFLAGS:= USER_CFLAGS:=
# directories where to seek for includes and libraries # directories where to seek for includes and libraries
OPENSSL_INC := D:/libraries/openssl/openssl-0.9.8y-vxWorks6.3/include OPENSSL_INC := D:/libraries/openssl/openssl-0.9.8zc-vxWorks6.3/include
OPENSSL_LIB := D:/libraries/openssl/openssl-0.9.8y-vxWorks6.3 OPENSSL_LIB := D:/libraries/openssl/openssl-0.9.8zc-vxWorks6.3
ZLIB_INC := D:/libraries/zlib/zlib-1.2.8-VxWorks6.3/zlib-1.2.8 ZLIB_INC := D:/libraries/zlib/zlib-1.2.8-VxWorks6.3/zlib-1.2.8
ZLIB_LIB := D:/libraries/zlib/zlib-1.2.8-VxWorks6.3/binaries/vxworks_3.1_gnu/Debug/lib ZLIB_LIB := D:/libraries/zlib/zlib-1.2.8-VxWorks6.3/binaries/vxworks_3.1_gnu/Debug/lib
ARES_INC := ARES_INC :=

2
src/Makefile.Watcom
View File

@ -108,7 +108,7 @@ LIBRTMP_ROOT = ../../rtmpdump-2.3
!ifdef %openssl_root !ifdef %openssl_root
OPENSSL_ROOT = $(%openssl_root) OPENSSL_ROOT = $(%openssl_root)
!else !else
OPENSSL_ROOT = ../../openssl-0.9.8y OPENSSL_ROOT = ../../openssl-0.9.8zc
!endif !endif
!ifdef %ares_root !ifdef %ares_root

2
src/Makefile.b32
View File

@ -27,7 +27,7 @@ ZLIB_PATH = ..\..\zlib-1.2.8
# Edit the path below to point to the base of your OpenSSL package. # Edit the path below to point to the base of your OpenSSL package.
!ifndef OPENSSL_PATH !ifndef OPENSSL_PATH
OPENSSL_PATH = ..\..\openssl-0.9.8y OPENSSL_PATH = ..\..\openssl-0.9.8zc
!endif !endif
# Set program's name # Set program's name

4
src/Makefile.m32
View File

@ -18,7 +18,7 @@ ZLIB_PATH = ../../zlib-1.2.8
endif endif
# Edit the path below to point to the base of your OpenSSL package. # Edit the path below to point to the base of your OpenSSL package.
ifndef OPENSSL_PATH ifndef OPENSSL_PATH
OPENSSL_PATH = ../../openssl-0.9.8y OPENSSL_PATH = ../../openssl-0.9.8zc
endif endif
# Edit the path below to point to the base of your LibSSH2 package. # Edit the path below to point to the base of your LibSSH2 package.
ifndef LIBSSH2_PATH ifndef LIBSSH2_PATH
@ -56,7 +56,7 @@ LDAP_SDK = c:/novell/ndk/cldapsdk/win32
endif endif
# Edit the path below to point to the base of your nghttp2 package. # Edit the path below to point to the base of your nghttp2 package.
ifndef NGHTTP2_PATH ifndef NGHTTP2_PATH
NGHTTP2_PATH = ../../nghttp2-0.6.4 NGHTTP2_PATH = ../../nghttp2-0.6.7
endif endif
PROOT = .. PROOT = ..

4
src/Makefile.netware
View File

@ -19,7 +19,7 @@ endif
# Edit the path below to point to the base of your OpenSSL package. # Edit the path below to point to the base of your OpenSSL package.
ifndef OPENSSL_PATH ifndef OPENSSL_PATH
OPENSSL_PATH = ../../openssl-0.9.8y OPENSSL_PATH = ../../openssl-0.9.8zc
endif endif
# Edit the path below to point to the base of your LibSSH2 package. # Edit the path below to point to the base of your LibSSH2 package.
@ -44,7 +44,7 @@ endif
# Edit the path below to point to the base of your nghttp2 package. # Edit the path below to point to the base of your nghttp2 package.
ifndef NGHTTP2_PATH ifndef NGHTTP2_PATH
NGHTTP2_PATH = ../../nghttp2-0.6.4 NGHTTP2_PATH = ../../nghttp2-0.6.7
endif endif
# Edit the path below to point to the base of your fbopenssl package. # Edit the path below to point to the base of your fbopenssl package.

2
src/Makefile.vc6
View File

@ -56,7 +56,7 @@ PROGRAM_NAME = curl.exe
!IFNDEF OPENSSL_PATH !IFNDEF OPENSSL_PATH
OPENSSL_PATH = ../../openssl-0.9.8y OPENSSL_PATH = ../../openssl-0.9.8zc
!ENDIF !ENDIF
!IFNDEF ZLIB_PATH !IFNDEF ZLIB_PATH