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

(trunk) autoconf/automake: move libdht.a into a DHT_LIBS variable

This commit is contained in:
Charles Kerr 2009-06-19 23:50:09 +00:00
parent 19a8b6193c
commit c859f06742
6 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@ -21,7 +21,6 @@ SUBDIRS = \
libtransmission \
$(DAEMON_DIR) \
$(CLI_DIR) \
$(BEOS_DIR) \
$(GTK_DIR) \
$(MAC_DIR)

2
cli/Makefile.am
View File

@ -20,7 +20,7 @@ transmissioncli_LDADD = \
$(top_builddir)/libtransmission/libtransmission.a \
$(top_builddir)/third-party/libnatpmp/libnatpmp.a \
$(top_builddir)/third-party/miniupnp/libminiupnp.a \
$(top_builddir)/third-party/dht/libdht.a \
$(DHT_LIBS) \
$(LIBEVENT_LIBS) \
$(INTLLIBS) \
$(LIBCURL_LIBS) \

10
configure.ac
View File

@ -191,6 +191,16 @@ AC_SUBST(LIBEVENT_CFLAGS)
AC_SUBST(LIBEVENT_LIBS)
dnl ----------------------------------------------------------------------------
dnl
dnl dht
DHT_CFLAGS="-I\$(top_srcdir)/third-party/dht"
DHT_LIBS="\$(top_builddir)/third-party/dht/libdht.a"
AC_SUBST(DHT_CFLAGS)
AC_SUBST(DHT_LIBS)
dnl ----------------------------------------------------------------------------
dnl
dnl detection for the GTK+ client

2
daemon/Makefile.am
View File

@ -22,7 +22,7 @@ LDADD = \
$(top_builddir)/libtransmission/libtransmission.a \
$(top_builddir)/third-party/miniupnp/libminiupnp.a \
$(top_builddir)/third-party/libnatpmp/libnatpmp.a \
$(top_builddir)/third-party/dht/libdht.a \
$(DHT_LIBS) \
$(LIBEVENT_LIBS) \
$(INTLLIBS) \
$(LIBCURL_LIBS) \

2
gtk/Makefile.am
View File

@ -101,7 +101,7 @@ transmission_LDADD = \
$(top_builddir)/libtransmission/libtransmission.a \
$(top_builddir)/third-party/miniupnp/libminiupnp.a \
$(top_builddir)/third-party/libnatpmp/libnatpmp.a \
$(top_builddir)/third-party/dht/libdht.a \
$(DHT_LIBS) \
$(GTK_LIBS) \
$(GIO_LIBS) \
$(LIBNOTIFY_LIBS) \

3
libtransmission/Makefile.am
View File

@ -1,6 +1,7 @@
AM_CPPFLAGS = -I. -I$(top_srcdir) -I$(top_srcdir)/third-party/ -D__TRANSMISSION__ -DPACKAGE_DATA_DIR=\""$(datadir)"\"
AM_CFLAGS = \
$(DHT_CFLAGS) \
$(LIBEVENT_CFLAGS) \
$(LIBCURL_CFLAGS) \
$(OPENSSL_CFLAGS) \
@ -126,8 +127,8 @@ apps_ldadd = \
./libtransmission.a \
$(top_builddir)/third-party/miniupnp/libminiupnp.a \
$(top_builddir)/third-party/libnatpmp/libnatpmp.a \
$(top_builddir)/third-party/dht/libdht.a \
$(INTLLIBS) \
$(DHT_LIBS) \
$(LIBEVENT_LIBS) \
$(LIBCURL_LIBS) \
$(OPENSSL_LIBS) \