← Back to branch summary

~ubuntu-branches/ubuntu/natty/curl/natty-security

« back to all changes in this revision

Viewing changes to lib/Makefile.m32

  • Committer: Bazaar Package Importer
  • Author(s): Bhavani Shankar
  • Date: 2010-06-20 13:56:28 UTC
  • mfrom: (3.4.7 sid)
  • Revision ID: james.westby@ubuntu.com-20100620135628-e30tp9jldq6hq985
Tags: 7.21.0-1ubuntu1
https://launchpad.net/bugs/596334
* Merge from debian unstable.  Remaining changes: LP: #596334
  - Keep build deps in main:
    - Drop build dependencies: stunnel, libssh2-1-dev
    - Add build-dependency on openssh-server
    - Drop libssh2-1-dev from libcurl4-openssl-dev's Depends.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/Makefile.m32
1
1
#########################################################################
2
 
# $Id: Makefile.m32,v 1.60 2009-06-15 02:29:49 yangtse Exp $
3
2
#
4
3
## Makefile for building libcurl.a with MingW32 (GCC-3.2 or later)
5
4
## and optionally OpenSSL (0.9.8), libssh2 (1.1), zlib (1.2.3)
17
16
 
18
17
# Edit the path below to point to the base of your Zlib sources.
19
18
ifndef ZLIB_PATH
20
 
ZLIB_PATH = ../../zlib-1.2.3
 
19
ZLIB_PATH = ../../zlib-1.2.5
21
20
endif
22
21
# Edit the path below to point to the base of your OpenSSL package.
23
22
ifndef OPENSSL_PATH
24
 
OPENSSL_PATH = ../../openssl-0.9.8k
 
23
OPENSSL_PATH = ../../openssl-0.9.8n
25
24
endif
26
25
# Edit the path below to point to the base of your LibSSH2 package.
27
26
ifndef LIBSSH2_PATH
28
 
LIBSSH2_PATH = ../../libssh2-1.1
 
27
LIBSSH2_PATH = ../../libssh2-1.2.5
29
28
endif
30
29
# Edit the path below to point to the base of your libidn package.
31
30
ifndef LIBIDN_PATH
32
 
LIBIDN_PATH = ../../libidn-1.13
 
31
LIBIDN_PATH = ../../libidn-1.18
33
32
endif
34
33
# Edit the path below to point to the base of your Novell LDAP NDK.
35
34
ifndef LDAP_SDK
36
35
LDAP_SDK = c:/novell/ndk/cldapsdk/win32
37
36
endif
38
37
 
39
 
ARES_LIB = ../ares
 
38
# Edit the path below to point to the base of your c-ares package.
 
39
ifndef LIBCARES_PATH
 
40
LIBCARES_PATH = ../ares
 
41
endif
40
42
 
41
43
CC = gcc
42
44
AR = ar
54
56
INCLUDES = -I. -I../include
55
57
CFLAGS = -g -O2 -DBUILDING_LIBCURL
56
58
ifdef ARES
57
 
  INCLUDES += -I$(ARES_LIB)
 
59
  INCLUDES += -I$(LIBCARES_PATH)
58
60
  CFLAGS += -DUSE_ARES
59
 
  DLL_LIBS += -L$(ARES_LIB) -lcares
60
 
  libcurl_dll_DEPENDENCIES = $(ARES_LIB)/libcares.a
 
61
  DLL_LIBS += -L$(LIBCARES_PATH) -lcares
 
62
  libcurl_dll_DEPENDENCIES = $(LIBCARES_PATH)/libcares.a
61
63
endif
62
64
ifdef SSH2
63
65
  INCLUDES += -I"$(LIBSSH2_PATH)/include" -I"$(LIBSSH2_PATH)/win32"
151
153
 
152
154
FORCE: ;
153
155
 
154
 
$(ARES_LIB)/libcares.a:
155
 
        $(MAKE) -C $(ARES_LIB) -f Makefile.m32
 
156
$(LIBCARES_PATH)/libcares.a:
 
157
        $(MAKE) -C $(LIBCARES_PATH) -f Makefile.m32
156
158
 
157
159