← Back to branch summary

~ubuntu-branches/ubuntu/trusty/serf/trusty-security

« back to all changes in this revision

Viewing changes to serf.mak

  • Committer: Bazaar Package Importer
  • Author(s): Peter Samuelson
  • Date: 2011-06-27 18:09:28 UTC
  • mfrom: (1.2.5 upstream)
  • mto: (3.3.1 sid)
  • mto: This revision was merged to the branch mainline in revision 11.
  • Revision ID: james.westby@ubuntu.com-20110627180928-ybwzd3hmx82nu3ir
Tags: 1.0.0~0+svn1514-1
* New upstream snapshot.
  - patches/abi-0.x: Remove as obsolete.
  - patches/kqueue: Forward-port.
  - Bump ABI: libserf0.7{,-dbg} -> libserf1{,-dbg}
  - patches/ip6-localhost: New patch: temporary (I hope) workaround for
    IPv4 / IPv6 confusion in testsuite.
* Implement Multi-Arch: same.
* libserf-dev Conflicts: libserf-0-0-dev, not Breaks.  Thanks, lintian.

Show diffs side-by-side

added added

removed removed

Lines of Context:
serf.mak
13
13
!IF "$(DEBUG_BUILD)" == ""
14
14
INTDIR = Release
15
15
CFLAGS = /MD /O2 /D "NDEBUG" $(CFLAGS)
16
 
STATIC_LIB = $(INTDIR)\serf.lib
 
16
STATIC_LIB = $(INTDIR)\serf-1.lib
17
17
!ELSE
18
18
INTDIR = Debug
19
19
CFLAGS = /MDd /Od /W3 /Gm /D "_DEBUG" $(CFLAGS)
20
 
STATIC_LIB = $(INTDIR)\serf.lib
 
20
STATIC_LIB = $(INTDIR)\serf-1.lib
21
21
!ENDIF
22
22
 
23
23
########
93
93
WIN32_DEFS = /D WIN32 /D WIN32_LEAN_AND_MEAN /D NOUSER /D NOGDI /D NONLS /D NOCRYPT /D SERF_HAVE_SSPI
94
94
 
95
95
CPP=cl.exe
96
 
CPP_PROJ = /c /nologo $(CFLAGS) $(WIN32_DEFS) $(EXPAT_FLAGS) $(APR_FLAGS) $(APRUTIL_FLAGS) $(OPENSSL_FLAGS) $(ZLIB_FLAGS) /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\"
 
96
CPP_PROJ = /c /nologo $(CFLAGS) $(WIN32_DEFS) $(APR_FLAGS) $(APRUTIL_FLAGS) $(OPENSSL_FLAGS) $(ZLIB_FLAGS) /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\"
97
97
LIB32=link.exe
98
98
LIB32_FLAGS=/nologo
99
99
 
106
106
    "$(INTDIR)\auth_kerb_gss.obj" \
107
107
    "$(INTDIR)\auth_kerb_sspi.obj" \
108
108
    "$(INTDIR)\context.obj" \
 
109
    "$(INTDIR)\ssltunnel.obj" \
109
110
    "$(INTDIR)\allocator.obj" \
110
111
    "$(INTDIR)\barrier_buckets.obj" \
111
112
    "$(INTDIR)\buckets.obj" \
115
116
    "$(INTDIR)\file_buckets.obj" \
116
117
    "$(INTDIR)\headers_buckets.obj" \
117
118
    "$(INTDIR)\incoming.obj" \
 
119
    "$(INTDIR)\iovec_buckets.obj" \
118
120
    "$(INTDIR)\limit_buckets.obj" \
119
121
    "$(INTDIR)\mmap_buckets.obj" \
120
122
    "$(INTDIR)\outgoing.obj" \
143
145
    "$(INTDIR)\test_context.obj" \
144
146
    "$(INTDIR)\test_buckets.obj" \
145
147
    "$(INTDIR)\test_ssl.obj" \
 
148
    "$(INTDIR)\test_server.obj" \
146
149
 
147
150
TEST_LIBS = user32.lib advapi32.lib gdi32.lib ws2_32.lib
148
151
 
192
195
    $(CPP_PROJ) $<
193
196
<<
194
197
 
 
198
{test\server}.c{$(INTDIR)}.obj: 
 
199
  $(CPP) @<<
 
200
    $(CPP_PROJ) $<
 
201
<<
 
202
 
195
203
$(INTDIR)\serf_response.exe: $(INTDIR)\serf_response.obj $(STATIC_LIB)
196
204
  $(LIB32) /DEBUG /OUT:$@ $** $(LIB32_FLAGS) $(TEST_LIBS)
197
205