bundle the libmrss wrapper to make building easier

10 files changed, 28 insertions, 25 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 7cb7801..ec29eba 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -44,7 +44,7 @@ desktop_DATA = transmission-remote-gtk.desktop
 endif
 
 bin_PROGRAMS = transmission-remote-gtk
-INCLUDES = -std=c99 -Wall -I.. -Wno-overflow -DTRGLICENSE=\""$(trglicense)"\" $(libcurl_CFLAGS) $(jsonglib_CFLAGS) $(gthread_CFLAGS) $(gtk_CFLAGS) $(gio_CFLAGS) $(notify_CFLAGS) $(libproxy_CFLAGS) $(libappindicator_CFLAGS) $(rssglib_CFLAGS)
+AM_CFLAGS = -std=c99 -Wall -I.. -Wno-overflow -DTRGLICENSE=\""$(trglicense)"\" $(libcurl_CFLAGS) $(jsonglib_CFLAGS) $(gthread_CFLAGS) $(gtk_CFLAGS) $(gio_CFLAGS) $(notify_CFLAGS) $(libproxy_CFLAGS) $(libappindicator_CFLAGS) $(mrss_CFLAGS) -I../extern
 		
 transmission_remote_gtk_SOURCES = \
 	  trg-cell-renderer-speed.c \
@@ -105,13 +105,16 @@ transmission_remote_gtk_SOURCES = \
 	  trg-client.c \
 	  trg-main-window.c \
 	  main.c \
-	  trg-rss-model.c \
-	  trg-rss-window.c \
-	  trg-rss-cell-renderer.c \
 	  upload.c \
 	  $(NULL)
 
-transmission_remote_gtk_LDFLAGS = -lm $(jsonglib_LIBS) $(gtk_LIBS) $(gthread_LIBS) $(GEOIP_LIBS) $(gio_LIBS) $(notify_LIBS) $(libproxy_LIBS) $(libcurl_LIBS) $(libappindicator_LIBS) $(rssglib_LIBS)
+transmission_remote_gtk_LDFLAGS = -lm $(jsonglib_LIBS) $(gtk_LIBS) $(gthread_LIBS) $(GEOIP_LIBS) $(gio_LIBS) $(notify_LIBS) $(libproxy_LIBS) $(libcurl_LIBS) $(libappindicator_LIBS)
+
+if HAVE_RSS
+transmission_remote_gtk_LDFLAGS += $(mrss_LIBS) ../extern/rss-glib/librss.la
+
+transmission_remote_gtk_SOURCES += trg-rss-model.c trg-rss-window.c trg-rss-cell-renderer.c
+endif
 
 if WIN32
 .rc.o:
@@ -122,7 +125,7 @@ if WIN32
 CFLAGS += -mms-bitfields -mwin32 -mwindows
 LDFLAGS += -Wl,--allow-multiple-definition -lws2_32 -lintl
 transmission_remote_gtk_SOURCES += win32.rc win32-mailslot.c
-INCLUDES += -O2
+AM_CFLAGS += -O2
 else
 %.1: %.pod
 	        pod2man --release="" --center="Transmission Remote GTK" $< > $@
diff --git a/src/trg-main-window.c b/src/trg-main-window.c
index 4cf6047..561dd59 100644
--- a/src/trg-main-window.c
+++ b/src/trg-main-window.c
@@ -71,7 +71,7 @@
 #include "trg-menu-bar.h"
 #include "trg-status-bar.h"
 #include "trg-stats-dialog.h"
-#ifdef HAVE_RSSGLIB
+#ifdef HAVE_RSS
 #include "trg-rss-window.h"
 #endif
 #include "trg-remote-prefs-dialog.h"
@@ -930,7 +930,7 @@ static void view_stats_toggled_cb(GtkWidget * w, gpointer data)
     }
 }
 
-#ifdef HAVE_RSSGLIB
+#ifdef HAVE_RSS
 static void view_rss_toggled_cb(GtkWidget * w, gpointer data)
 {
     TrgMainWindow *win = TRG_MAIN_WINDOW(data);
@@ -1766,7 +1766,7 @@ static TrgMenuBar *trg_main_window_menu_bar_new(TrgMainWindow * win)
 #if TRG_WITH_GRAPH
     *b_show_graph,
 #endif
-#ifdef HAVE_RSSGLIB
+#ifdef HAVE_RSS
     *b_view_rss,
 #endif
     *b_start_now;
@@ -1797,7 +1797,7 @@ static TrgMenuBar *trg_main_window_menu_bar_new(TrgMainWindow * win)
 #if TRG_WITH_GRAPH
                  "show-graph", &b_show_graph,
 #endif
-#ifdef HAVE_RSSGLIB
+#ifdef HAVE_RSS
                  "view-rss-button", &b_view_rss,
 #endif
                  "up-queue", &b_up_queue, "down-queue", &b_down_queue,
@@ -1844,7 +1844,7 @@ static TrgMenuBar *trg_main_window_menu_bar_new(TrgMainWindow * win)
                      G_CALLBACK(view_states_toggled_cb), win);
     g_signal_connect(b_view_stats, "activate",
                      G_CALLBACK(view_stats_toggled_cb), win);
-#ifdef HAVE_RSSGLIB
+#ifdef HAVE_RSS
     g_signal_connect(b_view_rss, "activate",
                      G_CALLBACK(view_rss_toggled_cb), win);
 #endif
diff --git a/src/trg-menu-bar.c b/src/trg-menu-bar.c
index 37c6c2c..3f724aa 100644
--- a/src/trg-menu-bar.c
+++ b/src/trg-menu-bar.c
@@ -51,7 +51,7 @@ enum {
     PROP_LOCAL_PREFS_BUTTON,
     PROP_ABOUT_BUTTON,
     PROP_VIEW_STATS_BUTTON,
-#ifdef HAVE_RSSGLIB
+#ifdef HAVE_RSS
     PROP_VIEW_RSS_BUTTON,
 #endif
     PROP_VIEW_STATES_BUTTON,
@@ -101,7 +101,7 @@ struct _TrgMenuBarPrivate {
     GtkWidget *mb_view_states;
     GtkWidget *mb_view_notebook;
     GtkWidget *mb_view_stats;
-#ifdef HAVE_RSSGLIB
+#ifdef HAVE_RSS
     GtkWidget *mb_view_rss;
 #endif
     GtkWidget *mb_about;
@@ -148,7 +148,7 @@ void trg_menu_bar_connected_change(TrgMenuBar * mb, gboolean connected)
     gtk_widget_set_sensitive(priv->mb_disconnect, connected);
     gtk_widget_set_sensitive(priv->mb_remote_prefs, connected);
     gtk_widget_set_sensitive(priv->mb_view_stats, connected);
-#ifdef HAVE_RSSGLIB
+#ifdef HAVE_RSS
     gtk_widget_set_sensitive(priv->mb_view_rss, connected);
 #endif
     gtk_widget_set_sensitive(priv->mb_resume_all, connected);
@@ -284,7 +284,7 @@ trg_menu_bar_get_property(GObject * object, guint property_id,
     case PROP_VIEW_STATS_BUTTON:
         g_value_set_object(value, priv->mb_view_stats);
         break;
-#ifdef HAVE_RSSGLIB
+#ifdef HAVE_RSS
     case PROP_VIEW_RSS_BUTTON:
         g_value_set_object(value, priv->mb_view_rss);
         break;
@@ -558,7 +558,7 @@ static GtkWidget *trg_menu_bar_view_menu_new(TrgMenuBar * mb)
     gtk_widget_set_sensitive(priv->mb_view_stats, FALSE);
     gtk_menu_shell_append(GTK_MENU_SHELL(viewMenu), priv->mb_view_stats);
 
-#ifdef HAVE_RSSGLIB
+#ifdef HAVE_RSS
     priv->mb_view_rss =
         gtk_menu_item_new_with_mnemonic(_("_RSS"));
     //trg_menu_bar_accel_add(mb, priv->mb_view_rss, GDK_F7, 0);
@@ -894,7 +894,7 @@ static void trg_menu_bar_class_init(TrgMenuBarClass * klass)
     trg_menu_bar_install_widget_prop(object_class, PROP_VIEW_STATS_BUTTON,
                                      "view-stats-button",
                                      "View stats button");
-#ifdef HAVE_RSSGLIB
+#ifdef HAVE_RSS
     trg_menu_bar_install_widget_prop(object_class, PROP_VIEW_RSS_BUTTON,
                                      "view-rss-button",
                                      "View rss button");
diff --git a/src/trg-preferences-dialog.c b/src/trg-preferences-dialog.c
index 5c0204f..9503005 100644
--- a/src/trg-preferences-dialog.c
+++ b/src/trg-preferences-dialog.c
@@ -618,7 +618,7 @@ static GtkWidget *trg_prefs_openExecPage(TrgPreferencesDialog * dlg)
     return t;
 }
 
-#ifdef HAVE_RSSGLIB
+#ifdef HAVE_RSS
 static GtkWidget *trg_prefs_rss_page(TrgPreferencesDialog * dlg) {
     TrgPreferencesDialogPrivate *priv =
         TRG_PREFERENCES_DIALOG_GET_PRIVATE(dlg);
@@ -948,7 +948,7 @@ static GObject *trg_preferences_dialog_constructor(GType type,
                                                 (object)),
                              gtk_label_new(_("Directories")));
 
-#ifdef HAVE_RSSGLIB
+#ifdef HAVE_RSS
     gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
                              trg_prefs_rss_page(TRG_PREFERENCES_DIALOG
                                                 (object)),
diff --git a/src/trg-rss-cell-renderer.c b/src/trg-rss-cell-renderer.c
index 4765f2c..540960e 100644
--- a/src/trg-rss-cell-renderer.c
+++ b/src/trg-rss-cell-renderer.c
@@ -1,6 +1,6 @@
 #include "config.h"
 
-#ifdef HAVE_RSSGLIB
+#ifdef HAVE_RSS
 
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
diff --git a/src/trg-rss-cell-renderer.h b/src/trg-rss-cell-renderer.h
index a255d90..dbd3a6e 100644
--- a/src/trg-rss-cell-renderer.h
+++ b/src/trg-rss-cell-renderer.h
@@ -22,7 +22,7 @@
 
 #include "config.h"
 
-#ifdef HAVE_RSSGLIB
+#ifdef HAVE_RSS
 
 #include <gtk/gtk.h>
 
diff --git a/src/trg-rss-model.c b/src/trg-rss-model.c
index 6e95238..c1162f1 100644
--- a/src/trg-rss-model.c
+++ b/src/trg-rss-model.c
@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#ifdef HAVE_RSSGLIB
+#ifdef HAVE_RSS
 
 #include <gtk/gtk.h>
 #include <json-glib/json-glib.h>
diff --git a/src/trg-rss-model.h b/src/trg-rss-model.h
index ddecc95..21b5a70 100644
--- a/src/trg-rss-model.h
+++ b/src/trg-rss-model.h
@@ -22,7 +22,7 @@
 
 #include "config.h"
 
-#ifdef HAVE_RSSGLIB
+#ifdef HAVE_RSS
 
 #include <glib-object.h>
 #include <json-glib/json-glib.h>
diff --git a/src/trg-rss-window.c b/src/trg-rss-window.c
index 15a4c1a..d2a7722 100644
--- a/src/trg-rss-window.c
+++ b/src/trg-rss-window.c
@@ -19,7 +19,7 @@
 
 #include "config.h"
 
-#ifdef HAVE_RSSGLIB
+#ifdef HAVE_RSS
 
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
diff --git a/src/trg-rss-window.h b/src/trg-rss-window.h
index 5ce8690..ebf4ca6 100644
--- a/src/trg-rss-window.h
+++ b/src/trg-rss-window.h
@@ -22,7 +22,7 @@
 
 #include "config.h"
 
-#ifdef HAVE_RSSGLIB
+#ifdef HAVE_RSS
 
 #include <glib-object.h>
 #include <gtk/gtk.h>