mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

automake/autoconf; #includes in libtransmission

This commit is contained in:
Jordan Lee 2011-02-18 00:32:19 +00:00
parent 01f5a8b093
commit 7df7d34f6d
11 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cli/Makefile.am
View 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@ \

11
configure.ac
View 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

1
daemon/Makefile.am
View 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@ \

1
gtk/Makefile.am
View File

@ -100,6 +100,7 @@ transmission_gtk_LDADD = \
@LIBCANBERRA_LIBS@ \
@GCONF2_LIBS@ \
@DHT_LIBS@ \
@LIBUTP_LIBS@ \
@GTK_LIBS@ \
@GIO_LIBS@ \
@LIBAPPINDICATOR_LIBS@ \

2
libtransmission/Makefile.am
View 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@ \

2
libtransmission/peer-io.c
View 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"

2
libtransmission/peer-mgr.c
View 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"

2
libtransmission/tr-utp.c
View 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"

1
qt/qtr.pro
View 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

2
third-party/Makefile.am vendored
View File

@ -1,4 +1,4 @@
SUBDIRS = libnatpmp miniupnp dht
SUBDIRS = libnatpmp miniupnp libutp dht
EXTRA_DIST = \
macosx-libevent-config.h \

1
utils/Makefile.am
View 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@ \