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

diff --git a/Makefile.am b/Makefile.am
index 3d8d71a29f22a6f17077d2099ce462cdb6eb832e..49fa08787fc5493d6004bf2fee8f7371485c9d12 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,6 @@ SUBDIRS = \
   libtransmission \
   $(DAEMON_DIR) \
   $(CLI_DIR) \
-  $(BEOS_DIR) \
   $(GTK_DIR) \
   $(MAC_DIR)
 

diff --git a/cli/Makefile.am b/cli/Makefile.am
index 70fa1c7fb5b67e1699ea168fbb73e205eb8ed780..fb6f2f9b64c1fc78ad0b3fcd902bc8f17337e402 100644 (file)
--- a/cli/Makefile.am
+++ b/cli/Makefile.am
@@ -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) \

diff --git a/configure.ac b/configure.ac
index 5668aebee9d584cd5b5dcee8a19d1b080ad5b1d4..c33c05d1004d10edf634d247569d8fa49b3b566b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 6c30662f17c0d0760208e10612abe303cb4ce08b..8c19a07caeed3f4a5a77a46398efa90b74005712 100644 (file)
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -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) \

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index b1e33d73cd9dc27ec649a655e1e52f31f83da12a..f10013cc91d5cb340e15272cf0609bfe12b98a5a 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -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) \

diff --git a/libtransmission/Makefile.am b/libtransmission/Makefile.am
index a68f03193cdf472a2c377be8dd77f3db2efabbbc..84ef7d32dcc1b19162d17920c476b139fbba2a8f 100644 (file)
--- a/libtransmission/Makefile.am
+++ b/libtransmission/Makefile.am
@@ -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) \