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

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

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"

libtransmission/peer-msgs.c

@@ -38,6 +38,7 @@
 #include "torrent.h"
 #include "trevent.h"
 #include "utils.h"
+#include "version.h"
 
 /**
 ***

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

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 { \

libtransmission/test-peer-id.c

@@ -4,6 +4,7 @@
 #include "transmission.h"
 #include "session.h"
 #include "utils.h"
+#include "version.h"
 
 #undef VERBOSE
 

libtransmission/transmission.h

@@ -36,8 +36,6 @@
 extern "C" {
 #endif
 
-#include "version.h"
-
 #include <inttypes.h> /* uintN_t */
 #ifndef PRId64
  #define PRId64 "lld"

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()

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"

qt/mainwin.cc

@@ -23,6 +23,8 @@
 #include <QUrl>
 #include <QSignalMapper>
 
+#include <libtransmission/version.h>
+
 #include "about.h"
 #include "details.h"
 #include "filters.h"

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