(trunk) make it possible to #include "version.h" without having to add -I${TOP}/libtr...

diff --git a/cli/cli.c b/cli/cli.c
index c35265f6763c342df8e9956fe81636127adf60e6..17b03ad085c774c9c9ee31566a0ef96584ab813b 100644 (file)
--- a/cli/cli.c
+++ b/cli/cli.c
@@ -33,6 +33,7 @@
 #include <libtransmission/makemeta.h>
 #include <libtransmission/tr-getopt.h>
 #include <libtransmission/utils.h> /* tr_wait */
+#include <libtransmission/version.h>
 #include <libtransmission/web.h> /* tr_webRun */
 
 #define LINEWIDTH 80

diff --git a/gtk/util.c b/gtk/util.c
index 17c237beb66f4a8829eac5eeee4fcb9f779df93b..fa0f5812c352b856d7ca8fdac2e42f11039a0922 100644 (file)
--- a/gtk/util.c
+++ b/gtk/util.c
@@ -42,6 +42,7 @@
 
 #include <libtransmission/transmission.h> /* TR_RATIO_NA, TR_RATIO_INF */
 #include <libtransmission/utils.h> /* tr_inf */
+#include <libtransmission/version.h> /* tr_inf */
 
 #include "conf.h"
 #include "hig.h"

diff --git a/libtransmission/peer-msgs.c b/libtransmission/peer-msgs.c
index 42ce6b4afca3967ae51bca89cf04d3123ab901e6..cf34a0a16631f543387aaa656195b5beb389ea6e 100644 (file)
--- a/libtransmission/peer-msgs.c
+++ b/libtransmission/peer-msgs.c
@@ -38,6 +38,7 @@
 #include "torrent.h"
 #include "trevent.h"
 #include "utils.h"
+#include "version.h"
 
 /**
 ***

diff --git a/libtransmission/rpcimpl.c b/libtransmission/rpcimpl.c
index 0f0e3a00fbf3d4ef7ab9686ac6848df442ba6b10..669b0ab091227907cb73285fa69a54356b03c575 100644 (file)
--- a/libtransmission/rpcimpl.c
+++ b/libtransmission/rpcimpl.c
@@ -20,13 +20,14 @@
 
 #include "transmission.h"
 #include "bencode.h"
-#include "rpcimpl.h"
+#include "completion.h"
 #include "json.h"
+#include "rpcimpl.h"
 #include "session.h"
 #include "stats.h"
 #include "torrent.h"
-#include "completion.h"
 #include "utils.h"
+#include "version.h"
 #include "web.h"
 
 #define RECENTLY_ACTIVE_SECONDS 60

diff --git a/libtransmission/session.c b/libtransmission/session.c
index 93913ff3b201094eb79d4deed773e8f613f9f142..999c6f3140423413e6f1e006099b23bca60c76d1 100644 (file)
--- a/libtransmission/session.c
+++ b/libtransmission/session.c
@@ -27,6 +27,7 @@
 #include "bandwidth.h"
 #include "bencode.h"
 #include "blocklist.h"
+#include "crypto.h"
 #include "fdlimit.h"
 #include "list.h"
 #include "metainfo.h" /* tr_metainfoFree */
@@ -40,8 +41,8 @@
 #include "tracker.h"
 #include "trevent.h"
 #include "utils.h"
+#include "version.h"
 #include "web.h"
-#include "crypto.h"
 
 #define dbgmsg( ... ) \
     do { \

diff --git a/libtransmission/test-peer-id.c b/libtransmission/test-peer-id.c
index 75d3050b5881d24c3f547fb181ccdd3b07eb0471..5df4c55576277300b33e628ac00cd0388fc571e7 100644 (file)
--- a/libtransmission/test-peer-id.c
+++ b/libtransmission/test-peer-id.c
@@ -4,6 +4,7 @@
 #include "transmission.h"
 #include "session.h"
 #include "utils.h"
+#include "version.h"
 
 #undef VERBOSE
 

diff --git a/libtransmission/transmission.h b/libtransmission/transmission.h
index aa54d1baced1042a534506a6e1dbc3613a6c4762..24b85ccfded9e9a5a5e7b716a8367d4a548e5fd8 100644 (file)
--- a/libtransmission/transmission.h
+++ b/libtransmission/transmission.h
@@ -36,8 +36,6 @@
 extern "C" {
 #endif
 
-#include "version.h"
-
 #include <inttypes.h> /* uintN_t */
 #ifndef PRId64
  #define PRId64 "lld"

diff --git a/libtransmission/web.c b/libtransmission/web.c
index 5383a20346b8f24e8ca9c30934b73d8a5cac9451..0730a306380fb3e04a2b9651efce8011cecc0f42 100644 (file)
--- a/libtransmission/web.c
+++ b/libtransmission/web.c
@@ -24,6 +24,7 @@
 #include "net.h" /* socklen_t */
 #include "trevent.h"
 #include "utils.h"
+#include "version.h"
 #include "web.h"
 
 /* Use curl_multi_socket_action() instead of curl_multi_perform()

diff --git a/qt/app.cc b/qt/app.cc
index d6cac0f921c2d31c965a5a64bc2697d2cd2d12b0..053754839bb70d9a4f6b65e33f8976418d8be6eb 100644 (file)
--- a/qt/app.cc
+++ b/qt/app.cc
@@ -21,6 +21,7 @@
 
 #include <libtransmission/transmission.h>
 #include <libtransmission/tr-getopt.h>
+#include <libtransmission/version.h>
 
 #include "app.h"
 #include "mainwin.h"

diff --git a/qt/mainwin.cc b/qt/mainwin.cc
index 69ad8c0f19ba544acacded9853ca6c2e836b133f..90b971ea6e0053127ae5d509d244913b0be738d2 100644 (file)
--- a/qt/mainwin.cc
+++ b/qt/mainwin.cc
@@ -23,6 +23,8 @@
 #include <QUrl>
 #include <QSignalMapper>
 
+#include <libtransmission/version.h>
+
 #include "about.h"
 #include "details.h"
 #include "filters.h"

diff --git a/qt/qtr.pro b/qt/qtr.pro
index da6ea7d0ce9295abadfcb14fd4ca9ce2ba62fdb2..9b356613e708e5a3533520073f5a6df802666f43 100644 (file)
--- a/qt/qtr.pro
+++ b/qt/qtr.pro
@@ -1,7 +1,7 @@
 TARGET = qtr
 NAME = "Transmission"
 DESCRIPTION = "Transmission: a fast, easy, and free BitTorrent client"
-VERSION = 1.6.0
+VERSION = 1.60
 LICENSE = "GPL"
 
 target.path = /bin
@@ -22,28 +22,11 @@ TRANSLATIONS += transmission_en.ts
 
 FORMS += mainwin.ui about.ui
 RESOURCES += application.qrc
-SOURCES += about.cc \
-           app.cc \
-           details.cc \
-           file-tree.cc \
-           filters.cc \
-           hig.cc \
-           mainwin.cc \
-           make-dialog.cc \
-           options.cc \
-           prefs.cc \
-           prefs-dialog.cc \
-           qticonloader.cc \
-           session.cc \
-           squeezelabel.cc \
-           stats-dialog.cc \
-           torrent.cc \
-           torrent-delegate.cc \
-           torrent-delegate-min.cc \
-           torrent-filter.cc \
-           torrent-model.cc \
-           utils.cc \
-           watchdir.cc
+SOURCES += about.cc app.cc details.cc file-tree.cc filters.cc hig.cc \
+           mainwin.cc make-dialog.cc options.cc prefs.cc prefs-dialog.cc \
+           qticonloader.cc session.cc squeezelabel.cc stats-dialog.cc \
+           torrent.cc torrent-delegate.cc torrent-delegate-min.cc \
+           torrent-filter.cc torrent-model.cc utils.cc watchdir.cc
 HEADERS += $$replace(SOURCES, .cc, .h)
 HEADERS += speed.h types.h