Changeset 11920


Ignore:
Timestamp:
Feb 18, 2011, 12:32:19 AM (11 years ago)
Author:
jordan
Message:

automake/autoconf; #includes in libtransmission

Location:
trunk
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/cli/Makefile.am

    r11121 r11920  
    2222    $(top_builddir)/third-party/miniupnp/libminiupnp.a \
    2323    @DHT_LIBS@ \
     24    @LIBUTP_LIBS@ \
    2425    @LIBEVENT_LIBS@ \
    2526    @LIBCURL_LIBS@ \
  • trunk/configure.ac

    r11855 r11920  
    218218dnl ----------------------------------------------------------------------------
    219219dnl
     220dnl  utp
     221
     222LIBUTP_CFLAGS="-I\$(top_srcdir)/third-party/"
     223LIBUTP_LIBS="\$(top_builddir)/third-party/libutp/libutp.a"
     224AC_SUBST(LIBUTP_CFLAGS)
     225AC_SUBST(LIBUTP_LIBS)
     226
     227
     228dnl ----------------------------------------------------------------------------
     229dnl
    220230dnl  detection for the GTK+ client
    221231
     
    471481                 third-party/miniupnp/Makefile
    472482                 third-party/libnatpmp/Makefile
     483                 third-party/libutp/Makefile
    473484                 third-party/dht/Makefile
    474485                 macosx/Makefile
  • trunk/daemon/Makefile.am

    r9795 r11920  
    2424    $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
    2525    @DHT_LIBS@ \
     26    @LIBUTP_LIBS@ \
    2627    @LIBEVENT_LIBS@ \
    2728    @LIBCURL_LIBS@ \
  • trunk/gtk/Makefile.am

    r11721 r11920  
    101101    @GCONF2_LIBS@ \
    102102    @DHT_LIBS@ \
     103    @LIBUTP_LIBS@ \
    103104    @GTK_LIBS@ \
    104105    @GIO_LIBS@ \
  • trunk/libtransmission/Makefile.am

    r11901 r11920  
    88AM_CFLAGS = \
    99    @DHT_CFLAGS@ \
     10    @LIBUTP_CFLAGS@ \
    1011    @LIBEVENT_CFLAGS@ \
    1112    @LIBCURL_CFLAGS@ \
     
    143144    @INTLLIBS@ \
    144145    @DHT_LIBS@ \
     146    @LIBUTP_LIBS@ \
    145147    @LIBCURL_LIBS@ \
    146148    @LIBEVENT_LIBS@ \
  • trunk/libtransmission/peer-io.c

    r11917 r11920  
    2626#include <event2/event.h>
    2727#include <event2/bufferevent.h>
    28 #include "utp.h"
     28#include <libutp/utp.h>
    2929
    3030#include "transmission.h"
  • trunk/libtransmission/peer-mgr.c

    r11918 r11920  
    1818
    1919#include <event2/event.h>
    20 #include "utp.h"
     20#include <libutp/utp.h>
    2121
    2222#include "transmission.h"
  • trunk/libtransmission/tr-utp.c

    r11907 r11920  
    2525
    2626#include <event.h>
    27 #include "utp.h"
     27#include <libutp/utp.h>
    2828
    2929#include "transmission.h"
  • trunk/qt/qtr.pro

    r11724 r11920  
    1919INCLUDEPATH += $${TRANSMISSION_TOP}
    2020LIBS += $${TRANSMISSION_TOP}/libtransmission/libtransmission.a
     21LIBS += $${TRANSMISSION_TOP}/third-party/dht/libutp.a
    2122LIBS += $${TRANSMISSION_TOP}/third-party/dht/libdht.a
    2223LIBS += $${TRANSMISSION_TOP}/third-party/miniupnp/libminiupnp.a
  • trunk/third-party/Makefile.am

    r10675 r11920  
    1 SUBDIRS = libnatpmp miniupnp dht
     1SUBDIRS = libnatpmp miniupnp libutp dht
    22
    33EXTRA_DIST = \
  • trunk/utils/Makefile.am

    r11347 r11920  
    3131    @INTLLIBS@ \
    3232    @DHT_LIBS@ \
     33    @LIBUTP_LIBS@ \
    3334    @LIBEVENT_LIBS@ \
    3435    @LIBCURL_LIBS@ \
Note: See TracChangeset for help on using the changeset viewer.