← Back to branch summary

~ubuntu-branches/ubuntu/precise/curl/precise

« back to all changes in this revision

Viewing changes to src/Makefile.vc8

  • Committer: Bazaar Package Importer
  • Author(s): James Page
  • Date: 2011-10-20 09:28:24 UTC
  • mfrom: (3.4.22 sid)
  • Revision ID: james.westby@ubuntu.com-20111020092824-i7kfjd5we7dh57nv
Tags: 7.21.7-3ubuntu1
https://launchpad.net/bugs/831496
* Merge from Debian testing, remaining changes:
  - Drop dependencies not in main:
    + Build-Depends: Drop stunnel and libssh2-1-dev.
    + Drop libssh2-1-dev from libcurl4-openssl-dev's Depends.
  - Add new libcurl3-udeb package, stripped down for use during 
    installation (LP: #831496).
* Dropped changes:
  - debian/patches/timeout_bug_736216: applied upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Makefile.vc8
5
5
#                            | (__| |_| |  _ <| |___
6
6
#                             \___|\___/|_| \_\_____|
7
7
#
8
 
# Copyright (C) 1999 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
 
8
# Copyright (C) 1999 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
9
9
#
10
10
# This software is licensed as described in the file COPYING, which
11
11
# you should have received as part of this distribution. The terms
114
114
LINKD = link.exe /incremental:yes /debug /libpath:"../lib"
115
115
RCD   = rc.exe /dDEBUGBUILD=1
116
116
 
117
 
CFLAGS   = /I../lib /I../include /nologo /W3 /EHsc /DWIN32 /FD /c
 
117
CFLAGS   = /I../lib /I../include /nologo /W3 /EHsc /DWIN32 /FD /c /D_BIND_TO_CURRENT_VCLIBS_VERSION=1
118
118
LFLAGS   = /nologo /out:$(PROGRAM_NAME) /subsystem:console /machine:$(MACHINE)
119
119
RESFLAGS = /i../include
120
120