]> granicus.if.org Git - transmission/commitdiff
automake/autoconf; #includes in libtransmission
authorJordan Lee <jordan@transmissionbt.com>
Fri, 18 Feb 2011 00:32:19 +0000 (00:32 +0000)
committerJordan Lee <jordan@transmissionbt.com>
Fri, 18 Feb 2011 00:32:19 +0000 (00:32 +0000)
cli/Makefile.am
configure.ac
daemon/Makefile.am
gtk/Makefile.am
libtransmission/Makefile.am
libtransmission/peer-io.c
libtransmission/peer-mgr.c
libtransmission/tr-utp.c
qt/qtr.pro
third-party/Makefile.am
utils/Makefile.am

index 2c15d42ac65ac58e4fd25479f3e4608cd4aaa4c1..9d618f2d36b4f2832eac7770b8e32994370f6b51 100644 (file)
@@ -21,6 +21,7 @@ transmission_cli_LDADD = \
     $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
     $(top_builddir)/third-party/miniupnp/libminiupnp.a \
     @DHT_LIBS@ \
+    @LIBUTP_LIBS@ \
     @LIBEVENT_LIBS@ \
     @LIBCURL_LIBS@ \
     @OPENSSL_LIBS@ \
index aea0d14273b810a985980986968e0a4f7ff35101..05bed0a0a86843adf17734869e67ac7303ea03ae 100644 (file)
@@ -215,6 +215,16 @@ AC_SUBST(DHT_CFLAGS)
 AC_SUBST(DHT_LIBS)
 
 
+dnl ----------------------------------------------------------------------------
+dnl
+dnl  utp
+
+LIBUTP_CFLAGS="-I\$(top_srcdir)/third-party/"
+LIBUTP_LIBS="\$(top_builddir)/third-party/libutp/libutp.a"
+AC_SUBST(LIBUTP_CFLAGS)
+AC_SUBST(LIBUTP_LIBS)
+
+
 dnl ----------------------------------------------------------------------------
 dnl
 dnl  detection for the GTK+ client
@@ -470,6 +480,7 @@ AC_CONFIG_FILES([Makefile
                  third-party/Makefile
                  third-party/miniupnp/Makefile
                  third-party/libnatpmp/Makefile
+                 third-party/libutp/Makefile
                  third-party/dht/Makefile
                  macosx/Makefile
                  gtk/Makefile
index 01cf1218a49e56afd992e865bb05448dea666d95..9e2a10aedcbd81dad97a5f8c35e2d8169ca3b02d 100644 (file)
@@ -23,6 +23,7 @@ LDADD = \
     $(top_builddir)/third-party/miniupnp/libminiupnp.a \
     $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
     @DHT_LIBS@ \
+    @LIBUTP_LIBS@ \
     @LIBEVENT_LIBS@ \
     @LIBCURL_LIBS@ \
     @OPENSSL_LIBS@ \
index 462c3830a1dacf5f98f54464388625389a448677..68d2713d56cc0d720fd0088039c1347fc4873a47 100644 (file)
@@ -100,6 +100,7 @@ transmission_gtk_LDADD = \
     @LIBCANBERRA_LIBS@ \
     @GCONF2_LIBS@ \
     @DHT_LIBS@ \
+    @LIBUTP_LIBS@ \
     @GTK_LIBS@ \
     @GIO_LIBS@ \
     @LIBAPPINDICATOR_LIBS@ \
index 418417d0c71f2f8f8d1cab9ae95cf0f5228bc1eb..96018a9fa93bb4c469da5dae35f69cacf8cf5034 100644 (file)
@@ -7,6 +7,7 @@ AM_CPPFLAGS = \
 
 AM_CFLAGS = \
     @DHT_CFLAGS@ \
+    @LIBUTP_CFLAGS@ \
     @LIBEVENT_CFLAGS@ \
     @LIBCURL_CFLAGS@ \
     @OPENSSL_CFLAGS@ \
@@ -142,6 +143,7 @@ apps_ldadd = \
     $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
     @INTLLIBS@ \
     @DHT_LIBS@ \
+    @LIBUTP_LIBS@ \
     @LIBCURL_LIBS@ \
     @LIBEVENT_LIBS@ \
     @OPENSSL_LIBS@ \
index d6cf91911f1442e12640c55db34f8a3aa38b4119..03c31a56b4bc4e27ba81c55314ad24f30f561398 100644 (file)
@@ -25,7 +25,7 @@
 
 #include <event2/event.h>
 #include <event2/bufferevent.h>
-#include "utp.h"
+#include <libutp/utp.h>
 
 #include "transmission.h"
 #include "session.h"
index 5051e07a76005dc8a9563a0f1ed52bdda05b3a7a..f9284a271ed5ff2ccdaeddbd2e0470c966d4b338 100644 (file)
@@ -17,7 +17,7 @@
 #include <stdlib.h> /* qsort */
 
 #include <event2/event.h>
-#include "utp.h"
+#include <libutp/utp.h>
 
 #include "transmission.h"
 #include "announcer.h"
index 9a74c710d03b1a235a0226d795bf219d17ea622e..b56b85cf4b807e4bd81f7567d0f6ae37da7c210d 100644 (file)
@@ -24,7 +24,7 @@ THE SOFTWARE.
 #include <unistd.h>
 
 #include <event.h>
-#include "utp.h"
+#include <libutp/utp.h>
 
 #include "transmission.h"
 #include "net.h"
index 4830f51f9e72d353f1f75cdd3ddfea24eb1ecbd5..93a699eb66628ffc57589be748afa78f620ef337 100644 (file)
@@ -18,6 +18,7 @@ PKGCONFIG = fontconfig libcurl openssl libevent
 TRANSMISSION_TOP = ..
 INCLUDEPATH += $${TRANSMISSION_TOP}
 LIBS += $${TRANSMISSION_TOP}/libtransmission/libtransmission.a
+LIBS += $${TRANSMISSION_TOP}/third-party/dht/libutp.a
 LIBS += $${TRANSMISSION_TOP}/third-party/dht/libdht.a
 LIBS += $${TRANSMISSION_TOP}/third-party/miniupnp/libminiupnp.a
 LIBS += $${TRANSMISSION_TOP}/third-party/libnatpmp/libnatpmp.a
index 7c25de1d409c65e4b4089afac49aad028bd2d116..69543f3a176aca02a6e970945fae3b097975d514 100644 (file)
@@ -1,4 +1,4 @@
-SUBDIRS = libnatpmp miniupnp dht
+SUBDIRS = libnatpmp miniupnp libutp dht
 
 EXTRA_DIST = \
   macosx-libevent-config.h \
index 818e29f172755d5b57b4b291882a10bd6fae7f66..896cb2b6728f1ac0201e053d56c910c2675007e2 100644 (file)
@@ -30,6 +30,7 @@ transmission_create_LDADD = \
     $(top_builddir)/third-party/libnatpmp/libnatpmp.a \
     @INTLLIBS@ \
     @DHT_LIBS@ \
+    @LIBUTP_LIBS@ \
     @LIBEVENT_LIBS@ \
     @LIBCURL_LIBS@ \
     @OPENSSL_LIBS@ \