← Back to branch summary

~ubuntu-branches/ubuntu/utopic/curl/utopic-updates

« back to all changes in this revision

Viewing changes to tests/server/Makefile.in

  • Committer: Package Import Robot
  • Author(s): Andres Rodriguez
  • Date: 2012-05-22 14:53:29 UTC
  • mfrom: (3.4.28 sid)
  • Revision ID: package-import@ubuntu.com-20120522145329-hbf1n3zr7qh08qab
Tags: 7.25.0-1ubuntu1
https://launchpad.net/bugs/1003049
https://launchpad.net/bugs/855291
* Merge from Debian testing (LP: #1003049).  Remaining changes:
  - Drop dependencies not in main:
    + Build-Depends: Drop stunnel4 and libssh2-1-dev.
    + Drop libssh2-1-dev from libcurl4-openssl-dev's Depends.
  - Add new libcurl3-udeb package.
  - Add new curl-udeb package.
  - Also closes (LP: #855291)
* debian/patches/CVE-2012-0036.patch: Dropped. CVE resolved upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/server/Makefile.in
52
52
        $(top_srcdir)/m4/curl-system.m4 $(top_srcdir)/m4/libtool.m4 \
53
53
        $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
54
54
        $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
55
 
        $(top_srcdir)/m4/xc-translit.m4 $(top_srcdir)/acinclude.m4 \
 
55
        $(top_srcdir)/m4/xc-translit.m4 \
 
56
        $(top_srcdir)/m4/zz50-xc-ovr.m4 $(top_srcdir)/acinclude.m4 \
56
57
        $(top_srcdir)/configure.ac
57
58
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
58
59
        $(ACLOCAL_M4)
123
124
        sws-memdebug.$(OBJEXT)
124
125
am__objects_18 = sws-util.$(OBJEXT)
125
126
am_sws_OBJECTS = $(am__objects_16) $(am__objects_2) $(am__objects_17) \
126
 
        $(am__objects_18) sws-sws.$(OBJEXT)
 
127
        $(am__objects_18) sws-sws.$(OBJEXT) sws-inet_pton.$(OBJEXT)
127
128
sws_OBJECTS = $(am_sws_OBJECTS)
128
129
sws_DEPENDENCIES =
129
130
am__objects_19 = tftpd-mprintf.$(OBJEXT) tftpd-nonblock.$(OBJEXT) \
288
289
USE_EMBEDDED_ARES_FALSE = @USE_EMBEDDED_ARES_FALSE@
289
290
USE_EMBEDDED_ARES_TRUE = @USE_EMBEDDED_ARES_TRUE@
290
291
USE_GNUTLS = @USE_GNUTLS@
 
292
USE_GNUTLS_NETTLE = @USE_GNUTLS_NETTLE@
291
293
USE_LIBRTMP = @USE_LIBRTMP@
292
294
USE_LIBSSH2 = @USE_LIBSSH2@
293
295
USE_MANUAL_FALSE = @USE_MANUAL_FALSE@
298
300
USE_SSLEAY = @USE_SSLEAY@
299
301
USE_WINDOWS_SSPI = @USE_WINDOWS_SSPI@
300
302
VERSION = @VERSION@
 
303
VERSIONED_FLAVOUR = @VERSIONED_FLAVOUR@
 
304
VERSIONED_SYMBOLS_FALSE = @VERSIONED_SYMBOLS_FALSE@
 
305
VERSIONED_SYMBOLS_TRUE = @VERSIONED_SYMBOLS_TRUE@
301
306
VERSIONNUM = @VERSIONNUM@
302
307
ac_ct_AR = @ac_ct_AR@
303
308
ac_ct_CC = @ac_ct_CC@
449
454
sockfilt_CFLAGS = $(AM_CFLAGS)
450
455
sws_SOURCES = $(CURLX_SRCS) $(CURLX_HDRS) $(USEFUL) $(UTIL) \
451
456
 server_sockaddr.h \
452
 
 sws.c
 
457
 sws.c \
 
458
 $(top_srcdir)/lib/inet_pton.c
453
459
 
454
460
sws_LDADD = @TEST_SERVER_LIBS@
455
461
sws_CFLAGS = $(AM_CFLAGS)
593
599
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sockfilt-warnless.Po@am__quote@
594
600
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sws-base64.Po@am__quote@
595
601
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sws-getpart.Po@am__quote@
 
602
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sws-inet_pton.Po@am__quote@
596
603
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sws-memdebug.Po@am__quote@
597
604
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sws-mprintf.Po@am__quote@
598
605
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sws-nonblock.Po@am__quote@
1559
1566
@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1560
1567
@am__fastdepCC_FALSE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sws_CFLAGS) $(CFLAGS) -c -o sws-sws.obj `if test -f 'sws.c'; then $(CYGPATH_W) 'sws.c'; else $(CYGPATH_W) '$(srcdir)/sws.c'; fi`
1561
1568
 
 
1569
sws-inet_pton.o: $(top_srcdir)/lib/inet_pton.c
 
1570
@am__fastdepCC_TRUE@    if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sws_CFLAGS) $(CFLAGS) -MT sws-inet_pton.o -MD -MP -MF "$(DEPDIR)/sws-inet_pton.Tpo" -c -o sws-inet_pton.o `test -f '$(top_srcdir)/lib/inet_pton.c' || echo '$(srcdir)/'`$(top_srcdir)/lib/inet_pton.c; \
 
1571
@am__fastdepCC_TRUE@    then mv -f "$(DEPDIR)/sws-inet_pton.Tpo" "$(DEPDIR)/sws-inet_pton.Po"; else rm -f "$(DEPDIR)/sws-inet_pton.Tpo"; exit 1; fi
 
1572
@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$(top_srcdir)/lib/inet_pton.c' object='sws-inet_pton.o' libtool=no @AMDEPBACKSLASH@
 
1573
@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 
1574
@am__fastdepCC_FALSE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sws_CFLAGS) $(CFLAGS) -c -o sws-inet_pton.o `test -f '$(top_srcdir)/lib/inet_pton.c' || echo '$(srcdir)/'`$(top_srcdir)/lib/inet_pton.c
 
1575
 
 
1576
sws-inet_pton.obj: $(top_srcdir)/lib/inet_pton.c
 
1577
@am__fastdepCC_TRUE@    if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sws_CFLAGS) $(CFLAGS) -MT sws-inet_pton.obj -MD -MP -MF "$(DEPDIR)/sws-inet_pton.Tpo" -c -o sws-inet_pton.obj `if test -f '$(top_srcdir)/lib/inet_pton.c'; then $(CYGPATH_W) '$(top_srcdir)/lib/inet_pton.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/lib/inet_pton.c'; fi`; \
 
1578
@am__fastdepCC_TRUE@    then mv -f "$(DEPDIR)/sws-inet_pton.Tpo" "$(DEPDIR)/sws-inet_pton.Po"; else rm -f "$(DEPDIR)/sws-inet_pton.Tpo"; exit 1; fi
 
1579
@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='$(top_srcdir)/lib/inet_pton.c' object='sws-inet_pton.obj' libtool=no @AMDEPBACKSLASH@
 
1580
@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 
1581
@am__fastdepCC_FALSE@   $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sws_CFLAGS) $(CFLAGS) -c -o sws-inet_pton.obj `if test -f '$(top_srcdir)/lib/inet_pton.c'; then $(CYGPATH_W) '$(top_srcdir)/lib/inet_pton.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/lib/inet_pton.c'; fi`
 
1582
 
1562
1583
tftpd-mprintf.o: $(top_srcdir)/lib/mprintf.c
1563
1584
@am__fastdepCC_TRUE@    if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(tftpd_CFLAGS) $(CFLAGS) -MT tftpd-mprintf.o -MD -MP -MF "$(DEPDIR)/tftpd-mprintf.Tpo" -c -o tftpd-mprintf.o `test -f '$(top_srcdir)/lib/mprintf.c' || echo '$(srcdir)/'`$(top_srcdir)/lib/mprintf.c; \
1564
1585
@am__fastdepCC_TRUE@    then mv -f "$(DEPDIR)/tftpd-mprintf.Tpo" "$(DEPDIR)/tftpd-mprintf.Po"; else rm -f "$(DEPDIR)/tftpd-mprintf.Tpo"; exit 1; fi