[Pkg-cli-apps-commits] [gnome-do-plugins] 02/10: Imported Upstream version 0.8.5
Christopher Halse Rogers
raof-guest at alioth.debian.org
Tue Oct 15 10:49:07 UTC 2013
This is an automated email from the git hooks/post-receive script.
raof-guest pushed a commit to branch master
in repository gnome-do-plugins.
commit fdf17bdfe665d558e841fa06053763598b7f04cd
Author: Christopher James Halse Rogers <raof at ubuntu.com>
Date: Tue Oct 15 21:18:34 2013 +1100
Imported Upstream version 0.8.5
---
Alias/Makefile.am | 2 +-
Alias/Makefile.in | 160 +-
Alias/Resources/Alias.addin.xml | 30 -
AptURL/Makefile.am | 2 +-
AptURL/Makefile.in | 160 +-
AptURL/Resources/AptURL.addin.xml | 27 -
Archive/Makefile.am | 2 +-
Archive/Makefile.in | 160 +-
Archive/Resources/Archive.addin.xml | 27 -
Baconator/Makefile.am | 3 +-
Baconator/Makefile.in | 162 +-
Baconator/Resources/Baconator.addin.xml | 26 -
Banshee/Makefile.am | 18 +-
Banshee/Makefile.in | 182 ++-
Banshee/Resources/Banshee.addin.xml | 39 -
Bibtex/Makefile.am | 3 +-
Bibtex/Makefile.in | 162 +-
Bibtex/Resources/Bibtex.addin.xml | 29 -
BundledLibraries/Makefile.in | 302 ++--
BundledLibraries/telepathy-sharp/Makefile.in | 159 +-
Chromium/Makefile.am | 2 +-
Chromium/Makefile.in | 160 +-
Chromium/Resources/Chromium.addin.xml | 25 -
Cl.ickable/Makefile.am | 2 +-
Cl.ickable/Makefile.in | 160 +-
Cl.ickable/Resources/Cl.ickable.addin.xml | 30 -
ClawsMail/Makefile.am | 3 +-
ClawsMail/Makefile.in | 162 +-
ClawsMail/Resources/ClawsMail.addin.xml | 26 -
Confluence/Makefile.am | 3 +-
Confluence/Makefile.in | 162 +-
Confluence/Resources/Confluence.addin.xml | 27 -
Del.icio.us/Makefile.am | 3 +-
Del.icio.us/Makefile.in | 162 +-
Del.icio.us/Resources/delicious.addin.xml | 32 -
DiskMounter/Makefile.am | 3 +-
DiskMounter/Makefile.in | 161 +-
DiskMounter/Resources/DiskMounter.addin.xml | 32 -
Dropbox/Makefile.am | 3 +-
Dropbox/Makefile.in | 162 +-
Dropbox/Resources/Dropbox.addin.xml | 34 -
Dropbox/src/Dropbox.cs | 6 +-
EOG-Slideshow/Makefile.am | 2 +-
EOG-Slideshow/Makefile.in | 160 +-
EOG-Slideshow/Resources/EOG-Slideshow.addin.xml | 27 -
Emesene/Makefile.am | 9 +-
Emesene/Makefile.in | 167 +-
Emesene/Resources/Emesene.addin.xml | 42 -
Emesene/src/Emesene.cs | 4 +
Emesene/src/EmeseneChatAction.cs | 4 +
Empathy/Makefile.am | 4 +-
Empathy/Makefile.in | 161 +-
Empathy/Resources/Empathy.addin.xml | 37 -
Epiphany/Makefile.am | 2 +-
Epiphany/Makefile.in | 160 +-
Epiphany/Resources/Epiphany.addin.xml | 26 -
Exaile/Makefile.am | 2 +-
Exaile/Makefile.in | 160 +-
Exaile/Resources/Exaile.addin.xml | 32 -
File/Makefile.am | 3 +-
File/Makefile.in | 162 +-
File/Resources/File.addin.xml | 36 -
Firefox/Makefile.am | 2 +-
Firefox/Makefile.in | 160 +-
Firefox/Resources/Firefox.addin.xml | 26 -
Flickr/Makefile.am | 3 +-
Flickr/Makefile.in | 162 +-
Flickr/Resources/Flickr.addin.xml | 29 -
GNOME-Calculator/Makefile.am | 2 +-
GNOME-Calculator/Makefile.in | 160 +-
.../Resources/GNOME-Calculator.addin.xml | 26 -
GNOME-Dictionary/Makefile.am | 2 +-
GNOME-Dictionary/Makefile.in | 160 +-
.../Resources/GNOME-Dictionary.addin.xml | 26 -
GNOME-Screenshot/Makefile.am | 2 +-
GNOME-Screenshot/Makefile.in | 160 +-
.../Resources/GNOME-Screenshot.addin.xml | 29 -
GNOME-Session/Makefile.am | 8 +-
GNOME-Session/Makefile.in | 165 +-
GNOME-Session/Resources/GNOME-Session.addin.xml | 26 -
GNOME-Session/src/PowerManagement.cs | 35 +-
GNOME-Session/src/ScreenSaver.cs | 5 +
GNOME-Session/src/SessionCommandsItemSource.cs | 10 +-
GNOME-Session/src/SystemManagement.cs | 54 +-
GNOME-Terminal/Makefile.am | 2 +-
GNOME-Terminal/Makefile.in | 160 +-
GNOME-Terminal/Resources/GNOME-Terminal.addin.xml | 30 -
GoogleCalculator/Makefile.am | 2 +-
GoogleCalculator/Makefile.in | 160 +-
.../Resources/GoogleCalculator.addin.xml | 26 -
GoogleCalendar/Makefile.am | 3 +-
GoogleCalendar/Makefile.in | 162 +-
GoogleCalendar/Resources/GoogleCalendar.addin.xml | 33 -
GoogleContacts/Makefile.am | 3 +-
GoogleContacts/Makefile.in | 162 +-
GoogleContacts/Resources/GoogleContacts.addin.xml | 29 -
GoogleDocs/Makefile.am | 3 +-
GoogleDocs/Makefile.in | 162 +-
GoogleDocs/Resources/GoogleDocs.addin.xml | 31 -
GoogleMaps/Makefile.am | 2 +-
GoogleMaps/Makefile.in | 160 +-
GoogleMaps/Resources/GoogleMaps.addin.xml | 28 -
GoogleSearch/Makefile.am | 4 +-
GoogleSearch/Makefile.in | 162 +-
GoogleSearch/Resources/GoogleSearch.addin.xml | 29 -
ImageShack/Makefile.am | 4 +-
ImageShack/Makefile.in | 163 +-
ImageShack/Resources/ImageShack.addin.xml | 26 -
JIRA/Makefile.am | 3 +-
JIRA/Makefile.in | 162 +-
JIRA/Resources/JIRA.addin.xml | 30 -
Launchpad/Makefile.am | 4 +-
Launchpad/Makefile.in | 162 +-
Launchpad/Resources/Launchpad.addin.xml | 26 -
LocateFiles/Makefile.am | 2 +-
LocateFiles/Makefile.in | 160 +-
LocateFiles/Resources/LocateFiles.addin.xml | 26 -
MPD/Makefile.am | 2 +-
MPD/Makefile.in | 160 +-
MPD/Resources/MPD.addin.xml | 27 -
Makefile.am | 1 +
Makefile.in | 391 +++--
ManLookUp/Makefile.am | 2 +-
ManLookUp/Makefile.in | 160 +-
ManLookUp/Resources/ManLookUp.addin.xml | 26 -
Microblogging/Makefile.am | 4 +-
Microblogging/Makefile.in | 162 +-
Microblogging/Resources/Microblogging.addin.xml | 30 -
NX/Makefile.am | 2 +-
NX/Makefile.in | 160 +-
NX/Resources/NX.addin.xml | 28 -
OpenSearch/Makefile.am | 2 +-
OpenSearch/Makefile.in | 160 +-
OpenSearch/Resources/OpenSearch.addin.xml | 28 -
Opera/Makefile.am | 2 +-
Opera/Makefile.in | 160 +-
Opera/Resources/Opera.addin.xml | 25 -
Pastebin/Makefile.am | 4 +-
Pastebin/Makefile.in | 162 +-
Pastebin/Resources/Pastebin.addin.xml | 28 -
Pidgin/Makefile.am | 9 +-
Pidgin/Makefile.in | 167 +-
Pidgin/Resources/Pidgin.addin.xml | 36 -
Pidgin/src/Pidgin.cs | 5 +
PingFM/Makefile.am | 3 +-
PingFM/Makefile.in | 162 +-
PingFM/Resources/PingFM.addin.xml | 30 -
Putty/Makefile.am | 2 +-
Putty/Makefile.in | 160 +-
Putty/Resources/Putty.addin.xml | 30 -
Qalculate/Makefile.am | 2 +-
Qalculate/Makefile.in | 160 +-
Qalculate/Resources/Qalculate.addin.xml | 25 -
Quote/Makefile.am | 3 +-
Quote/Makefile.in | 162 +-
Quote/Resources/Quote.addin.xml | 27 -
RSS/Makefile.am | 3 +-
RSS/Makefile.in | 162 +-
RSS/Resources/RSS.addin.xml | 29 -
RememberTheMilk/Makefile.am | 3 +-
RememberTheMilk/Makefile.in | 162 +-
RememberTheMilk/Resources/RTM.addin.xml | 53 -
RemindMe/Makefile.am | 3 +-
RemindMe/Makefile.in | 162 +-
RemindMe/Resources/RemindMe.addin.xml | 27 -
RequestTracker/Makefile.am | 4 +-
RequestTracker/Makefile.in | 162 +-
RequestTracker/Resources/RequestTracker.addin.xml | 28 -
Rhythmbox/Makefile.am | 2 +-
Rhythmbox/Makefile.in | 160 +-
Rhythmbox/Resources/Rhythmbox.addin.xml | 34 -
Riptide/Makefile.am | 2 +-
Riptide/Makefile.in | 160 +-
Riptide/Resources/Riptide.addin.xml | 27 -
SSH/Makefile.am | 2 +-
SSH/Makefile.in | 160 +-
SSH/Resources/SSH.addin.xml | 29 -
Shelf/Makefile.am | 2 +-
Shelf/Makefile.in | 160 +-
Shelf/Resources/Shelf.addin.xml | 36 -
Skype/Makefile.am | 9 +-
Skype/Makefile.in | 167 +-
Skype/Resources/Skype.addin.xml | 32 -
Skype/src/Skype.cs | 5 +
SqueezeCenter/Makefile.am | 4 +-
SqueezeCenter/Makefile.in | 162 +-
SqueezeCenter/Resources/SqueezeCenter.addin.xml | 40 -
StockQuote/Makefile.am | 3 +-
StockQuote/Makefile.in | 162 +-
StockQuote/Resources/StockQuote.addin.xml | 27 -
SystemServices/Makefile.am | 2 +-
SystemServices/Makefile.in | 160 +-
SystemServices/Resources/SystemServices.addin.xml | 30 -
Tasque/Makefile.am | 8 +-
Tasque/Makefile.in | 165 +-
Tasque/Resources/Tasque.addin.xml | 28 -
Tasque/src/Tasque.cs | 1 +
Tasque/src/TasqueDBus.cs | 5 +
TerminalServerClient/Makefile.am | 2 +-
TerminalServerClient/Makefile.in | 160 +-
.../Resources/TerminalServerClient.addin.xml | 28 -
Text/Makefile.am | 2 +-
Text/Makefile.in | 160 +-
Text/Resources/Text.addin.xml | 26 -
Thunderbird/Makefile.am | 5 +-
Thunderbird/Makefile.in | 163 +-
Thunderbird/Resources/Thunderbird.addin.xml | 26 -
Thunderbird/src/ThunderbirdContactItemSource.cs | 243 ++-
TinyUrl/Makefile.am | 2 +-
TinyUrl/Makefile.in | 160 +-
TinyUrl/Resources/TinyUrl.addin.xml | 26 -
Tomboy/Makefile.am | 8 +-
Tomboy/Makefile.in | 165 +-
Tomboy/Resources/Tomboy.addin.xml | 30 -
Tomboy/src/TomboyDBus.cs | 5 +
Tracker/Makefile.am | 4 +-
Tracker/Makefile.in | 161 +-
Tracker/src/ITrackerSearch.cs | 5 +
Tracker/src/Tracker.cs | 5 +
Translate/Makefile.am | 6 +-
Translate/Makefile.in | 164 +-
Translate/Resources/Translate.addin.xml | 25 -
Transmission/Makefile.am | 40 +
{Dropbox => Transmission}/Makefile.in | 211 ++-
Transmission/Resources/Transmission.addin.xml.in | 37 +
Transmission/Resources/icons/transmission.png | Bin 0 -> 2941 bytes
.../gtk-gui/Transmission.TransmissionConfig.cs | 161 ++
Transmission/gtk-gui/generated.cs | 82 +
Transmission/gtk-gui/gui.stetic | 196 +++
Transmission/src/Config/TransmissionConfig.cs | 91 ++
Transmission/src/ITorrentEntry.cs | 16 +
.../src/TorrentAbstractLimitSpeedAction.cs | 80 +
Transmission/src/TorrentDirectoryItem.cs | 64 +
Transmission/src/TorrentFileItem.cs | 97 ++
Transmission/src/TorrentFileSetPriorityAction.cs | 108 ++
Transmission/src/TorrentItem.cs | 72 +
Transmission/src/TorrentItemSource.cs | 130 ++
.../src/TorrentLimitDownloadSpeedAction.cs | 47 +
Transmission/src/TorrentLimitUploadSpeedAction.cs | 47 +
Transmission/src/TorrentMarkForDownloadAction.cs | 62 +
Transmission/src/TorrentOperateAction.cs | 37 +
Transmission/src/TorrentStartAction.cs | 42 +
Transmission/src/TorrentStopAction.cs | 42 +
Transmission/src/TorrentUnmarkForDownloadAction.cs | 62 +
Transmission/src/TorrentVerifyAction.cs | 42 +
Transmission/src/TransmissionAPI.cs | 547 +++++++
Transmission/src/TransmissionPlugin.cs | 50 +
Transmission/src/Utils.cs | 111 ++
Vinagre/Makefile.am | 2 +-
Vinagre/Makefile.in | 160 +-
Vinagre/Resources/Vinagre.addin.xml | 30 -
VirtualBox/Makefile.am | 3 +-
VirtualBox/Makefile.in | 160 +-
VirtualBox/Resources/VirtualBox.addin.xml | 36 -
VolumeControl/Makefile.am | 2 +-
VolumeControl/Makefile.in | 160 +-
VolumeControl/Resources/VolumeControl.addin.xml | 26 -
WindowManager/Makefile.am | 6 +-
WindowManager/Makefile.in | 163 +-
WindowManager/Resources/WindowManager.addin.xml | 41 -
WindowManager/WindowManager.dll.config | 4 +
Woof/Makefile.am | 6 +-
Woof/Makefile.in | 163 +-
Woof/Resources/Woof.addin.xml | 27 -
Woof/src/Woof.cs | 4 +
Wordnet/Makefile.am | 2 +-
Wordnet/Makefile.in | 160 +-
Wordnet/Resources/Wordnet.addin.xml | 28 -
XRandR/Makefile.am | 5 +-
XRandR/Makefile.in | 163 +-
XRandR/Resources/XRandR.addin.xml | 23 -
XRandR/XRandR.dll.config | 4 +
Xmms2/Makefile.am | 2 +-
Xmms2/Makefile.in | 160 +-
Xmms2/Resources/xmms2.addin.xml | 37 -
YouTube/Makefile.am | 3 +-
YouTube/Makefile.in | 162 +-
YouTube/Resources/Youtube.addin.xml | 32 -
Zim/Makefile.am | 2 +-
Zim/Makefile.in | 160 +-
Zim/Resources/Zim.addin.xml | 29 -
aclocal.m4 | 778 ++++------
build.rules.mk | 8 +-
configure | 1619 +++++++++++---------
configure.ac | 87 +-
install-sh | 35 +-
m4/intltool.m4 | 237 +++
m4/shamrock/mono.m4 | 13 +-
missing | 461 ++----
po/Makefile.in.in | 13 +-
po/POTFILES.in | 11 +
291 files changed, 14883 insertions(+), 7278 deletions(-)
diff --git a/Alias/Makefile.am b/Alias/Makefile.am
index 5560fb0..313e482 100644
--- a/Alias/Makefile.am
+++ b/Alias/Makefile.am
@@ -8,7 +8,7 @@ FILES = \
src/AliasItemSource.cs \
src/DeleteAliasAction.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/Alias.addin.xml
REFERENCES = \
diff --git a/Alias/Makefile.in b/Alias/Makefile.in
index 45d1fab..ac4bf0e 100644
--- a/Alias/Makefile.in
+++ b/Alias/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = Alias
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -290,7 +368,7 @@ FILES = \
src/AliasItemSource.cs \
src/DeleteAliasAction.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/Alias.addin.xml
REFERENCES = \
@@ -323,6 +401,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -334,8 +413,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -349,14 +431,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -406,10 +486,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -492,16 +577,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/Alias/Resources/Alias.addin.xml b/Alias/Resources/Alias.addin.xml
deleted file mode 100644
index 2674898..0000000
--- a/Alias/Resources/Alias.addin.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<Addin
- id="Alias"
- namespace="Do"
- version="1.0"
- name="Alias"
- description="Assign alternate names to items."
- author="David Siegel"
- category="Official"
- defaultEnabled="false"
- url="http://do.davebsd.com/wiki/Alias_Plugin"
- >
-
- <Runtime>
- <Import assembly="Alias.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <Extension path="/Do/ItemSource">
- <ItemSource type="Alias.AliasItemSource" />
- </Extension>
- <Extension path="/Do/Action">
- <Action type="Alias.AliasAction" />
- <Action type="Alias.DeleteAliasAction" />
- </Extension>
-</Addin>
diff --git a/AptURL/Makefile.am b/AptURL/Makefile.am
index 71c6e5a..6626969 100644
--- a/AptURL/Makefile.am
+++ b/AptURL/Makefile.am
@@ -5,7 +5,7 @@ ASSEMBLY=AptURL
FILES = \
src/AptUrl.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/AptURL.addin.xml
REFERENCES = \
diff --git a/AptURL/Makefile.in b/AptURL/Makefile.in
index 0b0c43b..ad660aa 100644
--- a/AptURL/Makefile.in
+++ b/AptURL/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = AptURL
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -287,7 +365,7 @@ ASSEMBLY = AptURL
FILES = \
src/AptUrl.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/AptURL.addin.xml
REFERENCES = \
@@ -320,6 +398,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -331,8 +410,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -346,14 +428,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -403,10 +483,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -489,16 +574,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/AptURL/Resources/AptURL.addin.xml b/AptURL/Resources/AptURL.addin.xml
deleted file mode 100644
index e32dc97..0000000
--- a/AptURL/Resources/AptURL.addin.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<Addin
- id="AptURL"
- namespace="Do"
- version="1.0"
- name="AptURL Package Installer"
- description="Install apt packages by name."
- author="Christer Edwards"
- category="Community"
- defaultEnabled="false"
- url="http://do.davebsd.com/wiki/AptURL_Plugin"
- >
-
- <Runtime>
- <Import assembly="AptURL.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <Extension path="/Do/Action">
- <Action type="AptURL.AptAction" />
- </Extension>
-
-</Addin>
diff --git a/Archive/Makefile.am b/Archive/Makefile.am
index 9c4696f..bc79f8e 100644
--- a/Archive/Makefile.am
+++ b/Archive/Makefile.am
@@ -7,7 +7,7 @@ FILES = \
src/CreateArchiveAction.cs \
src/ExtractArchiveAction.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/Archive.addin.xml
REFERENCES = \
diff --git a/Archive/Makefile.in b/Archive/Makefile.in
index 3bd656d..c4554ce 100644
--- a/Archive/Makefile.in
+++ b/Archive/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = Archive
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -289,7 +367,7 @@ FILES = \
src/CreateArchiveAction.cs \
src/ExtractArchiveAction.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/Archive.addin.xml
REFERENCES = \
@@ -321,6 +399,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -332,8 +411,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -347,14 +429,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -404,10 +484,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -490,16 +575,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/Archive/Resources/Archive.addin.xml b/Archive/Resources/Archive.addin.xml
deleted file mode 100644
index d4a96c7..0000000
--- a/Archive/Resources/Archive.addin.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<Addin
- id="Archive"
- namespace="Do"
- version="1.0"
- name="Archive"
- description="Create and extract archive files."
- author="Guillaume Beland"
- category="Community"
- defaultEnabled="false"
- url="http://do.davebsd.com/wiki/Archive_Plugin"
->
-
- <Runtime>
- <Import assembly="Archive.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <Extension path = "/Do/Action">
- <Action type="Archive.ArchiveAction" />
- <Action type="Archive.ExtractAction" />
- </Extension>
-</Addin>
diff --git a/Baconator/Makefile.am b/Baconator/Makefile.am
index a4b26bd..37c2d2a 100644
--- a/Baconator/Makefile.am
+++ b/Baconator/Makefile.am
@@ -5,8 +5,9 @@ ASSEMBLY=Baconator
FILES = \
src/BaconateAction.cs
+GENERATED_RESOURCES = \
+ Resources/Baconator.addin.xml
RESOURCES = \
- Resources/Baconator.addin.xml \
Resources/baconator.jpg
REFERENCES = \
diff --git a/Baconator/Makefile.in b/Baconator/Makefile.in
index 3613847..a79d94e 100644
--- a/Baconator/Makefile.in
+++ b/Baconator/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = Baconator
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -287,8 +365,10 @@ ASSEMBLY = Baconator
FILES = \
src/BaconateAction.cs
+GENERATED_RESOURCES = \
+ Resources/Baconator.addin.xml
+
RESOURCES = \
- Resources/Baconator.addin.xml \
Resources/baconator.jpg
REFERENCES = \
@@ -321,6 +401,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -332,8 +413,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -347,14 +431,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -404,10 +486,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -490,16 +577,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/Baconator/Resources/Baconator.addin.xml b/Baconator/Resources/Baconator.addin.xml
deleted file mode 100644
index 8aadd56..0000000
--- a/Baconator/Resources/Baconator.addin.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<Addin
- id="Baconator"
- namespace="Do"
- version="1.0"
- name="Baconator"
- description="Bacon bacon beef, bacon beef"
- author="Alex Launi"
- category="Community"
- defaultEnabled="false"
- url="http://bacolicio.us/http://do.davebsd.com/wiki/Baconator_Plugin"
- >
-
- <Runtime>
- <Import assembly="Baconator.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <Extension path = "/Do/Action">
- <Action type="Baconator.BaconateAction" />
- </Extension>
-</Addin>
diff --git a/Banshee/Makefile.am b/Banshee/Makefile.am
index f7fb51b..3b55490 100644
--- a/Banshee/Makefile.am
+++ b/Banshee/Makefile.am
@@ -4,10 +4,6 @@ endif
ASSEMBLY=Banshee
-if BANSHEE_DBUS_SHARP
-BUILD_DEFINES=-define:USE_DBUS_SHARP
-endif
-
FILES = \
src/AbstractPlayerAction.cs \
src/Banshee.cs \
@@ -23,22 +19,16 @@ FILES = \
src/PreviousAction.cs \
src/SearchCollectionAction.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/Banshee.addin.xml
+BUILD_DEFINES=$(DBUS_BUILD_DEFINES)
+
REFERENCES = \
System \
System.Core \
$(BANSHEE_INDEXER_LIBS) \
$(DO_PLATFORM_LIBS) \
- $(DO_UNIVERSE_LIBS)
-
-if BANSHEE_DBUS_SHARP
-REFERENCES += \
+ $(DO_UNIVERSE_LIBS) \
$(DBUS_SHARP_LIBS) \
$(DBUS_SHARP_GLIB_LIBS)
-else
-REFERENCES += \
- $(NDESK_DBUS_10_LIBS) \
- $(NDESK_DBUS_GLIB_10_LIBS)
-endif
diff --git a/Banshee/Makefile.in b/Banshee/Makefile.in
index 6a55239..5edd15d 100644
--- a/Banshee/Makefile.in
+++ b/Banshee/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,32 +80,41 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE@@HAVE_BANSHEE_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE@@HAVE_BANSHEE_TRUE at am__append_2 = -debug -d:DEBUG
- at BANSHEE_DBUS_SHARP_TRUE@am__append_3 = \
- at BANSHEE_DBUS_SHARP_TRUE@ $(DBUS_SHARP_LIBS) \
- at BANSHEE_DBUS_SHARP_TRUE@ $(DBUS_SHARP_GLIB_LIBS)
-
- at BANSHEE_DBUS_SHARP_FALSE@am__append_4 = \
- at BANSHEE_DBUS_SHARP_FALSE@ $(NDESK_DBUS_10_LIBS) \
- at BANSHEE_DBUS_SHARP_FALSE@ $(NDESK_DBUS_GLIB_10_LIBS)
-
subdir = Banshee
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -83,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -107,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -141,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -165,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -183,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -240,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -262,7 +330,8 @@ top_srcdir = @top_srcdir@
@HAVE_BANSHEE_TRUE at TARGET = library
@HAVE_BANSHEE_TRUE at SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
@HAVE_BANSHEE_TRUE at RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
- at HAVE_BANSHEE_TRUE@RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+ at HAVE_BANSHEE_TRUE@GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+ at HAVE_BANSHEE_TRUE@RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
@HAVE_BANSHEE_TRUE@ -resource:$(resource),$(notdir $(resource)))
@HAVE_BANSHEE_TRUE at BUILD_DIR = $(top_builddir)/build
@@ -274,7 +343,7 @@ top_srcdir = @top_srcdir@
# Install plugins as data; there's no need for them to be excutable
@HAVE_BANSHEE_TRUE at plugindir = ${libdir}/gnome-do/plugins
- at HAVE_BANSHEE_TRUE@plugin_DATA = $(OUTPUT_FILES)
+ at HAVE_BANSHEE_TRUE@plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -286,13 +355,13 @@ top_srcdir = @top_srcdir@
# Clean and dist targets
#
@HAVE_BANSHEE_TRUE at EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- at HAVE_BANSHEE_TRUE@ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ at HAVE_BANSHEE_TRUE@ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ at HAVE_BANSHEE_TRUE@ $(DLL_CONFIG_FILES)
@HAVE_BANSHEE_TRUE at CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
@HAVE_BANSHEE_TRUE at DISTCLEANFILES = *.pidb
@HAVE_BANSHEE_TRUE at MAINTAINERCLEANFILES = Makefile.in
ASSEMBLY = Banshee
- at BANSHEE_DBUS_SHARP_TRUE@BUILD_DEFINES = -define:USE_DBUS_SHARP
FILES = \
src/AbstractPlayerAction.cs \
src/Banshee.cs \
@@ -308,12 +377,19 @@ FILES = \
src/PreviousAction.cs \
src/SearchCollectionAction.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/Banshee.addin.xml
-REFERENCES = System System.Core $(BANSHEE_INDEXER_LIBS) \
- $(DO_PLATFORM_LIBS) $(DO_UNIVERSE_LIBS) $(am__append_3) \
- $(am__append_4)
+BUILD_DEFINES = $(DBUS_BUILD_DEFINES)
+REFERENCES = \
+ System \
+ System.Core \
+ $(BANSHEE_INDEXER_LIBS) \
+ $(DO_PLATFORM_LIBS) \
+ $(DO_UNIVERSE_LIBS) \
+ $(DBUS_SHARP_LIBS) \
+ $(DBUS_SHARP_GLIB_LIBS)
+
all: all-am
.SUFFIXES:
@@ -338,6 +414,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -349,8 +426,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -364,14 +444,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -421,10 +499,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -507,16 +590,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
@HAVE_BANSHEE_TRUE at all: $(OUTPUT_FILES)
diff --git a/Banshee/Resources/Banshee.addin.xml b/Banshee/Resources/Banshee.addin.xml
deleted file mode 100644
index 964ade5..0000000
--- a/Banshee/Resources/Banshee.addin.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<Addin
- id="Banshee"
- namespace="Do"
- version="1.0"
- name="Banshee Media Player"
- description="Search your media collection and control playback."
- author="Alex Launi"
- category="Official"
- defaultEnabled="false"
- url="http://do.davebsd.com/wiki/Banshee_Plugin"
->
-
- <Runtime>
- <Import assembly="Banshee.dll"/>
- <Import assembly="/usr/lib/banshee/Banshee.CollectionIndexer.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <!-- Extensions included in this assembly -->
- <!-- Itemsources -->
- <Extension path = "/Do/ItemSource">
- <ItemSource type = "Banshee.MediaItemSource" />
- </Extension>
-
- <!-- Actions -->
- <Extension path = "/Do/Action">
- <Action type = "Banshee.PlayAction" />
- <Action type = "Banshee.PauseAction" />
- <Action type = "Banshee.NextAction" />
- <Action type = "Banshee.PreviousAction" />
- <Action type = "Banshee.EnqueueAction" />
- <Action type = "Banshee.SearchCollectionAction" />
- </Extension>
-</Addin>
diff --git a/Bibtex/Makefile.am b/Bibtex/Makefile.am
index 2b4334a..ec1f8ff 100644
--- a/Bibtex/Makefile.am
+++ b/Bibtex/Makefile.am
@@ -11,8 +11,9 @@ FILES = \
src/BibtexItemSource.cs \
src/Configuration.cs
+GENERATED_RESOURCES = \
+ Resources/Bibtex.addin.xml
RESOURCES = \
- Resources/Bibtex.addin.xml \
gtk-gui/gui.stetic \
gtk-gui/objects.xml
diff --git a/Bibtex/Makefile.in b/Bibtex/Makefile.in
index 9649f8a..d245c5f 100644
--- a/Bibtex/Makefile.in
+++ b/Bibtex/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = Bibtex
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -293,8 +371,10 @@ FILES = \
src/BibtexItemSource.cs \
src/Configuration.cs
+GENERATED_RESOURCES = \
+ Resources/Bibtex.addin.xml
+
RESOURCES = \
- Resources/Bibtex.addin.xml \
gtk-gui/gui.stetic \
gtk-gui/objects.xml
@@ -330,6 +410,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -341,8 +422,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -356,14 +440,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -413,10 +495,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -499,16 +586,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/Bibtex/Resources/Bibtex.addin.xml b/Bibtex/Resources/Bibtex.addin.xml
deleted file mode 100644
index c0fc326..0000000
--- a/Bibtex/Resources/Bibtex.addin.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<Addin
- id="Bibtex"
- namespace="Do"
- version="1.8"
- name="Bibtex"
- description="Quickly open documents linked from BibTeX files."
- author="Niall Murphy"
- category="Community"
- defaultEnabled="false"
- url="http://do.davebsd.com/wiki/Bibtex_Plugin"
->
-
- <Runtime>
- <Import assembly="Bibtex.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <Extension path = "/Do/Action">
- <Action type="Bibtex.BibtexCiteAction" />
- </Extension>
- <Extension path = "/Do/ItemSource">
- <ItemSource type="Bibtex.BibtexItemSource" />
- </Extension>
-</Addin>
diff --git a/BundledLibraries/Makefile.in b/BundledLibraries/Makefile.in
index 17fdb95..33279ce 100644
--- a/BundledLibraries/Makefile.in
+++ b/BundledLibraries/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -15,6 +14,51 @@
@SET_MAKE@
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -32,32 +76,70 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
subdir = BundledLibraries
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
- install-dvi-recursive install-exec-recursive \
- install-html-recursive install-info-recursive \
- install-pdf-recursive install-ps-recursive install-recursive \
- installcheck-recursive installdirs-recursive pdf-recursive \
- ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+ ctags-recursive dvi-recursive html-recursive info-recursive \
+ install-data-recursive install-dvi-recursive \
+ install-exec-recursive install-html-recursive \
+ install-info-recursive install-pdf-recursive \
+ install-ps-recursive install-recursive installcheck-recursive \
+ installdirs-recursive pdf-recursive ps-recursive \
+ tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+ $(RECURSIVE_TARGETS) \
+ $(RECURSIVE_CLEAN_TARGETS) \
+ $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = telepathy-sharp
@@ -90,6 +172,7 @@ am__relativize = \
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -108,12 +191,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -142,6 +227,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -166,6 +252,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -184,10 +274,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -241,6 +329,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -296,22 +386,25 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-# (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
- @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+# (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+ @fail=; \
+ if $(am__make_keepgoing); then \
+ failcom='fail=yes'; \
+ else \
+ failcom='exit 1'; \
+ fi; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ for subdir in $$list; do \
echo "Making $$target in $$subdir"; \
if test "$$subdir" = "."; then \
dot_seen=yes; \
@@ -326,57 +419,12 @@ $(RECURSIVE_TARGETS):
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-$(RECURSIVE_CLEAN_TARGETS):
- @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
- *) list='$(SUBDIRS)' ;; \
- esac; \
- rev=''; for subdir in $$list; do \
- if test "$$subdir" = "."; then :; else \
- rev="$$subdir $$rev"; \
- fi; \
- done; \
- rev="$$rev ."; \
- target=`echo $@ | sed s/-recursive//`; \
- for subdir in $$rev; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done && test -z "$$fail"
-tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
- done
-ctags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
+ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -392,12 +440,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@ -409,15 +452,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$$unique; \
fi; \
fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@ -426,6 +465,21 @@ GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -462,13 +516,10 @@ distdir: $(DISTFILES)
done
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
- fi; \
- done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
+ $(am__make_dryrun) \
+ || test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
$(am__relativize); \
new_distdir=$$reldir; \
@@ -503,10 +554,15 @@ install-am: all-am
installcheck: installcheck-recursive
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -584,21 +640,19 @@ ps-am:
uninstall-am:
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
- install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- all all-am check check-am clean clean-generic ctags \
- ctags-recursive distclean distclean-generic distclean-tags \
- distdir dvi dvi-am html html-am info info-am install \
- install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-strip installcheck installcheck-am installdirs \
- installdirs-am maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
- tags-recursive uninstall uninstall-am
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+ check-am clean clean-generic cscopelist-am ctags ctags-am \
+ distclean distclean-generic distclean-tags distdir dvi dvi-am \
+ html html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags tags-am uninstall uninstall-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/BundledLibraries/telepathy-sharp/Makefile.in b/BundledLibraries/telepathy-sharp/Makefile.in
index b8e3c30..dc08583 100644
--- a/BundledLibraries/telepathy-sharp/Makefile.in
+++ b/BundledLibraries/telepathy-sharp/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk AUTHORS
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am AUTHORS README
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = BundledLibraries/telepathy-sharp
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -282,8 +359,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# use them
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) \
$(THEME_ICONS_SOURCE) $(foreach pkgcfg_file, \
- $(PKG_CONFIG_FILES), $(pkgcfg_file).in) $(addprefix, \
- $(srcdir), AUTHORS LICENSE PROVIDENCE README \
+ $(PKG_CONFIG_FILES), $(pkgcfg_file).in) $(DLL_CONFIG_FILES) \
+ $(addprefix, $(srcdir), AUTHORS LICENSE PROVIDENCE README \
telpathy-sharp.sln telepathy-sharp/telepathy-sharp.csproj \
tests/AssemblyInfo.cs tests/DTubeTest.cs tests/FileTransfer.cs \
tests/Main.cs tests/McTest.cs tests/MiscTest.cs tests.csproj )
@@ -325,6 +402,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -336,8 +414,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -351,14 +432,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -408,10 +487,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -494,16 +578,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/Chromium/Makefile.am b/Chromium/Makefile.am
index dd1f141..23e5bb2 100644
--- a/Chromium/Makefile.am
+++ b/Chromium/Makefile.am
@@ -5,7 +5,7 @@ ASSEMBLY=Chromium
FILES = \
src/ChromiumBookmarkItemSource.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/Chromium.addin.xml
REFERENCES = \
diff --git a/Chromium/Makefile.in b/Chromium/Makefile.in
index b1af1c2..5ab45c3 100644
--- a/Chromium/Makefile.in
+++ b/Chromium/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = Chromium
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -287,7 +365,7 @@ ASSEMBLY = Chromium
FILES = \
src/ChromiumBookmarkItemSource.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/Chromium.addin.xml
REFERENCES = \
@@ -320,6 +398,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -331,8 +410,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -346,14 +428,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -403,10 +483,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -489,16 +574,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/Chromium/Resources/Chromium.addin.xml b/Chromium/Resources/Chromium.addin.xml
deleted file mode 100644
index 83006d5..0000000
--- a/Chromium/Resources/Chromium.addin.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<Addin
- id="Chromium"
- namespace="Do"
- version="1.1"
- name="Chromium"
- description="Search your Google Chrome, and Chromium bookmarks."
- author="Jonathan Lambrechts, Alex Launi"
- category="Community"
- defaultEnabled="false"
->
-
- <Runtime>
- <Import assembly="Chromium.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <Extension path="/Do/ItemSource">
- <ItemSource type="Chromium.ChromiumBookmarkItemSource" />
- </Extension>
-</Addin>
diff --git a/Cl.ickable/Makefile.am b/Cl.ickable/Makefile.am
index 6981627..7196def 100644
--- a/Cl.ickable/Makefile.am
+++ b/Cl.ickable/Makefile.am
@@ -7,7 +7,7 @@ FILES = \
src/ClipAction.cs \
src/WebClipsItem.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/Cl.ickable.addin.xml
REFERENCES = \
diff --git a/Cl.ickable/Makefile.in b/Cl.ickable/Makefile.in
index 1885904..de9cf73 100644
--- a/Cl.ickable/Makefile.in
+++ b/Cl.ickable/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = Cl.ickable
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -289,7 +367,7 @@ FILES = \
src/ClipAction.cs \
src/WebClipsItem.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/Cl.ickable.addin.xml
REFERENCES = \
@@ -323,6 +401,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -334,8 +413,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -349,14 +431,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -406,10 +486,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -492,16 +577,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/Cl.ickable/Resources/Cl.ickable.addin.xml b/Cl.ickable/Resources/Cl.ickable.addin.xml
deleted file mode 100644
index 6eb8393..0000000
--- a/Cl.ickable/Resources/Cl.ickable.addin.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<Addin
- id="Cl.ickable"
- namespace="Do"
- version="1.0"
- name="Cl.ickable WebClips"
- description="Save clips on Cl.ickable.com"
- author="Idealab"
- category="Community"
- defaultEnabled="false"
- url="http://do.davebsd.com/wiki/Cl.ickable_WebClips_Plugin"
->
-
- <Runtime>
- <Import assembly="Cl.ickable.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <Extension path="/Do/Action">
- <Action type="Cl.ickable.ClipAction" />
- </Extension>
-
- <Extension path="/Do/ItemSource">
- <ItemSource type="Cl.ickable.ClickableItemSource" />
- </Extension>
-</Addin>
diff --git a/ClawsMail/Makefile.am b/ClawsMail/Makefile.am
index 22e119e..947fa19 100644
--- a/ClawsMail/Makefile.am
+++ b/ClawsMail/Makefile.am
@@ -6,8 +6,9 @@ FILES = \
src/ClawsContactDetailItem.cs \
src/ClawsContactsItemSource.cs
+GENERATED_RESOURCES = \
+ Resources/ClawsMail.addin.xml
RESOURCES = \
- Resources/ClawsMail.addin.xml \
Resources/icons/claws-mail.png
REFERENCES = \
diff --git a/ClawsMail/Makefile.in b/ClawsMail/Makefile.in
index ec58823..5301687 100644
--- a/ClawsMail/Makefile.in
+++ b/ClawsMail/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = ClawsMail
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -288,8 +366,10 @@ FILES = \
src/ClawsContactDetailItem.cs \
src/ClawsContactsItemSource.cs
+GENERATED_RESOURCES = \
+ Resources/ClawsMail.addin.xml
+
RESOURCES = \
- Resources/ClawsMail.addin.xml \
Resources/icons/claws-mail.png
REFERENCES = \
@@ -323,6 +403,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -334,8 +415,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -349,14 +433,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -406,10 +488,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -492,16 +579,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/ClawsMail/Resources/ClawsMail.addin.xml b/ClawsMail/Resources/ClawsMail.addin.xml
deleted file mode 100644
index 5ffc816..0000000
--- a/ClawsMail/Resources/ClawsMail.addin.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<Addin
- id="ClawsMail"
- namespace="Do"
- version="1.0"
- name="ClawsMail"
- description="Search contacts in your ClawsMail address book."
- author="Karol Będkowski"
- category="Community"
- defaultEnabled="false"
- >
-
- <Runtime>
- <Import assembly="ClawsMail.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <Extension path = "/Do/ItemSource">
- <ItemSource type="Claws.ClawsContactsItemSource" />
- </Extension>
-
-</Addin>
diff --git a/Confluence/Makefile.am b/Confluence/Makefile.am
index 5649cc2..cd69ade 100644
--- a/Confluence/Makefile.am
+++ b/Confluence/Makefile.am
@@ -10,8 +10,9 @@ FILES = \
src/ConfluenceSearchAction.cs \
src/Remote/ConfluenceSoapServiceService.cs
+GENERATED_RESOURCES = \
+ Resources/Confluence.addin.xml
RESOURCES = \
- Resources/Confluence.addin.xml \
Resources/icons/confluence.png \
gtk-gui/gui.stetic \
gtk-gui/objects.xml
diff --git a/Confluence/Makefile.in b/Confluence/Makefile.in
index a5bbbc8..5298d54 100644
--- a/Confluence/Makefile.in
+++ b/Confluence/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = Confluence
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -292,8 +370,10 @@ FILES = \
src/ConfluenceSearchAction.cs \
src/Remote/ConfluenceSoapServiceService.cs
+GENERATED_RESOURCES = \
+ Resources/Confluence.addin.xml
+
RESOURCES = \
- Resources/Confluence.addin.xml \
Resources/icons/confluence.png \
gtk-gui/gui.stetic \
gtk-gui/objects.xml
@@ -332,6 +412,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -343,8 +424,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -358,14 +442,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -415,10 +497,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -501,16 +588,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/Confluence/Resources/Confluence.addin.xml b/Confluence/Resources/Confluence.addin.xml
deleted file mode 100644
index 00e5b6a..0000000
--- a/Confluence/Resources/Confluence.addin.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<Addin
- id="Confluence"
- namespace="Do"
- version="1.0"
- name="Confluence"
- description="Interact with Confluence wikis."
- author="John Wood"
- category="Community"
- defaultEnabled="false"
- url="http://do.davebsd.com/wiki/Confluence_Plugin"
- >
-
- <Runtime>
- <Import assembly="Confluence.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <Extension path = "/Do/Action">
- <Action type="Confluence.ConfluenceSearchAction" />
- </Extension>
-
-</Addin>
diff --git a/Del.icio.us/Makefile.am b/Del.icio.us/Makefile.am
index 686503b..11055f0 100644
--- a/Del.icio.us/Makefile.am
+++ b/Del.icio.us/Makefile.am
@@ -12,8 +12,9 @@ FILES = \
src/TagItem.cs \
src/TagsItemSource.cs
+GENERATED_RESOURCES = \
+ Resources/delicious.addin.xml
RESOURCES = \
- Resources/delicious.addin.xml \
Resources/icons/delicious.png
REFERENCES = \
diff --git a/Del.icio.us/Makefile.in b/Del.icio.us/Makefile.in
index f2242bc..bf405f1 100644
--- a/Del.icio.us/Makefile.in
+++ b/Del.icio.us/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = Del.icio.us
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -294,8 +372,10 @@ FILES = \
src/TagItem.cs \
src/TagsItemSource.cs
+GENERATED_RESOURCES = \
+ Resources/delicious.addin.xml
+
RESOURCES = \
- Resources/delicious.addin.xml \
Resources/icons/delicious.png
REFERENCES = \
@@ -330,6 +410,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -341,8 +422,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -356,14 +440,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -413,10 +495,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -499,16 +586,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/Del.icio.us/Resources/delicious.addin.xml b/Del.icio.us/Resources/delicious.addin.xml
deleted file mode 100644
index f69692b..0000000
--- a/Del.icio.us/Resources/delicious.addin.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<Addin
- id="delicious"
- namespace="Do"
- version="2.0"
- name="del.icio.us Tag Search"
- description="Search your del.icio.us bookmarks."
- author="Jacob Andreas, Alex Launi"
- category="Community"
- defaultEnabled="false"
- url="http://do.davebsd.com/wiki/Delicious_Plugin"
->
-
- <Runtime>
- <Import assembly="del.icio.us.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <!-- Extensions included in this assembly -->
- <Extension path="/Do/Action">
- <Action type="Delicious.SearchAction" />
- <!-- <Action type="Delicious.NewBookmarkAction" /> -->
- </Extension>
- <Extension path="/Do/ItemSource">
- <ItemSource type="Delicious.BookmarksItemSource" />
- <ItemSource type="Delicious.TagsItemSource" />
- </Extension>
-</Addin>
diff --git a/DiskMounter/Makefile.am b/DiskMounter/Makefile.am
index 78e36d4..ff12ff3 100644
--- a/DiskMounter/Makefile.am
+++ b/DiskMounter/Makefile.am
@@ -9,11 +9,12 @@ FILES = \
src/OpenVolumeAction.cs \
src/UnmountAction.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/DiskMounter.addin.xml
REFERENCES = \
System \
System.Core \
+ $(GLIB_SHARP_20_LIBS) \
$(GNOME_VFS_SHARP_20_LIBS) \
$(DO_PLATFORM_LIBS)
diff --git a/DiskMounter/Makefile.in b/DiskMounter/Makefile.in
index 2c7ff71..ead1d9f 100644
--- a/DiskMounter/Makefile.in
+++ b/DiskMounter/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = DiskMounter
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -291,12 +369,13 @@ FILES = \
src/OpenVolumeAction.cs \
src/UnmountAction.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/DiskMounter.addin.xml
REFERENCES = \
System \
System.Core \
+ $(GLIB_SHARP_20_LIBS) \
$(GNOME_VFS_SHARP_20_LIBS) \
$(DO_PLATFORM_LIBS)
@@ -324,6 +403,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -335,8 +415,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -350,14 +433,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -407,10 +488,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -493,16 +579,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/DiskMounter/Resources/DiskMounter.addin.xml b/DiskMounter/Resources/DiskMounter.addin.xml
deleted file mode 100644
index d76a4be..0000000
--- a/DiskMounter/Resources/DiskMounter.addin.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<Addin
- id="DiskMounter"
- namespace="Do"
- version="1.0"
- name="Disk Mounter"
- description="Mount and unmount drive volumes in GNOME."
- author="Guillaume Béland"
- category="Community"
- defaultEnabled="false"
- url="http://do.davebsd.com/wiki/DiskMounter_Plugin"
->
-
- <Runtime>
- <Import assembly="DiskMounter.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <Extension path="/Do/Action">
- <Action type="DiskMounter.OpenVolume" />
- <Action type="DiskMounter.MountAction" />
- <Action type="DiskMounter.UnmountAction" />
- </Extension>
-
- <Extension path="/Do/ItemSource">
- <ItemSource type="DiskMounter.DriveItemSource" />
- </Extension>
-</Addin>
diff --git a/Dropbox/Makefile.am b/Dropbox/Makefile.am
index c3c4811..85f033c 100644
--- a/Dropbox/Makefile.am
+++ b/Dropbox/Makefile.am
@@ -17,8 +17,9 @@ FILES = \
src/DropboxLinkAction.cs \
src/Dropbox.cs
+GENERATED_RESOURCES = \
+ Resources/Dropbox.addin.xml
RESOURCES = \
- Resources/Dropbox.addin.xml \
gtk-gui/gui.stetic \
Resources/icons/dropbox-add.png \
Resources/icons/dropbox-remove.png \
diff --git a/Dropbox/Makefile.in b/Dropbox/Makefile.in
index 1d7a326..6bb2929 100644
--- a/Dropbox/Makefile.in
+++ b/Dropbox/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = Dropbox
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -299,8 +377,10 @@ FILES = \
src/DropboxLinkAction.cs \
src/Dropbox.cs
+GENERATED_RESOURCES = \
+ Resources/Dropbox.addin.xml
+
RESOURCES = \
- Resources/Dropbox.addin.xml \
gtk-gui/gui.stetic \
Resources/icons/dropbox-add.png \
Resources/icons/dropbox-remove.png \
@@ -341,6 +421,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -352,8 +433,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -367,14 +451,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -424,10 +506,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -510,16 +597,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/Dropbox/Resources/Dropbox.addin.xml b/Dropbox/Resources/Dropbox.addin.xml
deleted file mode 100644
index dea8900..0000000
--- a/Dropbox/Resources/Dropbox.addin.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<Addin
- id="Dropbox"
- namespace="Do"
- version="1.0"
- name="Dropbox"
- description="Share and manage files in Dropbox."
- author="Stephen Elson"
- category="Community"
- defaultEnabled="false"
- url="http://do.davebsd.com/wiki/Dropbox_Plugin"
- >
-
- <Runtime>
- <Import assembly="Dropbox.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <Extension path="/Do/Action">
- <Action type="Dropbox.DropboxLinkAction" />
- <Action type="Dropbox.DropboxStopAction" />
- <Action type="Dropbox.DropboxStartAction" />
- <Action type="Dropbox.DropboxShareAction" />
- <Action type="Dropbox.DropboxUnshareAction" />
- <Action type="Dropbox.DropboxPuburlAction" />
- <Action type="Dropbox.DropboxRevisionsAction" />
- <Action type="Dropbox.DropboxWebInterfaceAction" />
- </Extension>
-
-</Addin>
diff --git a/Dropbox/src/Dropbox.cs b/Dropbox/src/Dropbox.cs
index 61d1748..ecf91e7 100644
--- a/Dropbox/src/Dropbox.cs
+++ b/Dropbox/src/Dropbox.cs
@@ -23,6 +23,8 @@ using System;
using System.IO;
using System.Diagnostics;
+using Mono.Addins;
+
using Do.Platform;
namespace Dropbox
@@ -41,8 +43,8 @@ namespace Dropbox
static Dropbox ()
{
BasePath = DropboxConfig.BasePath;
- PublicPath = Path.Combine (BasePath, "Public");
- DoSharedPath = Path.Combine (PublicPath, "Files Shared from GNOME Do");
+ PublicPath = Path.Combine (BasePath, AddinManager.CurrentLocalizer.GetString ("Public"));
+ DoSharedPath = Path.Combine (PublicPath, AddinManager.CurrentLocalizer.GetString ("Files Shared from GNOME Do"));
}
public static bool IsRunning {
diff --git a/EOG-Slideshow/Makefile.am b/EOG-Slideshow/Makefile.am
index 00c3586..47ebd07 100644
--- a/EOG-Slideshow/Makefile.am
+++ b/EOG-Slideshow/Makefile.am
@@ -5,7 +5,7 @@ ASSEMBLY=EOG-Slideshow
FILES = \
src/PlaySlideshowAction.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/EOG-Slideshow.addin.xml
REFERENCES = \
diff --git a/EOG-Slideshow/Makefile.in b/EOG-Slideshow/Makefile.in
index 524f7f1..adec3cc 100644
--- a/EOG-Slideshow/Makefile.in
+++ b/EOG-Slideshow/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = EOG-Slideshow
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -287,7 +365,7 @@ ASSEMBLY = EOG-Slideshow
FILES = \
src/PlaySlideshowAction.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/EOG-Slideshow.addin.xml
REFERENCES = \
@@ -320,6 +398,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -331,8 +410,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -346,14 +428,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -403,10 +483,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -489,16 +574,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/EOG-Slideshow/Resources/EOG-Slideshow.addin.xml b/EOG-Slideshow/Resources/EOG-Slideshow.addin.xml
deleted file mode 100644
index c9ae0ef..0000000
--- a/EOG-Slideshow/Resources/EOG-Slideshow.addin.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<Addin
- id="EyeOfGNOME"
- namespace="Do"
- version="1.0"
- name="Eye of GNOME Slideshow"
- description="Play slideshows in Eye of GNOME."
- author="David Siegel"
- category="Official"
- defaultEnabled="false"
- url="http://do.davebsd.com/wiki/EyeOfGNOME_Plugin"
->
-
- <Runtime>
- <Import assembly="EOG-Slideshow.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <Extension path="/Do/Action">
- <Action type="EOG.PlaySlideshowAction" />
- </Extension>
-
-</Addin>
diff --git a/Emesene/Makefile.am b/Emesene/Makefile.am
index 142e5bf..9689552 100644
--- a/Emesene/Makefile.am
+++ b/Emesene/Makefile.am
@@ -18,8 +18,9 @@ FILES = \
src/EmeseneChatAction.cs
+GENERATED_RESOURCES = \
+ Resources/Emesene.addin.xml
RESOURCES = \
- Resources/Emesene.addin.xml \
Resources/statusIcons/away.png \
Resources/statusIcons/busy.png \
Resources/statusIcons/invisible.png \
@@ -30,12 +31,14 @@ RESOURCES = \
Resources/statusIcons/lunch.png \
Resources/statusIcons/online.png
+BUILD_DEFINES=$(DBUS_BUILD_DEFINES)
+
REFERENCES = \
System \
System.Core \
System.Xml \
- $(NDESK_DBUS_10_LIBS) \
- $(NDESK_DBUS_GLIB_LIBS) \
+ $(DBUS_SHARP_LIBS) \
+ $(DBUS_SHARP_GLIB_LIBS) \
$(DO_UNIVERSE_LIBS) \
$(DO_PLATFORM_LIBS)
diff --git a/Emesene/Makefile.in b/Emesene/Makefile.in
index f86a167..fea8f60 100644
--- a/Emesene/Makefile.in
+++ b/Emesene/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = Emesene
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -299,8 +377,10 @@ FILES = \
src/EmeseneStatusItemSource.cs \
src/EmeseneChatAction.cs
+GENERATED_RESOURCES = \
+ Resources/Emesene.addin.xml
+
RESOURCES = \
- Resources/Emesene.addin.xml \
Resources/statusIcons/away.png \
Resources/statusIcons/busy.png \
Resources/statusIcons/invisible.png \
@@ -311,12 +391,13 @@ RESOURCES = \
Resources/statusIcons/lunch.png \
Resources/statusIcons/online.png
+BUILD_DEFINES = $(DBUS_BUILD_DEFINES)
REFERENCES = \
System \
System.Core \
System.Xml \
- $(NDESK_DBUS_10_LIBS) \
- $(NDESK_DBUS_GLIB_LIBS) \
+ $(DBUS_SHARP_LIBS) \
+ $(DBUS_SHARP_GLIB_LIBS) \
$(DO_UNIVERSE_LIBS) \
$(DO_PLATFORM_LIBS)
@@ -344,6 +425,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -355,8 +437,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -370,14 +455,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -427,10 +510,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -513,16 +601,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/Emesene/Resources/Emesene.addin.xml b/Emesene/Resources/Emesene.addin.xml
deleted file mode 100644
index df1a985..0000000
--- a/Emesene/Resources/Emesene.addin.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<Addin
- id="Emesene"
- namespace="Do"
- version="1.1"
- name="Emesene"
- description="Search your buddies and initiate chats."
- author="Luis Miguel Montiel G"
- category="Community"
- defaultEnabled="false"
- url="http://do.davebsd.com/wiki/Emesene_Plugin"
->
-
- <Runtime>
- <Import assembly="Emesene.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <!-- Extensions included in this assembly -->
- <!-- Sources -->
- <Extension path="/Do/ItemSource">
- <ItemSource type="Emesene.EmeseneContactItemSource" />
- <ItemSource type="Emesene.EmeseneStatusItemSource" />
- <ItemSource type="Emesene.EmeseneAvatarItemSource" />
- </Extension>
-
- <!--- Actions -->
- <Extension path= "/Do/Action">
- <Action type="Emesene.EmeseneChatAction" />
- <Action type="Emesene.EmeseneChangeNickAction" />
- <Action type="Emesene.EmeseneChangeAvatarAction" />
- <Action type="Emesene.EmeseneChangePSMAction" />
- <Action type="Emesene.EmeseneChangeStatusAction" />
- <Action type="Emesene.EmeseneOpenConversationHistoryAction" />
- <Action type="Emesene.EmeseneOpenAvatarHistoryAction" />
- </Extension>
-
-</Addin>
diff --git a/Emesene/src/Emesene.cs b/Emesene/src/Emesene.cs
index 6f6e21a..a08cfed 100644
--- a/Emesene/src/Emesene.cs
+++ b/Emesene/src/Emesene.cs
@@ -19,7 +19,11 @@
*/
using System;
+#if USE_DBUS_SHARP
+using DBus;
+#else
using NDesk.DBus;
+#endif
using org.freedesktop.DBus;
using System.Collections.Generic;
using Do.Universe;
diff --git a/Emesene/src/EmeseneChatAction.cs b/Emesene/src/EmeseneChatAction.cs
index f4ce465..809b209 100644
--- a/Emesene/src/EmeseneChatAction.cs
+++ b/Emesene/src/EmeseneChatAction.cs
@@ -23,7 +23,11 @@ using System.Linq;
using System.Collections.Generic;
using System.Threading;
using Do.Universe;
+#if USE_DBUS_SHARP
+using DBus;
+#else
using NDesk.DBus;
+#endif
using org.freedesktop.DBus;
namespace Emesene
diff --git a/Empathy/Makefile.am b/Empathy/Makefile.am
index 0ba145d..7492594 100644
--- a/Empathy/Makefile.am
+++ b/Empathy/Makefile.am
@@ -23,9 +23,11 @@ FILES = \
src/EmpathyStatusItem.cs \
src/Status.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/Empathy.addin.xml
+BUILD_DEFINES=$(DBUS_BUILD_DEFINES)
+
REFERENCES = \
$(DBUS_SHARP_LIBS) \
$(DBUS_SHARP_GLIB_LIBS) \
diff --git a/Empathy/Makefile.in b/Empathy/Makefile.in
index e8c90bc..e3203fb 100644
--- a/Empathy/Makefile.in
+++ b/Empathy/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE@@HAVE_EMPATHY_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE@@HAVE_EMPATHY_TRUE at am__append_2 = -debug -d:DEBUG
subdir = Empathy
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
@HAVE_EMPATHY_TRUE at TARGET = library
@HAVE_EMPATHY_TRUE at SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
@HAVE_EMPATHY_TRUE at RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
- at HAVE_EMPATHY_TRUE@RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+ at HAVE_EMPATHY_TRUE@GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+ at HAVE_EMPATHY_TRUE@RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
@HAVE_EMPATHY_TRUE@ -resource:$(resource),$(notdir $(resource)))
@HAVE_EMPATHY_TRUE at BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ top_srcdir = @top_srcdir@
# Install plugins as data; there's no need for them to be excutable
@HAVE_EMPATHY_TRUE at plugindir = ${libdir}/gnome-do/plugins
- at HAVE_EMPATHY_TRUE@plugin_DATA = $(OUTPUT_FILES)
+ at HAVE_EMPATHY_TRUE@plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ top_srcdir = @top_srcdir@
# Clean and dist targets
#
@HAVE_EMPATHY_TRUE at EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- at HAVE_EMPATHY_TRUE@ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ at HAVE_EMPATHY_TRUE@ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ at HAVE_EMPATHY_TRUE@ $(DLL_CONFIG_FILES)
@HAVE_EMPATHY_TRUE at CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
@HAVE_EMPATHY_TRUE at DISTCLEANFILES = *.pidb
@@ -303,9 +381,10 @@ FILES = \
src/EmpathyStatusItem.cs \
src/Status.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/Empathy.addin.xml
+BUILD_DEFINES = $(DBUS_BUILD_DEFINES)
REFERENCES = \
$(DBUS_SHARP_LIBS) \
$(DBUS_SHARP_GLIB_LIBS) \
@@ -341,6 +420,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -352,8 +432,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -367,14 +450,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -424,10 +505,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -510,16 +596,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
@HAVE_EMPATHY_TRUE at all: $(OUTPUT_FILES)
diff --git a/Empathy/Resources/Empathy.addin.xml b/Empathy/Resources/Empathy.addin.xml
deleted file mode 100644
index ded59b3..0000000
--- a/Empathy/Resources/Empathy.addin.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<Addin
- id="Empathy"
- namespace="Do"
- version="0.1"
- name="Empathy"
- description="Search contacts and initiate chats in Empathy."
- author="Xavier Calland"
- category="Community"
- defaultEnabled="false"
- url="http://do.davebsd.com/wiki/Empathy_Plugin"
->
-
- <Runtime>
- <Import assembly="Empathy.dll"/>
- <Import assembly="telepathy-sharp.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <Extension path="/Do/ItemSource">
- <ItemSource type="EmpathyPlugin.EmpathyContactItemSource" />
- <ItemSource type="EmpathyPlugin.EmpathyAccountItemSource" />
- <ItemSource type="EmpathyPlugin.EmpathySavedStatusItemSource" />
- </Extension>
-
- <Extension path= "/Do/Action">
- <Action type="EmpathyPlugin.EmpathyChatAction" />
- <Action type="EmpathyPlugin.EmpathySetStatusAction" />
- <Action type="EmpathyPlugin.EmpathyEnableAccount" />
- <Action type="EmpathyPlugin.EmpathyDisableAccount" />
- </Extension>
-
-</Addin>
diff --git a/Epiphany/Makefile.am b/Epiphany/Makefile.am
index 2a81cef..d8d7975 100644
--- a/Epiphany/Makefile.am
+++ b/Epiphany/Makefile.am
@@ -6,7 +6,7 @@ FILES = \
src/EpiphanyBookmarkItemSource.cs \
src/EpiphanyBrowseBookmarksItem.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/Epiphany.addin.xml
REFERENCES = \
diff --git a/Epiphany/Makefile.in b/Epiphany/Makefile.in
index 0f31974..273f232 100644
--- a/Epiphany/Makefile.in
+++ b/Epiphany/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = Epiphany
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -288,7 +366,7 @@ FILES = \
src/EpiphanyBookmarkItemSource.cs \
src/EpiphanyBrowseBookmarksItem.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/Epiphany.addin.xml
REFERENCES = \
@@ -322,6 +400,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -333,8 +412,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -348,14 +430,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -405,10 +485,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -491,16 +576,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/Epiphany/Resources/Epiphany.addin.xml b/Epiphany/Resources/Epiphany.addin.xml
deleted file mode 100644
index f76fd17..0000000
--- a/Epiphany/Resources/Epiphany.addin.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<Addin
- id="Epiphany"
- namespace="Do"
- version="1.0"
- name="Epiphany"
- description="Search your Epiphany bookmarks."
- author="David Siegel"
- category="Official"
- defaultEnabled="false"
- url="http://do.davebsd.com/wiki/Epiphany_Plugin"
->
-
- <Runtime>
- <Import assembly="Epiphany.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <Extension path="/Do/ItemSource">
- <ItemSource type="Epiphany.EpiphanyBookmarkItemSource" />
- </Extension>
-</Addin>
diff --git a/Exaile/Makefile.am b/Exaile/Makefile.am
index 42dc171..281cf8a 100644
--- a/Exaile/Makefile.am
+++ b/Exaile/Makefile.am
@@ -14,7 +14,7 @@ FILES = \
src/PreviousAction.cs \
src/PlayItemAction.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/Exaile.addin.xml
REFERENCES = \
diff --git a/Exaile/Makefile.in b/Exaile/Makefile.in
index 700277f..a0b6862 100644
--- a/Exaile/Makefile.in
+++ b/Exaile/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = Exaile
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -296,7 +374,7 @@ FILES = \
src/PreviousAction.cs \
src/PlayItemAction.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/Exaile.addin.xml
REFERENCES = \
@@ -333,6 +411,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -344,8 +423,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -359,14 +441,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -416,10 +496,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -502,16 +587,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/Exaile/Resources/Exaile.addin.xml b/Exaile/Resources/Exaile.addin.xml
deleted file mode 100644
index b277c68..0000000
--- a/Exaile/Resources/Exaile.addin.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<Addin
- id="Exaile"
- namespace="Do"
- version="0.1"
- name="Exaile"
- description="Search and play music in Exaile."
- author="Graham Whelan"
- category="Community"
- defaultEnabled="false"
- >
-
- <Runtime>
- <Import assembly="Exaile.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <Extension path = "/Do/ItemSource">
- <ItemSource type="Exaile.MusicItemSource" />
- </Extension>
- <Extension path= "/Do/Action">
- <Action type="Exaile.PlayAction" />
- <Action type="Exaile.PlayItemAction" />
- <Action type="Exaile.PauseAction" />
- <Action type="Exaile.NextAction" />
- <Action type="Exaile.PreviousAction" />
- </Extension>
-</Addin>
diff --git a/File/Makefile.am b/File/Makefile.am
index 2b1f338..4c89b96 100644
--- a/File/Makefile.am
+++ b/File/Makefile.am
@@ -28,7 +28,8 @@ FILES = \
RESOURCES = \
gtk-gui/gui.stetic \
- gtk-gui/objects.xml \
+ gtk-gui/objects.xml
+GENERATED_RESOURCES = \
Resources/File.addin.xml
REFERENCES = \
diff --git a/File/Makefile.in b/File/Makefile.in
index 7e1fd66..4973542 100644
--- a/File/Makefile.in
+++ b/File/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = File
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -310,7 +388,9 @@ FILES = \
RESOURCES = \
gtk-gui/gui.stetic \
- gtk-gui/objects.xml \
+ gtk-gui/objects.xml
+
+GENERATED_RESOURCES = \
Resources/File.addin.xml
REFERENCES = \
@@ -344,6 +424,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -355,8 +436,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -370,14 +454,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -427,10 +509,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -513,16 +600,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/File/Resources/File.addin.xml b/File/Resources/File.addin.xml
deleted file mode 100644
index 4115b34..0000000
--- a/File/Resources/File.addin.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<Addin
- id="File"
- namespace="Do"
- version="2.5"
- name="Files and Folders"
- description="Search, browse, and perform other actions on files and folders."
- author="David Siegel, Alex Launi, Ankit Solanki, Chris Szikszoy"
- category="Official"
- defaultEnabled="false"
- url="http://do.davebsd.com/wiki/File_Plugin"
- >
-
- <Runtime>
- <Import assembly="File.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <Extension path="/Do/ItemSource">
- <ItemSource type="Do.FilesAndFolders.FileItemSource" />
- <ItemSource type="Do.FilesAndFolders.RecentFileItemSource" />
- </Extension>
-
- <Extension path="/Do/Action">
- <Action type="Do.FilesAndFolders.NewFileAction" />
- <Action type="Do.FilesAndFolders.NewFolderAction" />
- <Action type="Do.FilesAndFolders.CopyAction" />
- <Action type="Do.FilesAndFolders.MoveAction" />
- <Action type="Do.FilesAndFolders.RenameAction" />
- <Action type="Do.FilesAndFolders.MoveToTrashAction" />
- </Extension>
-</Addin>
diff --git a/Firefox/Makefile.am b/Firefox/Makefile.am
index e30e920..c7545cf 100644
--- a/Firefox/Makefile.am
+++ b/Firefox/Makefile.am
@@ -10,7 +10,7 @@ FILES = \
src/PlaceItem.cs \
src/PlacesItemSource.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/Firefox.addin.xml
REFERENCES = \
diff --git a/Firefox/Makefile.in b/Firefox/Makefile.in
index a497e4e..ba478aa 100644
--- a/Firefox/Makefile.in
+++ b/Firefox/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = Firefox
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -292,7 +370,7 @@ FILES = \
src/PlaceItem.cs \
src/PlacesItemSource.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/Firefox.addin.xml
REFERENCES = \
@@ -328,6 +406,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -339,8 +418,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -354,14 +436,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -411,10 +491,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -497,16 +582,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/Firefox/Resources/Firefox.addin.xml b/Firefox/Resources/Firefox.addin.xml
deleted file mode 100644
index 6143f0c..0000000
--- a/Firefox/Resources/Firefox.addin.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<Addin
- id="Firefox"
- namespace="Do"
- version="3.0"
- name="Firefox"
- description="Search Firefox 3 bookmarks, bookmark directories, and history."
- author="David Siegel, Neal Stewart, Alex Launi"
- category="Official"
- defaultEnabled="false"
- url="http://do.davebsd.com/wiki/Firefox_Plugin"
- >
-
- <Runtime>
- <Import assembly="Firefox.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <Extension path="/Do/ItemSource">
- <ItemSource type="Firefox.PlacesItemSource" />
- </Extension>
-</Addin>
diff --git a/Flickr/Makefile.am b/Flickr/Makefile.am
index bad32b8..79b7e33 100644
--- a/Flickr/Makefile.am
+++ b/Flickr/Makefile.am
@@ -16,8 +16,9 @@ FILES = \
src/UploadDialog.cs \
src/UploadConfig.cs
+GENERATED_RESOURCES = \
+ Resources/Flickr.addin.xml
RESOURCES = \
- Resources/Flickr.addin.xml \
gtk-gui/gui.stetic \
gtk-gui/objects.xml \
Resources/icons/flickr.png
diff --git a/Flickr/Makefile.in b/Flickr/Makefile.in
index aa424f2..75c3c77 100644
--- a/Flickr/Makefile.in
+++ b/Flickr/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE@@HAVE_FLICKR_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE@@HAVE_FLICKR_TRUE at am__append_2 = -debug -d:DEBUG
subdir = Flickr
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
@HAVE_FLICKR_TRUE at TARGET = library
@HAVE_FLICKR_TRUE at SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
@HAVE_FLICKR_TRUE at RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
- at HAVE_FLICKR_TRUE@RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+ at HAVE_FLICKR_TRUE@GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+ at HAVE_FLICKR_TRUE@RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
@HAVE_FLICKR_TRUE@ -resource:$(resource),$(notdir $(resource)))
@HAVE_FLICKR_TRUE at BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ top_srcdir = @top_srcdir@
# Install plugins as data; there's no need for them to be excutable
@HAVE_FLICKR_TRUE at plugindir = ${libdir}/gnome-do/plugins
- at HAVE_FLICKR_TRUE@plugin_DATA = $(OUTPUT_FILES)
+ at HAVE_FLICKR_TRUE@plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ top_srcdir = @top_srcdir@
# Clean and dist targets
#
@HAVE_FLICKR_TRUE at EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- at HAVE_FLICKR_TRUE@ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ at HAVE_FLICKR_TRUE@ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ at HAVE_FLICKR_TRUE@ $(DLL_CONFIG_FILES)
@HAVE_FLICKR_TRUE at CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
@HAVE_FLICKR_TRUE at DISTCLEANFILES = *.pidb
@@ -296,8 +374,10 @@ FILES = \
src/UploadDialog.cs \
src/UploadConfig.cs
+GENERATED_RESOURCES = \
+ Resources/Flickr.addin.xml
+
RESOURCES = \
- Resources/Flickr.addin.xml \
gtk-gui/gui.stetic \
gtk-gui/objects.xml \
Resources/icons/flickr.png
@@ -334,6 +414,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -345,8 +426,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -360,14 +444,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -417,10 +499,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -503,16 +590,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
@HAVE_FLICKR_TRUE at all: $(OUTPUT_FILES)
diff --git a/Flickr/Resources/Flickr.addin.xml b/Flickr/Resources/Flickr.addin.xml
deleted file mode 100644
index a682230..0000000
--- a/Flickr/Resources/Flickr.addin.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<Addin
- id="Flickr"
- namespace="Do"
- version="1.4"
- name="Flickr"
- description="Upload photos to Flickr."
- author="Alex Launi"
- category="Community"
- defaultEnabled="false"
- url="http://do.davebsd.com/wiki/Flickr_Plugin"
->
-
- <Runtime>
- <Import assembly="Flickr.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <Extension path= "/Do/Action">
- <Action type="Flickr.UploadAction"/>
- </Extension>
- <Extension path = "/Do/ItemSource">
- <ItemSource type="Flickr.FlickrItemSource" />
- </Extension>
-</Addin>
diff --git a/GNOME-Calculator/Makefile.am b/GNOME-Calculator/Makefile.am
index 78bf880..4fa80ce 100644
--- a/GNOME-Calculator/Makefile.am
+++ b/GNOME-Calculator/Makefile.am
@@ -5,7 +5,7 @@ ASSEMBLY=GNOME-Calculator
FILES = \
src/GCalcToolAction.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/GNOME-Calculator.addin.xml
REFERENCES = \
diff --git a/GNOME-Calculator/Makefile.in b/GNOME-Calculator/Makefile.in
index 223f12c..a276308 100644
--- a/GNOME-Calculator/Makefile.in
+++ b/GNOME-Calculator/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = GNOME-Calculator
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -287,7 +365,7 @@ ASSEMBLY = GNOME-Calculator
FILES = \
src/GCalcToolAction.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/GNOME-Calculator.addin.xml
REFERENCES = \
@@ -320,6 +398,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -331,8 +410,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -346,14 +428,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -403,10 +483,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -489,16 +574,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/GNOME-Calculator/Resources/GNOME-Calculator.addin.xml b/GNOME-Calculator/Resources/GNOME-Calculator.addin.xml
deleted file mode 100644
index 35d7282..0000000
--- a/GNOME-Calculator/Resources/GNOME-Calculator.addin.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<Addin
- id="GNOME-Calculator"
- namespace="Do"
- version="0.1"
- name="GNOME Calculator"
- description="Add, subtract, multiply, and more."
- author="Marco Antonio Villegas Vega"
- category="Community"
- defaultEnabled="false"
- url="http://do.davebsd.com/wiki/GNOME_Calculator_Plugin"
->
-
- <Runtime>
- <Import assembly="GNOME-Calculator.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <Extension path= "/Do/Action">
- <Action type="GnomeCalculator.Calculate" />
- </Extension>
-</Addin>
diff --git a/GNOME-Dictionary/Makefile.am b/GNOME-Dictionary/Makefile.am
index bfe6f79..957517f 100644
--- a/GNOME-Dictionary/Makefile.am
+++ b/GNOME-Dictionary/Makefile.am
@@ -5,7 +5,7 @@ ASSEMBLY=GNOME-Dictionary
FILES = \
src/DefineAction.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/GNOME-Dictionary.addin.xml
REFERENCES = \
diff --git a/GNOME-Dictionary/Makefile.in b/GNOME-Dictionary/Makefile.in
index b14f72d..e3e5889 100644
--- a/GNOME-Dictionary/Makefile.in
+++ b/GNOME-Dictionary/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = GNOME-Dictionary
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -287,7 +365,7 @@ ASSEMBLY = GNOME-Dictionary
FILES = \
src/DefineAction.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/GNOME-Dictionary.addin.xml
REFERENCES = \
@@ -321,6 +399,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -332,8 +411,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -347,14 +429,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -404,10 +484,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -490,16 +575,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/GNOME-Dictionary/Resources/GNOME-Dictionary.addin.xml b/GNOME-Dictionary/Resources/GNOME-Dictionary.addin.xml
deleted file mode 100644
index ff6e31e..0000000
--- a/GNOME-Dictionary/Resources/GNOME-Dictionary.addin.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<Addin
- id="GNOMEDictionary"
- namespace="Do"
- version="1.0"
- name="GNOME Dictionary"
- description="Look up word definitions in GNOME Dictionary."
- author="David Siegel"
- category="Official"
- defaultEnabled="false"
- url="http://do.davebsd.com/wiki/GNOME_Dictionary_Plugin"
->
-
- <Runtime>
- <Import assembly="GNOME-Dictionary.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <Extension path = "/Do/Action">
- <Action type="GNOME.DefineAction" />
- </Extension>
-</Addin>
diff --git a/GNOME-Screenshot/Makefile.am b/GNOME-Screenshot/Makefile.am
index 368dcbd..aae3db0 100644
--- a/GNOME-Screenshot/Makefile.am
+++ b/GNOME-Screenshot/Makefile.am
@@ -10,7 +10,7 @@ FILES = \
src/TakeScreenshotAction.cs \
src/WholeScreenScreenshotItem.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/GNOME-Screenshot.addin.xml
REFERENCES = \
diff --git a/GNOME-Screenshot/Makefile.in b/GNOME-Screenshot/Makefile.in
index 9baae13..6b506a7 100644
--- a/GNOME-Screenshot/Makefile.in
+++ b/GNOME-Screenshot/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = GNOME-Screenshot
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -292,7 +370,7 @@ FILES = \
src/TakeScreenshotAction.cs \
src/WholeScreenScreenshotItem.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/GNOME-Screenshot.addin.xml
REFERENCES = \
@@ -325,6 +403,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -336,8 +415,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -351,14 +433,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -408,10 +488,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -494,16 +579,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/GNOME-Screenshot/Resources/GNOME-Screenshot.addin.xml b/GNOME-Screenshot/Resources/GNOME-Screenshot.addin.xml
deleted file mode 100644
index 1bf301d..0000000
--- a/GNOME-Screenshot/Resources/GNOME-Screenshot.addin.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<Addin
- id="GNOMEScreenshot"
- namespace="Do"
- version="1.0"
- name="GNOME Screenshot"
- description="Take screenshots with optional delay."
- author="David Siegel"
- category="Official"
- defaultEnabled="false"
- url="http://do.davebsd.com/wiki/GNOME_Screenshot_Plugin"
->
-
- <Runtime>
- <Import assembly="GNOME-Screenshot.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <Extension path = "/Do/ItemSource">
- <ItemSource type="GNOME.ScreenshotItemSource" />
- </Extension>
- <Extension path = "/Do/Action">
- <Action type="GNOME.TakeScreenshotAction" />
- </Extension>
-</Addin>
diff --git a/GNOME-Session/Makefile.am b/GNOME-Session/Makefile.am
index 0943f8e..7c328ad 100644
--- a/GNOME-Session/Makefile.am
+++ b/GNOME-Session/Makefile.am
@@ -9,13 +9,15 @@ FILES = \
src/SessionCommandsItemSource.cs \
src/SystemManagement.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/GNOME-Session.addin.xml
+BUILD_DEFINES=$(DBUS_BUILD_DEFINES)
+
REFERENCES = \
System \
System.Core \
- $(NDESK_DBUS_10_LIBS) \
- $(NDESK_DBUS_GLIB_10_LIBS) \
+ $(DBUS_SHARP_LIBS) \
+ $(DBUS_SHARP_GLIB_LIBS) \
$(DO_PLATFORM_LIBS) \
$(DO_UNIVERSE_LIBS)
diff --git a/GNOME-Session/Makefile.in b/GNOME-Session/Makefile.in
index 077b7cb..97defc5 100644
--- a/GNOME-Session/Makefile.in
+++ b/GNOME-Session/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = GNOME-Session
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -291,14 +369,15 @@ FILES = \
src/SessionCommandsItemSource.cs \
src/SystemManagement.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/GNOME-Session.addin.xml
+BUILD_DEFINES = $(DBUS_BUILD_DEFINES)
REFERENCES = \
System \
System.Core \
- $(NDESK_DBUS_10_LIBS) \
- $(NDESK_DBUS_GLIB_10_LIBS) \
+ $(DBUS_SHARP_LIBS) \
+ $(DBUS_SHARP_GLIB_LIBS) \
$(DO_PLATFORM_LIBS) \
$(DO_UNIVERSE_LIBS)
@@ -326,6 +405,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -337,8 +417,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -352,14 +435,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -409,10 +490,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -495,16 +581,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/GNOME-Session/Resources/GNOME-Session.addin.xml b/GNOME-Session/Resources/GNOME-Session.addin.xml
deleted file mode 100644
index 8b77af0..0000000
--- a/GNOME-Session/Resources/GNOME-Session.addin.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<Addin
- id="GNOMESession"
- namespace="Do"
- version="1.7"
- name="GNOME Session Management"
- description="Log out, lock your screen, shutdown, suspend, etc."
- author="David Siegel"
- category="Official"
- defaultEnabled="false"
- url="http://do.davebsd.com/wiki/GNOME_Session_Plugin"
->
-
- <Runtime>
- <Import assembly="GNOME-Session.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <Extension path = "/Do/ItemSource">
- <ItemSource type="GNOME.SessionCommandsItemSource" />
- </Extension>
-</Addin>
diff --git a/GNOME-Session/src/PowerManagement.cs b/GNOME-Session/src/PowerManagement.cs
index 5105151..867a50e 100644
--- a/GNOME-Session/src/PowerManagement.cs
+++ b/GNOME-Session/src/PowerManagement.cs
@@ -20,7 +20,12 @@
using System;
using System.Diagnostics;
+#if USE_DBUS_SHARP
+using DBus;
+#else
using NDesk.DBus;
+#endif
+
using org.freedesktop.DBus;
using Do.Platform;
@@ -30,6 +35,13 @@ namespace GNOME
class PowerManagement
{
+ [Interface ("org.freedesktop.login1.Manager")]
+ interface ILogind
+ {
+ void Hibernate (bool interactive);
+ void Suspend (bool interactive);
+ }
+
[Interface (DeviceKitPowerName)]
interface IDeviceKitPower
{
@@ -50,7 +62,9 @@ namespace GNOME
void Hibernate ();
void Suspend ();
}
-
+
+ const string LogindName = "org.freedesktop.login1";
+ const string LogindPath = "/org/freedesktop/login1";
const string UPowerName = "org.freedesktop.UPower";
const string UPowerPath = "/org/freedesktop/UPower";
const string DeviceKitPowerName = "org.freedesktop.DeviceKit.Power";
@@ -68,11 +82,12 @@ namespace GNOME
}
}
- static object BusInstance
- {
+ static object BusInstance {
get {
try {
- if (Bus.System.NameHasOwner (UPowerName)) {
+ if (Bus.System.NameHasOwner (LogindName)) {
+ return Bus.System.GetObject<ILogind> (LogindName, new ObjectPath (LogindPath));
+ } else if (Bus.System.NameHasOwner (UPowerName)) {
return Bus.System.GetObject<IUPower> (UPowerName, new ObjectPath (UPowerPath));
} else if (Bus.System.NameHasOwner (DeviceKitPowerName)) {
return Bus.System.GetObject<IDeviceKitPower> (DeviceKitPowerName, new ObjectPath (DeviceKitPowerPath));
@@ -92,7 +107,10 @@ namespace GNOME
{
try {
object instance = BusInstance;
- if (instance is IUPower) {
+ if (instance is ILogind) {
+ ScreenSaver.Lock ();
+ (instance as ILogind).Hibernate (true);
+ } else if (instance is IUPower) {
ScreenSaver.Lock ();
(instance as IUPower).Hibernate ();
} else if (instance is IDeviceKitPower) {
@@ -111,7 +129,10 @@ namespace GNOME
{
try {
object instance = BusInstance;
- if (instance is IUPower) {
+ if (instance is ILogind) {
+ ScreenSaver.Lock ();
+ (instance as ILogind).Suspend (true);
+ } else if (instance is IUPower) {
ScreenSaver.Lock ();
(instance as IUPower).Suspend ();
} else if (instance is IDeviceKitPower) {
@@ -129,7 +150,7 @@ namespace GNOME
public static void Logout ()
{
try {
- Process.Start ("gnome-session-save", "--kill --silent");
+ Process.Start ("gnome-session-quit", "--logout --no-prompt");
} catch (Exception e) {
Log<PowerManagement>.Error ("Could not logout: {0}", e.Message);
Log<PowerManagement>.Debug (e.StackTrace);
diff --git a/GNOME-Session/src/ScreenSaver.cs b/GNOME-Session/src/ScreenSaver.cs
index e01cb0c..7d22d71 100644
--- a/GNOME-Session/src/ScreenSaver.cs
+++ b/GNOME-Session/src/ScreenSaver.cs
@@ -21,7 +21,12 @@
using System;
using System.Diagnostics;
+#if USE_DBUS_SHARP
+using DBus;
+#else
using NDesk.DBus;
+#endif
+
using org.freedesktop.DBus;
using Do.Platform;
diff --git a/GNOME-Session/src/SessionCommandsItemSource.cs b/GNOME-Session/src/SessionCommandsItemSource.cs
index 3df09e8..7fb1c55 100644
--- a/GNOME-Session/src/SessionCommandsItemSource.cs
+++ b/GNOME-Session/src/SessionCommandsItemSource.cs
@@ -53,31 +53,31 @@ namespace GNOME
yield return new SessionCommandItem (
AddinManager.CurrentLocalizer.GetString ("Log Out"),
AddinManager.CurrentLocalizer.GetString ("Close your session and return to the login screen."),
- "gnome-session-logout",
+ "system-log-out",
PowerManagement.Logout);
yield return new SessionCommandItem (
AddinManager.CurrentLocalizer.GetString ("Shutdown"),
AddinManager.CurrentLocalizer.GetString ("Turn your computer off."),
- "gnome-session-halt",
+ "system-shutdown",
SystemManagement.Shutdown);
yield return new SessionCommandItem (
AddinManager.CurrentLocalizer.GetString ("Hibernate"),
AddinManager.CurrentLocalizer.GetString ("Put your computer into hibernation mode."),
- "gnome-session-hibernate",
+ "system-shutdown",
PowerManagement.Hibernate);
yield return new SessionCommandItem (
AddinManager.CurrentLocalizer.GetString ("Suspend"),
AddinManager.CurrentLocalizer.GetString ("Put your computer into suspend mode."),
- "gnome-session-suspend",
+ "system-shutdown",
PowerManagement.Suspend);
yield return new SessionCommandItem (
AddinManager.CurrentLocalizer.GetString ("Restart"),
AddinManager.CurrentLocalizer.GetString ("Restart your computer."),
- "gnome-session-reboot",
+ "system-shutdown",
SystemManagement.Restart);
yield return new SessionCommandItem (
diff --git a/GNOME-Session/src/SystemManagement.cs b/GNOME-Session/src/SystemManagement.cs
index 4ebadec..4c88bbe 100644
--- a/GNOME-Session/src/SystemManagement.cs
+++ b/GNOME-Session/src/SystemManagement.cs
@@ -20,7 +20,12 @@
using System;
using System.Diagnostics;
+#if USE_DBUS_SHARP
+using DBus;
+#else
using NDesk.DBus;
+#endif
+
using org.freedesktop.DBus;
using Do.Platform;
@@ -30,25 +35,48 @@ namespace GNOME
class SystemManagement
{
+ [Interface ("org.freedesktop.login1.Manager")]
+ interface ILogind
+ {
+ void PowerOff (bool interactive);
+ void Reboot (bool interactive);
+ }
+
[Interface ("org.freedesktop.ConsoleKit.Manager")]
- interface ISystemManagementProxy
+ interface IConsoleKit
{
void Stop ();
void Restart ();
}
- const string BusName = "org.freedesktop.ConsoleKit";
- const string ObjectPath = "/org/freedesktop/ConsoleKit/Manager";
+ const string LogindName = "org.freedesktop.login1";
+ const string LogindPath = "/org/freedesktop/login1";
+ const string ConsoleKitName = "org.freedesktop.ConsoleKit";
+ const string ConsoleKitPath = "/org/freedesktop/ConsoleKit/Manager";
- static ISystemManagementProxy BusInstance
+ static SystemManagement ()
{
+ try {
+ BusG.Init ();
+ } catch (Exception e) {
+ Log<SystemManagement>.Error ("Could not initialize the bus: {0}", e.Message);
+ Log<SystemManagement>.Debug (e.StackTrace);
+ }
+ }
+
+ static object BusInstance {
get {
try {
- return Bus.System.GetObject<ISystemManagementProxy> (BusName, new ObjectPath (ObjectPath));
+ if (Bus.System.NameHasOwner (LogindName)) {
+ return Bus.System.GetObject<ILogind> (LogindName, new ObjectPath (LogindPath));
+ } else if (Bus.System.NameHasOwner (ConsoleKitName)) {
+ return Bus.System.GetObject<IConsoleKit> (ConsoleKitName, new ObjectPath (ConsoleKitPath));
+ }
} catch (Exception e) {
- Log<SystemManagement>.Error ("Could not get ConsoleKit bus object: {0}", e.Message);
+ Log<SystemManagement>.Error ("Could not get SystemManagement bus object: {0}", e.Message);
Log<SystemManagement>.Debug (e.StackTrace);
}
+
return null;
}
}
@@ -56,7 +84,12 @@ namespace GNOME
public static void Shutdown ()
{
try {
- BusInstance.Stop ();
+ object instance = BusInstance;
+ if (instance is ILogind) {
+ (instance as ILogind).PowerOff (true);
+ } else if (instance is IConsoleKit) {
+ (instance as IConsoleKit).Stop ();
+ }
} catch (Exception e) {
Log<SystemManagement>.Error ("Could not shutdown: {0}", e.Message);
Log<SystemManagement>.Debug (e.StackTrace);
@@ -66,7 +99,12 @@ namespace GNOME
public static void Restart ()
{
try {
- BusInstance.Restart ();
+ object instance = BusInstance;
+ if (instance is ILogind) {
+ (instance as ILogind).Reboot (true);
+ } else if (instance is IConsoleKit) {
+ (instance as IConsoleKit).Restart ();
+ }
} catch (Exception e) {
Log<SystemManagement>.Error ("Could not reboot: {0}", e.Message);
Log<SystemManagement>.Debug (e.StackTrace);
diff --git a/GNOME-Terminal/Makefile.am b/GNOME-Terminal/Makefile.am
index 52117d9..a1839af 100644
--- a/GNOME-Terminal/Makefile.am
+++ b/GNOME-Terminal/Makefile.am
@@ -8,7 +8,7 @@ FILES = \
src/ProfileItemSource.cs \
src/RunInTerminalAction.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/GNOME-Terminal.addin.xml
REFERENCES = \
diff --git a/GNOME-Terminal/Makefile.in b/GNOME-Terminal/Makefile.in
index 56bcfff..659268f 100644
--- a/GNOME-Terminal/Makefile.in
+++ b/GNOME-Terminal/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = GNOME-Terminal
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -290,7 +368,7 @@ FILES = \
src/ProfileItemSource.cs \
src/RunInTerminalAction.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/GNOME-Terminal.addin.xml
REFERENCES = \
@@ -325,6 +403,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -336,8 +415,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -351,14 +433,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -408,10 +488,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -494,16 +579,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/GNOME-Terminal/Resources/GNOME-Terminal.addin.xml b/GNOME-Terminal/Resources/GNOME-Terminal.addin.xml
deleted file mode 100644
index d7c942d..0000000
--- a/GNOME-Terminal/Resources/GNOME-Terminal.addin.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<Addin
- id="GNOMETerminal"
- namespace="Do"
- version="1.1"
- name="GNOME Terminal"
- description="Run commands and open new terminals."
- author="David Siegel, Tim McLaughlin"
- category="Official"
- defaultEnabled="false"
- url="http://do.davebsd.com/wiki/GNOME_Terminal_Plugin"
->
-
- <Runtime>
- <Import assembly="GNOME-Terminal.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <Extension path="/Do/Action">
- <Action type="GNOME.Terminal.RunInTerminalAction" />
- <Action type="GNOME.Terminal.OpenTerminalHereAction" />
- </Extension>
- <Extension path="/Do/ItemSource">
- <ItemSource type="GNOME.Terminal.ProfileItemSource" />
- </Extension>
-</Addin>
diff --git a/GoogleCalculator/Makefile.am b/GoogleCalculator/Makefile.am
index de93600..1272b05 100644
--- a/GoogleCalculator/Makefile.am
+++ b/GoogleCalculator/Makefile.am
@@ -5,7 +5,7 @@ ASSEMBLY=GoogleCalculator
FILES = \
src/GoogleCalculatorAction.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/GoogleCalculator.addin.xml
REFERENCES = \
diff --git a/GoogleCalculator/Makefile.in b/GoogleCalculator/Makefile.in
index 861d97b..61c6301 100644
--- a/GoogleCalculator/Makefile.in
+++ b/GoogleCalculator/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = GoogleCalculator
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -287,7 +365,7 @@ ASSEMBLY = GoogleCalculator
FILES = \
src/GoogleCalculatorAction.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/GoogleCalculator.addin.xml
REFERENCES = \
@@ -321,6 +399,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -332,8 +411,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -347,14 +429,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -404,10 +484,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -490,16 +575,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/GoogleCalculator/Resources/GoogleCalculator.addin.xml b/GoogleCalculator/Resources/GoogleCalculator.addin.xml
deleted file mode 100644
index ea22793..0000000
--- a/GoogleCalculator/Resources/GoogleCalculator.addin.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<Addin
- id="GoogleCalculator"
- namespace="Do"
- version="1.0"
- name="Google Calculator"
- description="Perform calculations, and currency/quantity conversions."
- author="David Siegel"
- category="Official"
- defaultEnabled="false"
- url="http://do.davebsd.com/wiki/Google_Calculator_Plugin"
->
-
- <Runtime>
- <Import assembly="GoogleCalculator.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <Extension path= "/Do/Action">
- <Action type="Do.Plugins.Google.GoogleCalculatorAction" />
- </Extension>
-</Addin>
diff --git a/GoogleCalendar/Makefile.am b/GoogleCalendar/Makefile.am
index 590b624..edf061f 100644
--- a/GoogleCalendar/Makefile.am
+++ b/GoogleCalendar/Makefile.am
@@ -17,8 +17,9 @@ FILES = \
src/GCalendarViewActions.cs \
src/GCalPreferences.cs
+GENERATED_RESOURCES = \
+ Resources/GoogleCalendar.addin.xml
RESOURCES = \
- Resources/GoogleCalendar.addin.xml \
Resources/icons/calIcon.png
REFERENCES = \
diff --git a/GoogleCalendar/Makefile.in b/GoogleCalendar/Makefile.in
index 3dc29b7..3c3e108 100644
--- a/GoogleCalendar/Makefile.in
+++ b/GoogleCalendar/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE@@HAVE_GCAL_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE@@HAVE_GCAL_TRUE at am__append_2 = -debug -d:DEBUG
subdir = GoogleCalendar
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
@HAVE_GCAL_TRUE at TARGET = library
@HAVE_GCAL_TRUE at SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
@HAVE_GCAL_TRUE at RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
- at HAVE_GCAL_TRUE@RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+ at HAVE_GCAL_TRUE@GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+ at HAVE_GCAL_TRUE@RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
@HAVE_GCAL_TRUE@ -resource:$(resource),$(notdir $(resource)))
@HAVE_GCAL_TRUE at BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ top_srcdir = @top_srcdir@
# Install plugins as data; there's no need for them to be excutable
@HAVE_GCAL_TRUE at plugindir = ${libdir}/gnome-do/plugins
- at HAVE_GCAL_TRUE@plugin_DATA = $(OUTPUT_FILES)
+ at HAVE_GCAL_TRUE@plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ top_srcdir = @top_srcdir@
# Clean and dist targets
#
@HAVE_GCAL_TRUE at EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- at HAVE_GCAL_TRUE@ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ at HAVE_GCAL_TRUE@ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ at HAVE_GCAL_TRUE@ $(DLL_CONFIG_FILES)
@HAVE_GCAL_TRUE at CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
@HAVE_GCAL_TRUE at DISTCLEANFILES = *.pidb
@@ -297,8 +375,10 @@ FILES = \
src/GCalendarViewActions.cs \
src/GCalPreferences.cs
+GENERATED_RESOURCES = \
+ Resources/GoogleCalendar.addin.xml
+
RESOURCES = \
- Resources/GoogleCalendar.addin.xml \
Resources/icons/calIcon.png
REFERENCES = \
@@ -334,6 +414,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -345,8 +426,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -360,14 +444,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -417,10 +499,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -503,16 +590,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
@HAVE_GCAL_TRUE at all: $(OUTPUT_FILES)
diff --git a/GoogleCalendar/Resources/GoogleCalendar.addin.xml b/GoogleCalendar/Resources/GoogleCalendar.addin.xml
deleted file mode 100644
index d8b47a9..0000000
--- a/GoogleCalendar/Resources/GoogleCalendar.addin.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<Addin
- id="GoogleCalendar"
- namespace="Do"
- version="1.5"
- name="Google Calendar"
- description="Create, search, and browse Google calendar events."
- author="Alex Launi"
- category="Official"
- defaultEnabled="false"
- url="http://do.davebsd.com/wiki/Google_Calendar_Plugin"
- >
-
- <Runtime>
- <Import assembly="GoogleCalendar.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <Extension path="/Do/ItemSource">
- <ItemSource type="GCalendar.GCalendarItemSource" />
- </Extension>
-
- <Extension path="/Do/Action">
- <Action type="GCalendar.GCalendarNewEvent" />
- <Action type="GCalendar.GCalendarSearchEvents" />
- <Action type="GCalendar.ViewCalendarAction" />
- <Action type="GCalendar.ViewEventAction" />
- </Extension>
-</Addin>
diff --git a/GoogleContacts/Makefile.am b/GoogleContacts/Makefile.am
index 9de6c6d..0cdd1df 100644
--- a/GoogleContacts/Makefile.am
+++ b/GoogleContacts/Makefile.am
@@ -15,8 +15,9 @@ FILES = \
src/Preferences.cs \
src/RecentConversationsAction.cs
+GENERATED_RESOURCES = \
+ Resources/GoogleContacts.addin.xml
RESOURCES = \
- Resources/GoogleContacts.addin.xml \
gtk-gui/gui.stetic \
gtk-gui/objects.xml \
Resources/icons/gmail-logo.png \
diff --git a/GoogleContacts/Makefile.in b/GoogleContacts/Makefile.in
index d0cb6fc..215d93f 100644
--- a/GoogleContacts/Makefile.in
+++ b/GoogleContacts/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE@@HAVE_GMAIL_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE@@HAVE_GMAIL_TRUE at am__append_2 = -debug -d:DEBUG
subdir = GoogleContacts
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
@HAVE_GMAIL_TRUE at TARGET = library
@HAVE_GMAIL_TRUE at SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
@HAVE_GMAIL_TRUE at RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
- at HAVE_GMAIL_TRUE@RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+ at HAVE_GMAIL_TRUE@GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+ at HAVE_GMAIL_TRUE@RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
@HAVE_GMAIL_TRUE@ -resource:$(resource),$(notdir $(resource)))
@HAVE_GMAIL_TRUE at BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ top_srcdir = @top_srcdir@
# Install plugins as data; there's no need for them to be excutable
@HAVE_GMAIL_TRUE at plugindir = ${libdir}/gnome-do/plugins
- at HAVE_GMAIL_TRUE@plugin_DATA = $(OUTPUT_FILES)
+ at HAVE_GMAIL_TRUE@plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ top_srcdir = @top_srcdir@
# Clean and dist targets
#
@HAVE_GMAIL_TRUE at EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- at HAVE_GMAIL_TRUE@ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ at HAVE_GMAIL_TRUE@ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ at HAVE_GMAIL_TRUE@ $(DLL_CONFIG_FILES)
@HAVE_GMAIL_TRUE at CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
@HAVE_GMAIL_TRUE at DISTCLEANFILES = *.pidb
@@ -295,8 +373,10 @@ FILES = \
src/Preferences.cs \
src/RecentConversationsAction.cs
+GENERATED_RESOURCES = \
+ Resources/GoogleContacts.addin.xml
+
RESOURCES = \
- Resources/GoogleContacts.addin.xml \
gtk-gui/gui.stetic \
gtk-gui/objects.xml \
Resources/icons/gmail-logo.png \
@@ -335,6 +415,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -346,8 +427,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -361,14 +445,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -418,10 +500,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -504,16 +591,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
@HAVE_GMAIL_TRUE at all: $(OUTPUT_FILES)
diff --git a/GoogleContacts/Resources/GoogleContacts.addin.xml b/GoogleContacts/Resources/GoogleContacts.addin.xml
deleted file mode 100644
index 6c4b9c8..0000000
--- a/GoogleContacts/Resources/GoogleContacts.addin.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<Addin
- id="GMail"
- namespace="Do"
- version="1.6"
- name="Google Contacts"
- description="Search your GMail contacts."
- author="Alex Launi"
- category="Official"
- defaultEnabled="false"
- url="http://do.davebsd.com/wiki/GMail_Contacts_Plugin"
- >
-
- <Runtime>
- <Import assembly="GoogleContacts.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <Extension path = "/Do/ItemSource">
- <ItemSource type="GMail.GMailItemSource" />
- </Extension>
- <Extension path= "/Do/Action">
- <Action type="GMail.RecentConversationsActions" />
- </Extension>
-</Addin>
diff --git a/GoogleDocs/Makefile.am b/GoogleDocs/Makefile.am
index 0c94ac7..af2ea9a 100644
--- a/GoogleDocs/Makefile.am
+++ b/GoogleDocs/Makefile.am
@@ -18,8 +18,9 @@ FILES = \
src/GDocsUploadDocument.cs \
src/Preferences.cs
+GENERATED_RESOURCES = \
+ Resources/GoogleDocs.addin.xml
RESOURCES = \
- Resources/GoogleDocs.addin.xml \
Resources/icons/gDocsIcon.png \
Resources/icons/gDocsTrashIcon.png \
Resources/icons/gDocsUploadIcon.png
diff --git a/GoogleDocs/Makefile.in b/GoogleDocs/Makefile.in
index 975bc80..23ed6b0 100644
--- a/GoogleDocs/Makefile.in
+++ b/GoogleDocs/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE@@HAVE_GDOCS_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE@@HAVE_GDOCS_TRUE at am__append_2 = -debug -d:DEBUG
subdir = GoogleDocs
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
@HAVE_GDOCS_TRUE at TARGET = library
@HAVE_GDOCS_TRUE at SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
@HAVE_GDOCS_TRUE at RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
- at HAVE_GDOCS_TRUE@RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+ at HAVE_GDOCS_TRUE@GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+ at HAVE_GDOCS_TRUE@RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
@HAVE_GDOCS_TRUE@ -resource:$(resource),$(notdir $(resource)))
@HAVE_GDOCS_TRUE at BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ top_srcdir = @top_srcdir@
# Install plugins as data; there's no need for them to be excutable
@HAVE_GDOCS_TRUE at plugindir = ${libdir}/gnome-do/plugins
- at HAVE_GDOCS_TRUE@plugin_DATA = $(OUTPUT_FILES)
+ at HAVE_GDOCS_TRUE@plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ top_srcdir = @top_srcdir@
# Clean and dist targets
#
@HAVE_GDOCS_TRUE at EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- at HAVE_GDOCS_TRUE@ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ at HAVE_GDOCS_TRUE@ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ at HAVE_GDOCS_TRUE@ $(DLL_CONFIG_FILES)
@HAVE_GDOCS_TRUE at CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
@HAVE_GDOCS_TRUE at DISTCLEANFILES = *.pidb
@@ -298,8 +376,10 @@ FILES = \
src/GDocsUploadDocument.cs \
src/Preferences.cs
+GENERATED_RESOURCES = \
+ Resources/GoogleDocs.addin.xml
+
RESOURCES = \
- Resources/GoogleDocs.addin.xml \
Resources/icons/gDocsIcon.png \
Resources/icons/gDocsTrashIcon.png \
Resources/icons/gDocsUploadIcon.png
@@ -337,6 +417,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -348,8 +429,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -363,14 +447,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -420,10 +502,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -506,16 +593,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
@HAVE_GDOCS_TRUE at all: $(OUTPUT_FILES)
diff --git a/GoogleDocs/Resources/GoogleDocs.addin.xml b/GoogleDocs/Resources/GoogleDocs.addin.xml
deleted file mode 100644
index d4f93ae..0000000
--- a/GoogleDocs/Resources/GoogleDocs.addin.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<Addin
- id="GoogleDocs"
- namespace="Do"
- version="1.2"
- name="Google Docs"
- description="Search documents, spreadsheets, and presentations on Google Docs."
- author="Peng Deng"
- category="Official"
- defaultEnabled="false"
- url="http://do.davebsd.com/wiki/Google_Docs_Plugin"
- >
-
- <Runtime>
- <Import assembly="GoogleDocs.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <Extension path="/Do/ItemSource">
- <ItemSource type="GDocs.GDocsItemSource" />
- </Extension>
-
- <Extension path="/Do/Action">
- <Action type="GDocs.GDocsUploadDocument" />
- <Action type="GDocs.GDocsTrashDocument" />
- </Extension>
-</Addin>
diff --git a/GoogleMaps/Makefile.am b/GoogleMaps/Makefile.am
index 2f42c0d..63fe7de 100644
--- a/GoogleMaps/Makefile.am
+++ b/GoogleMaps/Makefile.am
@@ -5,7 +5,7 @@ ASSEMBLY=GoogleMaps
FILES = \
src/MapAction.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/GoogleMaps.addin.xml
REFERENCES = \
diff --git a/GoogleMaps/Makefile.in b/GoogleMaps/Makefile.in
index 9562fe9..9c81810 100644
--- a/GoogleMaps/Makefile.in
+++ b/GoogleMaps/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = GoogleMaps
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -287,7 +365,7 @@ ASSEMBLY = GoogleMaps
FILES = \
src/MapAction.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/GoogleMaps.addin.xml
REFERENCES = \
@@ -321,6 +399,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -332,8 +411,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -347,14 +429,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -404,10 +484,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -490,16 +575,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/GoogleMaps/Resources/GoogleMaps.addin.xml b/GoogleMaps/Resources/GoogleMaps.addin.xml
deleted file mode 100644
index 816de8a..0000000
--- a/GoogleMaps/Resources/GoogleMaps.addin.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<Addin
- id="GoogleMaps"
- namespace="Do"
- version="1.1"
- name="Google Maps"
- description="Map a location or route in Google maps."
- author="DR Colkitt"
- contributer="Chris Szikszoy"
- category="Community"
- defaultEnabled="false"
- url="http://do.davebsd.com/wiki/Google_Maps_Plugin"
->
-
- <Runtime>
- <Import assembly="GoogleMaps.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <Extension path="/Do/Action">
- <Action type="Google.MapAction" />
- </Extension>
-
-</Addin>
diff --git a/GoogleSearch/Makefile.am b/GoogleSearch/Makefile.am
index 7aae27f..9903164 100644
--- a/GoogleSearch/Makefile.am
+++ b/GoogleSearch/Makefile.am
@@ -13,7 +13,9 @@ FILES = \
RESOURCES = \
gtk-gui/gui.stetic \
- gtk-gui/objects.xml \
+ gtk-gui/objects.xml
+
+GENERATED_RESOURCES = \
Resources/GoogleSearch.addin.xml
REFERENCES = \
diff --git a/GoogleSearch/Makefile.in b/GoogleSearch/Makefile.in
index b554c41..fe6b4df 100644
--- a/GoogleSearch/Makefile.in
+++ b/GoogleSearch/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = GoogleSearch
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -295,7 +373,9 @@ FILES = \
RESOURCES = \
gtk-gui/gui.stetic \
- gtk-gui/objects.xml \
+ gtk-gui/objects.xml
+
+GENERATED_RESOURCES = \
Resources/GoogleSearch.addin.xml
REFERENCES = \
@@ -331,6 +411,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -342,8 +423,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -357,14 +441,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -414,10 +496,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -500,16 +587,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/GoogleSearch/Resources/GoogleSearch.addin.xml b/GoogleSearch/Resources/GoogleSearch.addin.xml
deleted file mode 100644
index 2aeafd0..0000000
--- a/GoogleSearch/Resources/GoogleSearch.addin.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<Addin
- id="GoogleSearch"
- namespace="Do"
- version="1.5"
- name="Google Search"
- description="Perform Google Searches from Do."
- author="Brian Lucas"
- category="Community"
- defaultEnabled="false"
- url="http://do.davebsd.com/wiki/Google_Search_Plugin"
->
-
- <Runtime>
- <Import assembly="GoogleSearch.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <!-- Extensions included in this assembly -->
- <!-- Sources -->
- <Extension path = "/Do/Action">
- <Action type="InlineGoogleSearch.InlineGoogleSearch" />
- <Action type="InlineGoogleSearch.ImFeelingLucky" />
- </Extension>
-</Addin>
diff --git a/ImageShack/Makefile.am b/ImageShack/Makefile.am
index 256d0f4..5bab492 100644
--- a/ImageShack/Makefile.am
+++ b/ImageShack/Makefile.am
@@ -12,13 +12,15 @@ FILES = \
RESOURCES = \
gtk-gui/gui.stetic \
gtk-gui/objects.xml \
- Resources/icons/imageshack.png \
+ Resources/icons/imageshack.png
+GENERATED_RESOURCES = \
Resources/ImageShack.addin.xml
REFERENCES = \
System \
System.Core \
System.Web \
+ System.Xml \
System.Xml.Linq \
$(GTK_SHARP_20_LIBS) \
$(DO_PLATFORM_LINUX_LIBS) \
diff --git a/ImageShack/Makefile.in b/ImageShack/Makefile.in
index 20f4df2..31e8bfb 100644
--- a/ImageShack/Makefile.in
+++ b/ImageShack/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = ImageShack
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -294,13 +372,16 @@ FILES = \
RESOURCES = \
gtk-gui/gui.stetic \
gtk-gui/objects.xml \
- Resources/icons/imageshack.png \
+ Resources/icons/imageshack.png
+
+GENERATED_RESOURCES = \
Resources/ImageShack.addin.xml
REFERENCES = \
System \
System.Core \
System.Web \
+ System.Xml \
System.Xml.Linq \
$(GTK_SHARP_20_LIBS) \
$(DO_PLATFORM_LINUX_LIBS) \
@@ -330,6 +411,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -341,8 +423,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -356,14 +441,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -413,10 +496,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -499,16 +587,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/ImageShack/Resources/ImageShack.addin.xml b/ImageShack/Resources/ImageShack.addin.xml
deleted file mode 100644
index 1f0a177..0000000
--- a/ImageShack/Resources/ImageShack.addin.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<Addin
- id="ImageShack"
- namespace="Do"
- version="1.1"
- name="ImageShack"
- description="Upload images to ImageShack."
- author="Jason Jones"
- category="Official"
- defaultEnabled="false"
- url="http://do.davebsd.com/wiki/ImageShack_Plugin"
->
-
- <Runtime>
- <Import assembly="ImageShack.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <Extension path= "/Do/Action">
- <Action type="ImageShack.ImageShackAction" />
- </Extension>
-</Addin>
diff --git a/JIRA/Makefile.am b/JIRA/Makefile.am
index 68f4389..db685fb 100644
--- a/JIRA/Makefile.am
+++ b/JIRA/Makefile.am
@@ -15,8 +15,9 @@ FILES = \
src/JIRAConfiguration.cs \
src/JIRAIssueSource.cs
+GENERATED_RESOURCES = \
+ Resources/JIRA.addin.xml
RESOURCES = \
- Resources/JIRA.addin.xml \
Resources/icons/jira.png
REFERENCES = \
diff --git a/JIRA/Makefile.in b/JIRA/Makefile.in
index 36727f7..63e65ee 100644
--- a/JIRA/Makefile.in
+++ b/JIRA/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = JIRA
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -297,8 +375,10 @@ FILES = \
src/JIRAConfiguration.cs \
src/JIRAIssueSource.cs
+GENERATED_RESOURCES = \
+ Resources/JIRA.addin.xml
+
RESOURCES = \
- Resources/JIRA.addin.xml \
Resources/icons/jira.png
REFERENCES = \
@@ -336,6 +416,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -347,8 +428,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -362,14 +446,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -419,10 +501,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -505,16 +592,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/JIRA/Resources/JIRA.addin.xml b/JIRA/Resources/JIRA.addin.xml
deleted file mode 100644
index ce6c467..0000000
--- a/JIRA/Resources/JIRA.addin.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<Addin
- id="JIRA"
- namespace="Do"
- version="2.3"
- name="JIRA Integration"
- description="Creates fast lookup links for JIRA issues."
- author="Andrew Franklin"
- category="Community"
- defaultEnabled="false"
- >
-
- <Runtime>
- <Import assembly="JIRA.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <Extension path="/Do/Action">
- <Action type="JIRA.JIRAIssueAction" />
- </Extension>
- <Extension path = "/Do/ItemSource">
- <ItemSource type="JIRA.JIRAIssueSource" />
- </Extension>
-
-
-</Addin>
diff --git a/Launchpad/Makefile.am b/Launchpad/Makefile.am
index b9ee932..c1aa4c4 100644
--- a/Launchpad/Makefile.am
+++ b/Launchpad/Makefile.am
@@ -15,7 +15,9 @@ RESOURCES = \
Resources/icons/Launchpad.png \
Resources/icons/LaunchpadRegister.png \
Resources/icons/LaunchpadTranslations.png \
- Resources/icons/LaunchpadUser.png \
+ Resources/icons/LaunchpadUser.png
+
+GENERATED_RESOURCES = \
Resources/Launchpad.addin.xml
REFERENCES = \
diff --git a/Launchpad/Makefile.in b/Launchpad/Makefile.in
index 96d4742..7a4e25f 100644
--- a/Launchpad/Makefile.in
+++ b/Launchpad/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = Launchpad
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -297,7 +375,9 @@ RESOURCES = \
Resources/icons/Launchpad.png \
Resources/icons/LaunchpadRegister.png \
Resources/icons/LaunchpadTranslations.png \
- Resources/icons/LaunchpadUser.png \
+ Resources/icons/LaunchpadUser.png
+
+GENERATED_RESOURCES = \
Resources/Launchpad.addin.xml
REFERENCES = \
@@ -331,6 +411,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -342,8 +423,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -357,14 +441,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -414,10 +496,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -500,16 +587,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/Launchpad/Resources/Launchpad.addin.xml b/Launchpad/Resources/Launchpad.addin.xml
deleted file mode 100644
index aae6eb7..0000000
--- a/Launchpad/Resources/Launchpad.addin.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<Addin
- id="Launchpad"
- namespace="Do"
- version="1.1"
- name="Launchpad"
- description="Search various Launchpad properties (e.g. code, bugs, people)."
- author="Ken Simon, David Siegel"
- category="Official"
- defaultEnabled="false"
- url="http://do.davebsd.com/wiki/Launchpad_Plugin"
->
-
- <Runtime>
- <Import assembly="Launchpad.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <Extension path= "/Do/Action">
- <Action type="Launchpad.LaunchpadAction" />
- </Extension>
-</Addin>
diff --git a/LocateFiles/Makefile.am b/LocateFiles/Makefile.am
index 3f73fc6..8c35b90 100644
--- a/LocateFiles/Makefile.am
+++ b/LocateFiles/Makefile.am
@@ -5,7 +5,7 @@ ASSEMBLY=LocateFiles
FILES = \
src/LocateFilesAction.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/LocateFiles.addin.xml
REFERENCES = \
diff --git a/LocateFiles/Makefile.in b/LocateFiles/Makefile.in
index 27b2d85..e17d5d7 100644
--- a/LocateFiles/Makefile.in
+++ b/LocateFiles/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = LocateFiles
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -287,7 +365,7 @@ ASSEMBLY = LocateFiles
FILES = \
src/LocateFilesAction.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/LocateFiles.addin.xml
REFERENCES = \
@@ -320,6 +398,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -331,8 +410,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -346,14 +428,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -403,10 +483,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -489,16 +574,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/LocateFiles/Resources/LocateFiles.addin.xml b/LocateFiles/Resources/LocateFiles.addin.xml
deleted file mode 100644
index 0ba92c1..0000000
--- a/LocateFiles/Resources/LocateFiles.addin.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<Addin
- id="LocateFiles"
- namespace="Do"
- version="1.1"
- name="Locate Files"
- description="Find files on your computer using the GNU locate command."
- author="David Siegel"
- category="Official"
- defaultEnabled="false"
- url="http://do.davebsd.com/wiki/Locate_Plugin"
->
-
- <Runtime>
- <Import assembly="LocateFiles.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <Extension path= "/Do/Action">
- <Action type="Locate.LocateFilesAction" />
- </Extension>
-</Addin>
diff --git a/MPD/Makefile.am b/MPD/Makefile.am
index aebba31..74af8b0 100644
--- a/MPD/Makefile.am
+++ b/MPD/Makefile.am
@@ -9,7 +9,7 @@ FILES = \
src/MPDItems.cs \
src/MusicItems.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/MPD.addin.xml
REFERENCES = \
diff --git a/MPD/Makefile.in b/MPD/Makefile.in
index 76a34da..d45ffb8 100644
--- a/MPD/Makefile.in
+++ b/MPD/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = MPD
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -291,7 +369,7 @@ FILES = \
src/MPDItems.cs \
src/MusicItems.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/MPD.addin.xml
REFERENCES = \
@@ -324,6 +402,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -335,8 +414,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -350,14 +432,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -407,10 +487,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -493,16 +578,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/MPD/Resources/MPD.addin.xml b/MPD/Resources/MPD.addin.xml
deleted file mode 100644
index 89c7510..0000000
--- a/MPD/Resources/MPD.addin.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<Addin
- id="MPD"
- namespace="Do"
- version="1.0"
- name="Music Player Daemon"
- description="Search and play music from MPD."
- author="Zachary Goldberg"
- category="Community"
- defaultEnabled="false"
- >
-
- <Runtime>
- <Import assembly="MPD.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <!-- Extensions included in this assembly -->
- <Extension path="/Do/ItemSource">
- <ItemSource type="MPD.MPDMusicItemSource" />
- </Extension>
-
-</Addin>
diff --git a/Makefile.am b/Makefile.am
index dbaa8f9..665af30 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -71,6 +71,7 @@ SUBDIRS = \
TinyUrl \
Tracker \
Translate \
+ Transmission \
Tomboy \
Vinagre \
VirtualBox \
diff --git a/Makefile.in b/Makefile.in
index a5f7dea..2412579 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -15,6 +14,51 @@
@SET_MAKE@
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -32,8 +76,8 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
subdir = .
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in \
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/configure $(am__configure_deps) \
$(top_srcdir)/Alias/Resources/Alias.addin.xml.in \
$(top_srcdir)/AptURL/Resources/AptURL.addin.xml.in \
$(top_srcdir)/Archive/Resources/Archive.addin.xml.in \
@@ -47,9 +91,9 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(top_srcdir)/Del.icio.us/Resources/delicious.addin.xml.in \
$(top_srcdir)/DiskMounter/Resources/DiskMounter.addin.xml.in \
$(top_srcdir)/Dropbox/Resources/Dropbox.addin.xml.in \
- $(top_srcdir)/EOG-Slideshow/Resources/EOG-Slideshow.addin.xml.in \
$(top_srcdir)/Emesene/Resources/Emesene.addin.xml.in \
$(top_srcdir)/Empathy/Resources/Empathy.addin.xml.in \
+ $(top_srcdir)/EOG-Slideshow/Resources/EOG-Slideshow.addin.xml.in \
$(top_srcdir)/Epiphany/Resources/Epiphany.addin.xml.in \
$(top_srcdir)/Exaile/Resources/Exaile.addin.xml.in \
$(top_srcdir)/File/Resources/File.addin.xml.in \
@@ -70,9 +114,9 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(top_srcdir)/JIRA/Resources/JIRA.addin.xml.in \
$(top_srcdir)/Launchpad/Resources/Launchpad.addin.xml.in \
$(top_srcdir)/LocateFiles/Resources/LocateFiles.addin.xml.in \
- $(top_srcdir)/MPD/Resources/MPD.addin.xml.in \
$(top_srcdir)/ManLookUp/Resources/ManLookUp.addin.xml.in \
$(top_srcdir)/Microblogging/Resources/Microblogging.addin.xml.in \
+ $(top_srcdir)/MPD/Resources/MPD.addin.xml.in \
$(top_srcdir)/NX/Resources/NX.addin.xml.in \
$(top_srcdir)/OpenSearch/Resources/OpenSearch.addin.xml.in \
$(top_srcdir)/Opera/Resources/Opera.addin.xml.in \
@@ -82,43 +126,44 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(top_srcdir)/Putty/Resources/Putty.addin.xml.in \
$(top_srcdir)/Qalculate/Resources/Qalculate.addin.xml.in \
$(top_srcdir)/Quote/Resources/Quote.addin.xml.in \
- $(top_srcdir)/RSS/Resources/RSS.addin.xml.in \
$(top_srcdir)/RememberTheMilk/Resources/RTM.addin.xml.in \
$(top_srcdir)/RemindMe/Resources/RemindMe.addin.xml.in \
- $(top_srcdir)/RequestTracker/Resources/RequestTracker.addin.xml.in \
$(top_srcdir)/Rhythmbox/Resources/Rhythmbox.addin.xml.in \
$(top_srcdir)/Riptide/Resources/Riptide.addin.xml.in \
- $(top_srcdir)/SSH/Resources/SSH.addin.xml.in \
+ $(top_srcdir)/RSS/Resources/RSS.addin.xml.in \
$(top_srcdir)/Shelf/Resources/Shelf.addin.xml.in \
$(top_srcdir)/Skype/Resources/Skype.addin.xml.in \
$(top_srcdir)/SqueezeCenter/Resources/SqueezeCenter.addin.xml.in \
+ $(top_srcdir)/SSH/Resources/SSH.addin.xml.in \
$(top_srcdir)/StockQuote/Resources/StockQuote.addin.xml.in \
+ $(top_srcdir)/RequestTracker/Resources/RequestTracker.addin.xml.in \
$(top_srcdir)/SystemServices/Resources/SystemServices.addin.xml.in \
$(top_srcdir)/Tasque/Resources/Tasque.addin.xml.in \
$(top_srcdir)/TerminalServerClient/Resources/TerminalServerClient.addin.xml.in \
$(top_srcdir)/Text/Resources/Text.addin.xml.in \
$(top_srcdir)/Thunderbird/Resources/Thunderbird.addin.xml.in \
$(top_srcdir)/TinyUrl/Resources/TinyUrl.addin.xml.in \
- $(top_srcdir)/Tomboy/Resources/Tomboy.addin.xml.in \
$(top_srcdir)/Tracker/Resources/TrackerSearch.addin.xml.in \
$(top_srcdir)/Translate/Resources/Translate.addin.xml.in \
+ $(top_srcdir)/Transmission/Resources/Transmission.addin.xml.in \
+ $(top_srcdir)/Tomboy/Resources/Tomboy.addin.xml.in \
$(top_srcdir)/Vinagre/Resources/Vinagre.addin.xml.in \
$(top_srcdir)/VirtualBox/Resources/VirtualBox.addin.xml.in \
$(top_srcdir)/VolumeControl/Resources/VolumeControl.addin.xml.in \
$(top_srcdir)/WindowManager/Resources/WindowManager.addin.xml.in \
$(top_srcdir)/Woof/Resources/Woof.addin.xml.in \
$(top_srcdir)/Wordnet/Resources/Wordnet.addin.xml.in \
- $(top_srcdir)/XRandR/Resources/XRandR.addin.xml.in \
$(top_srcdir)/Xmms2/Resources/xmms2.addin.xml.in \
+ $(top_srcdir)/XRandR/Resources/XRandR.addin.xml.in \
$(top_srcdir)/YouTube/Resources/Youtube.addin.xml.in \
- $(top_srcdir)/Zim/Resources/Zim.addin.xml.in \
- $(top_srcdir)/configure AUTHORS COPYING install-sh missing
+ $(top_srcdir)/Zim/Resources/Zim.addin.xml.in AUTHORS COPYING \
+ README install-sh missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -189,6 +234,7 @@ CONFIG_CLEAN_FILES = Alias/Resources/Alias.addin.xml \
TinyUrl/Resources/TinyUrl.addin.xml \
Tracker/Resources/TrackerSearch.addin.xml \
Translate/Resources/Translate.addin.xml \
+ Transmission/Resources/Transmission.addin.xml \
Tomboy/Resources/Tomboy.addin.xml \
Vinagre/Resources/Vinagre.addin.xml \
VirtualBox/Resources/VirtualBox.addin.xml \
@@ -201,30 +247,72 @@ CONFIG_CLEAN_FILES = Alias/Resources/Alias.addin.xml \
YouTube/Resources/Youtube.addin.xml \
Zim/Resources/Zim.addin.xml
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
- install-dvi-recursive install-exec-recursive \
- install-html-recursive install-info-recursive \
- install-pdf-recursive install-ps-recursive install-recursive \
- installcheck-recursive installdirs-recursive pdf-recursive \
- ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+ ctags-recursive dvi-recursive html-recursive info-recursive \
+ install-data-recursive install-dvi-recursive \
+ install-exec-recursive install-html-recursive \
+ install-info-recursive install-pdf-recursive \
+ install-ps-recursive install-recursive installcheck-recursive \
+ installdirs-recursive pdf-recursive ps-recursive \
+ tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
- distdir dist dist-all distcheck
+am__recursive_targets = \
+ $(RECURSIVE_TARGETS) \
+ $(RECURSIVE_CLEAN_TARGETS) \
+ $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+ cscope distdir dist dist-all distcheck
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates. Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+ BEGIN { nonempty = 0; } \
+ { items[$$0] = 1; nonempty = 1; } \
+ END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique. This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+ list='$(am__tagged_files)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
+CSCOPE = cscope
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
am__remove_distdir = \
- { test ! -d "$(distdir)" \
- || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
- && rm -fr "$(distdir)"; }; }
+ if test -d "$(distdir)"; then \
+ find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+ && rm -rf "$(distdir)" \
+ || { sleep 5 && rm -rf "$(distdir)"; }; \
+ else :; fi
+am__post_remove_distdir = $(am__remove_distdir)
am__relativize = \
dir0=`pwd`; \
sed_first='s,^\([^/]*\)/.*$$,\1,'; \
@@ -252,11 +340,15 @@ am__relativize = \
reldir="$$dir2"
DIST_ARCHIVES = $(distdir).tar.gz
GZIP_ENV = --best
+DIST_TARGETS = dist-gzip
distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -275,12 +367,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -309,6 +403,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -333,6 +428,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -351,10 +450,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -408,6 +505,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -499,6 +598,7 @@ SUBDIRS = \
TinyUrl \
Tracker \
Translate \
+ Transmission \
Tomboy \
Vinagre \
VirtualBox \
@@ -515,7 +615,7 @@ SUBDIRS = \
all: all-recursive
.SUFFIXES:
-am--refresh:
+am--refresh: Makefile
@:
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
@@ -683,6 +783,8 @@ Tracker/Resources/TrackerSearch.addin.xml: $(top_builddir)/config.status $(top_s
cd $(top_builddir) && $(SHELL) ./config.status $@
Translate/Resources/Translate.addin.xml: $(top_builddir)/config.status $(top_srcdir)/Translate/Resources/Translate.addin.xml.in
cd $(top_builddir) && $(SHELL) ./config.status $@
+Transmission/Resources/Transmission.addin.xml: $(top_builddir)/config.status $(top_srcdir)/Transmission/Resources/Transmission.addin.xml.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
Tomboy/Resources/Tomboy.addin.xml: $(top_builddir)/config.status $(top_srcdir)/Tomboy/Resources/Tomboy.addin.xml.in
cd $(top_builddir) && $(SHELL) ./config.status $@
Vinagre/Resources/Vinagre.addin.xml: $(top_builddir)/config.status $(top_srcdir)/Vinagre/Resources/Vinagre.addin.xml.in
@@ -707,22 +809,25 @@ Zim/Resources/Zim.addin.xml: $(top_builddir)/config.status $(top_srcdir)/Zim/Res
cd $(top_builddir) && $(SHELL) ./config.status $@
# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-# (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
- @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+# (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+ @fail=; \
+ if $(am__make_keepgoing); then \
+ failcom='fail=yes'; \
+ else \
+ failcom='exit 1'; \
+ fi; \
dot_seen=no; \
target=`echo $@ | sed s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ for subdir in $$list; do \
echo "Making $$target in $$subdir"; \
if test "$$subdir" = "."; then \
dot_seen=yes; \
@@ -737,57 +842,12 @@ $(RECURSIVE_TARGETS):
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-$(RECURSIVE_CLEAN_TARGETS):
- @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
- dot_seen=no; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
- *) list='$(SUBDIRS)' ;; \
- esac; \
- rev=''; for subdir in $$list; do \
- if test "$$subdir" = "."; then :; else \
- rev="$$subdir $$rev"; \
- fi; \
- done; \
- rev="$$rev ."; \
- target=`echo $@ | sed s/-recursive//`; \
- for subdir in $$rev; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done && test -z "$$fail"
-tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
- done
-ctags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
+ID: $(am__tagged_files)
+ $(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -803,12 +863,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ $(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
@@ -820,15 +875,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$$unique; \
fi; \
fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+ $(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
@@ -837,9 +888,31 @@ GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+cscope: cscope.files
+ test ! -s cscope.files \
+ || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
+clean-cscope:
+ -rm -f cscope.files
+cscope.files: clean-cscope cscopelist
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+ list='$(am__tagged_files)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ -rm -f cscope.out cscope.in.out cscope.po.out cscope.files
distdir: $(DISTFILES)
$(am__remove_distdir)
@@ -875,13 +948,10 @@ distdir: $(DISTFILES)
done
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
- test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
- fi; \
- done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
+ $(am__make_dryrun) \
+ || test -d "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
$(am__relativize); \
new_distdir=$$reldir; \
@@ -910,36 +980,36 @@ distdir: $(DISTFILES)
|| chmod -R a+r "$(distdir)"
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
dist-bzip2: distdir
- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
- $(am__remove_distdir)
+ tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+ $(am__post_remove_distdir)
-dist-lzma: distdir
- tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
- $(am__remove_distdir)
+dist-lzip: distdir
+ tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
+ $(am__post_remove_distdir)
dist-xz: distdir
- tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
- $(am__remove_distdir)
+ tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
+ $(am__post_remove_distdir)
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
dist-shar: distdir
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
dist-zip: distdir
-rm -f $(distdir).zip
zip -rq $(distdir).zip $(distdir)
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
-dist dist-all: distdir
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- $(am__remove_distdir)
+dist dist-all:
+ $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
+ $(am__post_remove_distdir)
# This target untars the dist file and tries a VPATH configuration. Then
# it guarantees that the distribution is self-contained by making another
@@ -950,8 +1020,8 @@ distcheck: dist
GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
- *.tar.lzma*) \
- lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+ *.tar.lz*) \
+ lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
*.tar.xz*) \
xz -dc $(distdir).tar.xz | $(am__untar) ;;\
*.tar.Z*) \
@@ -961,9 +1031,9 @@ distcheck: dist
*.zip*) \
unzip $(distdir).zip ;;\
esac
- chmod -R a-w $(distdir); chmod a+w $(distdir)
- mkdir $(distdir)/_build
- mkdir $(distdir)/_inst
+ chmod -R a-w $(distdir)
+ chmod u+w $(distdir)
+ mkdir $(distdir)/_build $(distdir)/_inst
chmod a-w $(distdir)
test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
@@ -971,6 +1041,7 @@ distcheck: dist
&& am__cwd=`pwd` \
&& $(am__cd) $(distdir)/_build \
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
+ $(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
@@ -994,13 +1065,21 @@ distcheck: dist
&& $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
&& cd "$$am__cwd" \
|| exit 1
- $(am__remove_distdir)
+ $(am__post_remove_distdir)
@(echo "$(distdir) archives ready for distribution: "; \
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
distuninstallcheck:
- @$(am__cd) '$(distuninstallcheck_dir)' \
- && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+ @test -n '$(distuninstallcheck_dir)' || { \
+ echo 'ERROR: trying to run $@ with an empty' \
+ '$$(distuninstallcheck_dir)' >&2; \
+ exit 1; \
+ }; \
+ $(am__cd) '$(distuninstallcheck_dir)' || { \
+ echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
+ exit 1; \
+ }; \
+ test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
|| { echo "ERROR: files left after uninstall:" ; \
if test -n "$(DESTDIR)"; then \
echo " (check DESTDIR support)"; \
@@ -1031,10 +1110,15 @@ install-am: all-am
installcheck: installcheck-recursive
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -1115,14 +1199,13 @@ ps-am:
uninstall-am:
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
- install-am install-strip tags-recursive
+.MAKE: $(am__recursive_targets) install-am install-strip
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- all all-am am--refresh check check-am clean clean-generic \
- clean-local ctags ctags-recursive dist dist-all dist-bzip2 \
- dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
- distcheck distclean distclean-generic distclean-tags \
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+ am--refresh check check-am clean clean-cscope clean-generic \
+ clean-local cscope cscopelist-am ctags ctags-am dist dist-all \
+ dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ dist-xz \
+ dist-zip distcheck distclean distclean-generic distclean-tags \
distcleancheck distdir distuninstallcheck dvi dvi-am html \
html-am info info-am install install-am install-data \
install-data-am install-dvi install-dvi-am install-exec \
@@ -1131,7 +1214,7 @@ uninstall-am:
install-ps install-ps-am install-strip installcheck \
installcheck-am installdirs installdirs-am maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
- pdf-am ps ps-am tags tags-recursive uninstall uninstall-am
+ pdf-am ps ps-am tags tags-am uninstall uninstall-am
clean-local:
diff --git a/ManLookUp/Makefile.am b/ManLookUp/Makefile.am
index 690dcb0..366cd25 100644
--- a/ManLookUp/Makefile.am
+++ b/ManLookUp/Makefile.am
@@ -5,7 +5,7 @@ ASSEMBLY=ManLookUp
FILES = \
src/ReadManualPageAction.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/ManLookUp.addin.xml
REFERENCES = \
diff --git a/ManLookUp/Makefile.in b/ManLookUp/Makefile.in
index a1cecd3..d8b2284 100644
--- a/ManLookUp/Makefile.in
+++ b/ManLookUp/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = ManLookUp
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -287,7 +365,7 @@ ASSEMBLY = ManLookUp
FILES = \
src/ReadManualPageAction.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/ManLookUp.addin.xml
REFERENCES = \
@@ -320,6 +398,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -331,8 +410,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -346,14 +428,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -403,10 +483,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -489,16 +574,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/ManLookUp/Resources/ManLookUp.addin.xml b/ManLookUp/Resources/ManLookUp.addin.xml
deleted file mode 100644
index b97e124..0000000
--- a/ManLookUp/Resources/ManLookUp.addin.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<Addin
- id="ManPages"
- namespace="Do"
- version="1.2"
- name="Read Manual Pages (man)"
- description="Search and view manual pages."
- author="J. Carlos Navea"
- category="Community"
- defaultEnabled="false"
->
-
- <Runtime>
- <Import assembly="ManLookUp.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <Extension path = "/Do/Action">
- <Action type="ManPages.ReadManualPageAction" />
- </Extension>
-
-</Addin>
diff --git a/Microblogging/Makefile.am b/Microblogging/Makefile.am
index d437824..0b66b49 100644
--- a/Microblogging/Makefile.am
+++ b/Microblogging/Makefile.am
@@ -33,10 +33,12 @@ FILES = \
src/Twitterizer/Twitterizer.Framework/TwitterRequest.cs \
src/Twitterizer/Twitterizer.Framework/Urls.cs
+GENERATED_RESOURCES = \
+ Resources/Microblogging.addin.xml
+
RESOURCES = \
gtk-gui/gui.stetic \
gtk-gui/objects.xml \
- Resources/Microblogging.addin.xml \
Resources/icons/microblogging.svg
REFERENCES = \
diff --git a/Microblogging/Makefile.in b/Microblogging/Makefile.in
index fa0d49d..ed8f0a2 100644
--- a/Microblogging/Makefile.in
+++ b/Microblogging/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = Microblogging
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -315,10 +393,12 @@ FILES = \
src/Twitterizer/Twitterizer.Framework/TwitterRequest.cs \
src/Twitterizer/Twitterizer.Framework/Urls.cs
+GENERATED_RESOURCES = \
+ Resources/Microblogging.addin.xml
+
RESOURCES = \
gtk-gui/gui.stetic \
gtk-gui/objects.xml \
- Resources/Microblogging.addin.xml \
Resources/icons/microblogging.svg
REFERENCES = \
@@ -355,6 +435,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -366,8 +447,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -381,14 +465,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -438,10 +520,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -524,16 +611,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/Microblogging/Resources/Microblogging.addin.xml b/Microblogging/Resources/Microblogging.addin.xml
deleted file mode 100644
index aed0578..0000000
--- a/Microblogging/Resources/Microblogging.addin.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<Addin
- id="Microblog"
- namespace="Do"
- version="1.1"
- name="Microblogging (Twitter)"
- description="Update your microblog (e.g. Twitter, Identi.ca)."
- author="Jacob Andreas, Alex Launi"
- category="Official"
- defaultEnabled="false"
- url="http://do.davebsd.com/wiki/Twitter_Plugin"
->
-
- <Runtime>
- <Import assembly="Microblog.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <Extension path="/Do/Action">
- <Action type="Microblogging.PostAction" />
- </Extension>
-
- <Extension path="/Do/ItemSource">
- <ItemSource type="Microblogging.FriendSource" />
- </Extension>
-</Addin>
diff --git a/NX/Makefile.am b/NX/Makefile.am
index e1a59c3..8c26268 100644
--- a/NX/Makefile.am
+++ b/NX/Makefile.am
@@ -6,7 +6,7 @@ FILES = \
src/NXAction.cs \
src/NXHosts.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/NX.addin.xml
REFERENCES = \
diff --git a/NX/Makefile.in b/NX/Makefile.in
index 6f8bbe1..a0365d0 100644
--- a/NX/Makefile.in
+++ b/NX/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = NX
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -288,7 +366,7 @@ FILES = \
src/NXAction.cs \
src/NXHosts.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/NX.addin.xml
REFERENCES = \
@@ -321,6 +399,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -332,8 +411,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -347,14 +429,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -404,10 +484,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -490,16 +575,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/NX/Resources/NX.addin.xml b/NX/Resources/NX.addin.xml
deleted file mode 100644
index 4b2edc4..0000000
--- a/NX/Resources/NX.addin.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<Addin
- id="NX"
- namespace="Do"
- version="1.0"
- name="NX"
- description="Search and connect to NX hosts."
- author="Sean Dague"
- category="Community"
- defaultEnabled="false"
- >
-
- <Runtime>
- <Import assembly="NX.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <Extension path = "/Do/ItemSource">
- <ItemSource type="NX.NXHostItemSource" />
- </Extension>
- <Extension path = "/Do/Action">
- <Action type="NX.NXAction" />
- </Extension>
-</Addin>
diff --git a/OpenSearch/Makefile.am b/OpenSearch/Makefile.am
index 58cb8b6..d0e6350 100644
--- a/OpenSearch/Makefile.am
+++ b/OpenSearch/Makefile.am
@@ -10,7 +10,7 @@ FILES = \
src/CachingOpenSearchItemSource.cs \
src/OpenSearchParser.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/OpenSearch.addin.xml
REFERENCES = \
diff --git a/OpenSearch/Makefile.in b/OpenSearch/Makefile.in
index beb009f..89eca8f 100644
--- a/OpenSearch/Makefile.in
+++ b/OpenSearch/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = OpenSearch
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -292,7 +370,7 @@ FILES = \
src/CachingOpenSearchItemSource.cs \
src/OpenSearchParser.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/OpenSearch.addin.xml
REFERENCES = \
@@ -327,6 +405,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -338,8 +417,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -353,14 +435,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -410,10 +490,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -496,16 +581,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/OpenSearch/Resources/OpenSearch.addin.xml b/OpenSearch/Resources/OpenSearch.addin.xml
deleted file mode 100644
index c4ae014..0000000
--- a/OpenSearch/Resources/OpenSearch.addin.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<Addin
- id="OpenSearch"
- namespace="Do"
- version="1.2"
- name="OpenSearch Web Search"
- description="Search the web using your installed OpenSearch plugins."
- author="Jason Jones"
- category="Official"
- defaultEnabled="false"
- url="http://do.davebsd.com/wiki/OpenSearch_Plugin"
->
-
- <Runtime>
- <Import assembly="OpenSearch.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <!-- Extensions included in this assembly -->
- <Extension path="/Do/Action">
- <Action type="OpenSearch.OpenSearchAction" />
- </Extension>
-
-</Addin>
diff --git a/Opera/Makefile.am b/Opera/Makefile.am
index 9c5890d..1ba9868 100644
--- a/Opera/Makefile.am
+++ b/Opera/Makefile.am
@@ -5,7 +5,7 @@ ASSEMBLY=Opera
FILES = \
src/OperaBookmarkItemSource.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/Opera.addin.xml
REFERENCES = \
diff --git a/Opera/Makefile.in b/Opera/Makefile.in
index 63f647b..81a240a 100644
--- a/Opera/Makefile.in
+++ b/Opera/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = Opera
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -287,7 +365,7 @@ ASSEMBLY = Opera
FILES = \
src/OperaBookmarkItemSource.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/Opera.addin.xml
REFERENCES = \
@@ -320,6 +398,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -331,8 +410,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -346,14 +428,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -403,10 +483,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -489,16 +574,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/Opera/Resources/Opera.addin.xml b/Opera/Resources/Opera.addin.xml
deleted file mode 100644
index 0557170..0000000
--- a/Opera/Resources/Opera.addin.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<Addin
- id="Opera"
- namespace="Do"
- version="1.0"
- name="Opera"
- description="Search your Opera 6 bookmarks."
- author="goto"
- category="Community"
- defaultEnabled="false"
->
-
- <Runtime>
- <Import assembly="Opera.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <Extension path="/Do/ItemSource">
- <ItemSource type="Opera.OperaBookmarkItemSource" />
- </Extension>
-</Addin>
diff --git a/Pastebin/Makefile.am b/Pastebin/Makefile.am
index 68e732f..462a673 100644
--- a/Pastebin/Makefile.am
+++ b/Pastebin/Makefile.am
@@ -22,13 +22,15 @@ FILES = \
RESOURCES = \
gtk-gui/gui.stetic \
gtk-gui/objects.xml \
- Resources/Pastebin.addin.xml \
Resources/LodgeIt.xml \
Resources/Paste2.xml \
Resources/PasteUbuntu.xml \
Resources/PastebinCA.xml \
Resources/Pastebin.xml
+GENERATED_RESOURCES = \
+ Resources/Pastebin.addin.xml
+
REFERENCES = \
System \
System.Core \
diff --git a/Pastebin/Makefile.in b/Pastebin/Makefile.in
index f6b1c3c..0630185 100644
--- a/Pastebin/Makefile.in
+++ b/Pastebin/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = Pastebin
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -304,13 +382,15 @@ FILES = \
RESOURCES = \
gtk-gui/gui.stetic \
gtk-gui/objects.xml \
- Resources/Pastebin.addin.xml \
Resources/LodgeIt.xml \
Resources/Paste2.xml \
Resources/PasteUbuntu.xml \
Resources/PastebinCA.xml \
Resources/Pastebin.xml
+GENERATED_RESOURCES = \
+ Resources/Pastebin.addin.xml
+
REFERENCES = \
System \
System.Core \
@@ -344,6 +424,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -355,8 +436,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -370,14 +454,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -427,10 +509,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -513,16 +600,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/Pastebin/Resources/Pastebin.addin.xml b/Pastebin/Resources/Pastebin.addin.xml
deleted file mode 100644
index 6cea8e2..0000000
--- a/Pastebin/Resources/Pastebin.addin.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<Addin
- id="Pastebin"
- namespace="Do"
- version="1.1"
- name="Pastebin"
- description="Paste text to an online pastebin."
- author="Jason Jones"
- category="Official"
- defaultEnabled="false"
- url="http://do.davebsd.com/wiki/Pastebin_Plugin"
->
-
- <Runtime>
- <Import assembly="Pastebin.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <!-- Extensions included in this assembly -->
- <!-- Sources -->
- <Extension path= "/Do/Action">
- <Action type="Pastebin.PastebinAction" />
- </Extension>
-</Addin>
diff --git a/Pidgin/Makefile.am b/Pidgin/Makefile.am
index ecfdefe..33e3b96 100644
--- a/Pidgin/Makefile.am
+++ b/Pidgin/Makefile.am
@@ -18,15 +18,18 @@ FILES = \
src/PidginBrowseAccountItem.cs \
src/PidginBrowseStatusItem.cs
+GENERATED_RESOURCES = \
+ Resources/Pidgin.addin.xml
RESOURCES = \
- Resources/Pidgin.addin.xml \
Resources/icons/internet-group-chat.svg
+BUILD_DEFINES=$(DBUS_BUILD_DEFINES)
+
REFERENCES = \
System \
System.Xml \
System.Core \
- $(NDESK_DBUS_10_LIBS) \
- $(NDESK_DBUS_GLIB_LIBS) \
+ $(DBUS_SHARP_LIBS) \
+ $(DBUS_SHARP_GLIB_LIBS) \
$(DO_PLATFORM_LIBS) \
$(DO_UNIVERSE_LIBS)
diff --git a/Pidgin/Makefile.in b/Pidgin/Makefile.in
index 683b35e..9dfbc5a 100644
--- a/Pidgin/Makefile.in
+++ b/Pidgin/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = Pidgin
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -300,16 +378,19 @@ FILES = \
src/PidginBrowseAccountItem.cs \
src/PidginBrowseStatusItem.cs
+GENERATED_RESOURCES = \
+ Resources/Pidgin.addin.xml
+
RESOURCES = \
- Resources/Pidgin.addin.xml \
Resources/icons/internet-group-chat.svg
+BUILD_DEFINES = $(DBUS_BUILD_DEFINES)
REFERENCES = \
System \
System.Xml \
System.Core \
- $(NDESK_DBUS_10_LIBS) \
- $(NDESK_DBUS_GLIB_LIBS) \
+ $(DBUS_SHARP_LIBS) \
+ $(DBUS_SHARP_GLIB_LIBS) \
$(DO_PLATFORM_LIBS) \
$(DO_UNIVERSE_LIBS)
@@ -337,6 +418,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -348,8 +430,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -363,14 +448,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -420,10 +503,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -506,16 +594,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/Pidgin/Resources/Pidgin.addin.xml b/Pidgin/Resources/Pidgin.addin.xml
deleted file mode 100644
index 1b2240d..0000000
--- a/Pidgin/Resources/Pidgin.addin.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<Addin
- id="Pidgin"
- namespace="Do"
- version="2.1"
- name="Pidgin"
- description="Search buddies and initiate chats in Pidgin."
- author="David Siegel, Alex Launi, Chris Szikszoy"
- category="Official"
- defaultEnabled="false"
- url="http://do.davebsd.com/wiki/Pidgin_Plugin"
->
-
- <Runtime>
- <Import assembly="Pidgin.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <Extension path="/Do/ItemSource">
- <ItemSource type="PidginPlugin.PidginContactItemSource" />
- <ItemSource type="PidginPlugin.PidginAccountItemSource" />
- <ItemSource type="PidginPlugin.PidginSavedStatusItemSource" />
- </Extension>
-
- <Extension path= "/Do/Action">
- <Action type="PidginPlugin.PidginChatAction" />
- <Action type="PidginPlugin.PidginSetStatusAction" />
- <Action type="PidginPlugin.PidginEnableAccount" />
- <Action type="PidginPlugin.PidginDisableAccount" />
- </Extension>
-
-</Addin>
diff --git a/Pidgin/src/Pidgin.cs b/Pidgin/src/Pidgin.cs
index 447a83c..af2c37b 100644
--- a/Pidgin/src/Pidgin.cs
+++ b/Pidgin/src/Pidgin.cs
@@ -23,7 +23,12 @@ using System.Linq;
using System.Diagnostics;
using System.Collections.Generic;
+#if USE_DBUS_SHARP
+using DBus;
+#else
using NDesk.DBus;
+#endif
+
using org.freedesktop.DBus;
using Do.Platform;
diff --git a/PingFM/Makefile.am b/PingFM/Makefile.am
index aa4869d..c7737e4 100644
--- a/PingFM/Makefile.am
+++ b/PingFM/Makefile.am
@@ -14,8 +14,9 @@ FILES = \
src/PingFMServiceItem.cs \
src/PingFMServiceItemSource.cs
+GENERATED_RESOURCES = \
+ Resources/PingFM.addin.xml
RESOURCES = \
- Resources/PingFM.addin.xml \
Resources/icons/bebo.png \
Resources/icons/blogger.png \
Resources/icons/brightkite.png \
diff --git a/PingFM/Makefile.in b/PingFM/Makefile.in
index 421560a..14b0b3c 100644
--- a/PingFM/Makefile.in
+++ b/PingFM/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = PingFM
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -296,8 +374,10 @@ FILES = \
src/PingFMServiceItem.cs \
src/PingFMServiceItemSource.cs
+GENERATED_RESOURCES = \
+ Resources/PingFM.addin.xml
+
RESOURCES = \
- Resources/PingFM.addin.xml \
Resources/icons/bebo.png \
Resources/icons/blogger.png \
Resources/icons/brightkite.png \
@@ -370,6 +450,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -381,8 +462,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -396,14 +480,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -453,10 +535,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -539,16 +626,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/PingFM/Resources/PingFM.addin.xml b/PingFM/Resources/PingFM.addin.xml
deleted file mode 100644
index 1083917..0000000
--- a/PingFM/Resources/PingFM.addin.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<Addin
- id="PingFM"
- namespace= "Do"
- version="1.1"
- name="Ping.FM"
- description="Post microblog/status updates via Ping.FM"
- author="Peng Deng"
- category="Community"
- defaultEnabled="false"
- url="http://do.davebsd.com/wiki/Ping.FM_Plugin"
->
-
- <Runtime>
- <Import assembly="PingFM.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <Extension path="/Do/ItemSource">
- <ItemSource type="PingFM.PingFMServiceItemSource" />
- </Extension>
-
- <Extension path="/Do/Action">
- <Action type="PingFM.PingFMPost" />
- </Extension>
-</Addin>
diff --git a/Putty/Makefile.am b/Putty/Makefile.am
index ad4dec7..1e69deb 100644
--- a/Putty/Makefile.am
+++ b/Putty/Makefile.am
@@ -7,7 +7,7 @@ FILES = \
src/PuttySession.cs \
src/PuttySessionItemSource.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/Putty.addin.xml
REFERENCES = \
diff --git a/Putty/Makefile.in b/Putty/Makefile.in
index f1f0741..9d5b970 100644
--- a/Putty/Makefile.in
+++ b/Putty/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = Putty
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -289,7 +367,7 @@ FILES = \
src/PuttySession.cs \
src/PuttySessionItemSource.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/Putty.addin.xml
REFERENCES = \
@@ -323,6 +401,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -334,8 +413,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -349,14 +431,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -406,10 +486,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -492,16 +577,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/Putty/Resources/Putty.addin.xml b/Putty/Resources/Putty.addin.xml
deleted file mode 100644
index c14d537..0000000
--- a/Putty/Resources/Putty.addin.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<Addin
- id="Putty"
- namespace="Do"
- version="1.0"
- name="Putty"
- description="Access saved Putty sessions."
- author="Karol Będkowski"
- category="Community"
- defaultEnabled="false"
- >
-
- <Runtime>
- <Import assembly="Putty.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <!-- Extensions included in this assembly -->
- <!-- Sources -->
- <Extension path = "/Do/ItemSource">
- <ItemSource type="Putty.PuttySessionItemSource" />
- </Extension>
- <Extension path = "/Do/Action">
- <Action type="Putty.PuttyAction" />
- </Extension>
-</Addin>
diff --git a/Qalculate/Makefile.am b/Qalculate/Makefile.am
index 463b805..529a402 100644
--- a/Qalculate/Makefile.am
+++ b/Qalculate/Makefile.am
@@ -5,7 +5,7 @@ ASSEMBLY=Qalculate
FILES = \
src/QalculateAction.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/Qalculate.addin.xml
REFERENCES = \
diff --git a/Qalculate/Makefile.in b/Qalculate/Makefile.in
index 25da62b..b8a0bba 100644
--- a/Qalculate/Makefile.in
+++ b/Qalculate/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = Qalculate
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -287,7 +365,7 @@ ASSEMBLY = Qalculate
FILES = \
src/QalculateAction.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/Qalculate.addin.xml
REFERENCES = \
@@ -321,6 +399,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -332,8 +411,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -347,14 +429,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -404,10 +484,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -490,16 +575,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/Qalculate/Resources/Qalculate.addin.xml b/Qalculate/Resources/Qalculate.addin.xml
deleted file mode 100644
index 67b24cc..0000000
--- a/Qalculate/Resources/Qalculate.addin.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<Addin
- id="Qalculate"
- namespace= "Do"
- version="0.1"
- name="Qalculate"
- description="Perform calculations, and currency/quantity conversions."
- author="Peter Bjorn Jorgensen"
- category="Community"
- defaultEnabled="false"
->
-
- <Runtime>
- <Import assembly="Qalculate.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <Extension path= "/Do/Action">
- <Action type="Do.Plugins.QalculateAction" />
- </Extension>
-</Addin>
diff --git a/Quote/Makefile.am b/Quote/Makefile.am
index 210ae1d..06d0737 100644
--- a/Quote/Makefile.am
+++ b/Quote/Makefile.am
@@ -10,8 +10,9 @@ FILES = \
src/Providers/IQuoteProvider.cs \
src/Providers/QuoteProviderFactory.cs
+GENERATED_RESOURCES = \
+ Resources/Quote.addin.xml
RESOURCES = \
- Resources/Quote.addin.xml \
Resources/icons/quoted-globe.svg
REFERENCES = \
diff --git a/Quote/Makefile.in b/Quote/Makefile.in
index d193666..f280073 100644
--- a/Quote/Makefile.in
+++ b/Quote/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = Quote
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -292,8 +370,10 @@ FILES = \
src/Providers/IQuoteProvider.cs \
src/Providers/QuoteProviderFactory.cs
+GENERATED_RESOURCES = \
+ Resources/Quote.addin.xml
+
RESOURCES = \
- Resources/Quote.addin.xml \
Resources/icons/quoted-globe.svg
REFERENCES = \
@@ -329,6 +409,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -340,8 +421,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -355,14 +439,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -412,10 +494,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -498,16 +585,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/Quote/Resources/Quote.addin.xml b/Quote/Resources/Quote.addin.xml
deleted file mode 100644
index 851041b..0000000
--- a/Quote/Resources/Quote.addin.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<Addin
- id="Quote"
- namespace="Do"
- version="1.1"
- name="Quote"
- description="Post quotes to an online quoting service (e.g. BuBash.org)."
- author="Alex Launi, Jason Jones"
- category="Community"
- defaultEnabled="false"
->
-
- <Runtime>
- <Import assembly="Quote.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <!-- Extensions included in this assembly -->
- <!-- Sources -->
- <Extension path= "/Do/Action">
- <Action type="Quote.PostQuote" />
- </Extension>
-</Addin>
diff --git a/RSS/Makefile.am b/RSS/Makefile.am
index 4b4bb5c..a300542 100644
--- a/RSS/Makefile.am
+++ b/RSS/Makefile.am
@@ -30,8 +30,9 @@ FILES = \
gtk-gui/Do.Plugins.Rss.Configuration.cs \
gtk-gui/generated.cs
+GENERATED_RESOURCES = \
+ Resources/RSS.addin.xml
RESOURCES = \
- Resources/RSS.addin.xml \
Resources/icons/feed-icon.png \
gtk-gui/gui.stetic \
gtk-gui/objects.xml
diff --git a/RSS/Makefile.in b/RSS/Makefile.in
index d5b432c..d15c24d 100644
--- a/RSS/Makefile.in
+++ b/RSS/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = RSS
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -312,8 +390,10 @@ FILES = \
gtk-gui/Do.Plugins.Rss.Configuration.cs \
gtk-gui/generated.cs
+GENERATED_RESOURCES = \
+ Resources/RSS.addin.xml
+
RESOURCES = \
- Resources/RSS.addin.xml \
Resources/icons/feed-icon.png \
gtk-gui/gui.stetic \
gtk-gui/objects.xml
@@ -352,6 +432,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -363,8 +444,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -378,14 +462,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -435,10 +517,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -521,16 +608,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/RSS/Resources/RSS.addin.xml b/RSS/Resources/RSS.addin.xml
deleted file mode 100644
index ff7e9ff..0000000
--- a/RSS/Resources/RSS.addin.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<Addin
- id="RSS"
- namespace="Do"
- version="1.0"
- name="Simple RSS Reader"
- description="A simple RSS feed reader."
- author="Jason Imison"
- category="Community"
- defaultEnabled="false"
- >
-
- <Runtime>
- <Import assembly="RSS.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <Extension path = "/Do/ItemSource">
- <ItemSource type="Do.Plugins.Rss.RssItemSource" />
- <ItemSource type="Do.Plugins.Rss.FirefoxLiveBookmarksItemSource" />
- </Extension>
- <Extension path= "/Do/Action">
- <Action type="Do.Plugins.Rss.RssFeedAction" />
- </Extension>
-</Addin>
diff --git a/RememberTheMilk/Makefile.am b/RememberTheMilk/Makefile.am
index ea21a5b..127136b 100644
--- a/RememberTheMilk/Makefile.am
+++ b/RememberTheMilk/Makefile.am
@@ -64,8 +64,9 @@ FILES = \
src/RtmNet/User.cs \
src/RtmNet/Utils.cs
+GENERATED_RESOURCES = \
+ Resources/RTM.addin.xml
RESOURCES = \
- Resources/RTM.addin.xml \
Resources/icons/note-add.png \
Resources/icons/note-delete.png \
Resources/icons/rtm.png \
diff --git a/RememberTheMilk/Makefile.in b/RememberTheMilk/Makefile.in
index 057c81c..f75cd2d 100644
--- a/RememberTheMilk/Makefile.in
+++ b/RememberTheMilk/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = RememberTheMilk
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -346,8 +424,10 @@ FILES = \
src/RtmNet/User.cs \
src/RtmNet/Utils.cs
+GENERATED_RESOURCES = \
+ Resources/RTM.addin.xml
+
RESOURCES = \
- Resources/RTM.addin.xml \
Resources/icons/note-add.png \
Resources/icons/note-delete.png \
Resources/icons/rtm.png \
@@ -413,6 +493,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -424,8 +505,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -439,14 +523,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -496,10 +578,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -582,16 +669,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/RememberTheMilk/Resources/RTM.addin.xml b/RememberTheMilk/Resources/RTM.addin.xml
deleted file mode 100644
index 422863b..0000000
--- a/RememberTheMilk/Resources/RTM.addin.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<Addin
- id="RememberTheMilk"
- namespace= "Do"
- version="2.1"
- name="Remember The Milk"
- description="Manage tasks with Remember The Milk."
- author="Peng Deng, Jonathan Davies"
- category="Community"
- defaultEnabled="false"
- url="http://do.davebsd.com/wiki/Remember_The_Milk_Plugin"
->
-
- <Runtime>
- <Import assembly="RTM.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <!-- Extensions included in this assembly -->
- <Extension path="/Do/ItemSource">
- <ItemSource type="RememberTheMilk.RTMListItemSource" />
- <ItemSource type="RememberTheMilk.RTMLocationItemSource" />
- <ItemSource type="RememberTheMilk.RTMTaskItemSource" />
- <ItemSource type="RememberTheMilk.RTMTagItemSource" />
- </Extension>
-
- <Extension path="/Do/Action">
- <Action type="RememberTheMilk.RTMAddTags" />
- <Action type="RememberTheMilk.RTMNewList" />
- <Action type="RememberTheMilk.RTMNewNote" />
- <Action type="RememberTheMilk.RTMNewTask" />
- <Action type="RememberTheMilk.RTMDeleteList" />
- <Action type="RememberTheMilk.RTMDeleteNote" />
- <Action type="RememberTheMilk.RTMDeleteTags" />
- <Action type="RememberTheMilk.RTMDeleteTask" />
- <Action type="RememberTheMilk.RTMCompleteTask" />
- <Action type="RememberTheMilk.RTMSetPriority" />
- <Action type="RememberTheMilk.RTMSetDue" />
- <Action type="RememberTheMilk.RTMSetUrl" />
- <Action type="RememberTheMilk.RTMRenameList" />
- <Action type="RememberTheMilk.RTMMoveTask" />
- <Action type="RememberTheMilk.RTMRenameTask" />
- <Action type="RememberTheMilk.RTMPostponeTask" />
- <Action type="RememberTheMilk.RTMSetEstimate" />
- <Action type="RememberTheMilk.RTMSetLocation" />
- <Action type="RememberTheMilk.RTMSetRecurrence" />
- <Action type="RememberTheMilk.RTMUncompleteTask" />
- </Extension>
-</Addin>
diff --git a/RemindMe/Makefile.am b/RemindMe/Makefile.am
index 0c256e9..82404b6 100644
--- a/RemindMe/Makefile.am
+++ b/RemindMe/Makefile.am
@@ -8,8 +8,9 @@ FILES = \
src/SnoozeableReminder.cs \
src/StringExtensions.cs
+GENERATED_RESOURCES = \
+ Resources/RemindMe.addin.xml
RESOURCES = \
- Resources/RemindMe.addin.xml \
Resources/alarm.png \
Resources/snooze.png
diff --git a/RemindMe/Makefile.in b/RemindMe/Makefile.in
index 4505d49..02d51a8 100644
--- a/RemindMe/Makefile.in
+++ b/RemindMe/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = RemindMe
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -290,8 +368,10 @@ FILES = \
src/SnoozeableReminder.cs \
src/StringExtensions.cs
+GENERATED_RESOURCES = \
+ Resources/RemindMe.addin.xml
+
RESOURCES = \
- Resources/RemindMe.addin.xml \
Resources/alarm.png \
Resources/snooze.png
@@ -327,6 +407,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -338,8 +419,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -353,14 +437,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -410,10 +492,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -496,16 +583,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/RemindMe/Resources/RemindMe.addin.xml b/RemindMe/Resources/RemindMe.addin.xml
deleted file mode 100644
index 1e06074..0000000
--- a/RemindMe/Resources/RemindMe.addin.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<Addin
- id="RemindMe"
- namespace= "Do"
- version="1.0"
- name="Remind Me"
- description="Make small reminders."
- author="Chris Szikszoy, Daniel Foré"
- category="Community"
- defaultEnabled="false"
- url="http://do.davebsd.com/wiki/RemindMe_Plugin"
->
-
- <Runtime>
- <Import assembly="RemindMe.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <!-- Extensions included in this assembly -->
- <Extension path="/Do/Action">
- <Action type="RemindMe.RemindMe" />
- </Extension>
-</Addin>
diff --git a/RequestTracker/Makefile.am b/RequestTracker/Makefile.am
index 4eb7828..27307f6 100644
--- a/RequestTracker/Makefile.am
+++ b/RequestTracker/Makefile.am
@@ -11,8 +11,10 @@ FILES = \
src/RequestTrackerItem.cs \
src/RequestTrackerItems.cs
+GENERATED_RESOURCES = \
+ Resources/RequestTracker.addin.xml
+
RESOURCES = \
- Resources/RequestTracker.addin.xml \
Resources/icons/rt.png
REFERENCES = \
diff --git a/RequestTracker/Makefile.in b/RequestTracker/Makefile.in
index 361c0ff..5013991 100644
--- a/RequestTracker/Makefile.in
+++ b/RequestTracker/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = RequestTracker
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -293,8 +371,10 @@ FILES = \
src/RequestTrackerItem.cs \
src/RequestTrackerItems.cs
+GENERATED_RESOURCES = \
+ Resources/RequestTracker.addin.xml
+
RESOURCES = \
- Resources/RequestTracker.addin.xml \
Resources/icons/rt.png
REFERENCES = \
@@ -330,6 +410,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -341,8 +422,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -356,14 +440,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -413,10 +495,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -499,16 +586,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/RequestTracker/Resources/RequestTracker.addin.xml b/RequestTracker/Resources/RequestTracker.addin.xml
deleted file mode 100644
index 4c0ffaf..0000000
--- a/RequestTracker/Resources/RequestTracker.addin.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<Addin
- id="RequestTracker"
- namespace="Do"
- version="1.0"
- name="Request Tracker"
- description="Show tickets from Request Tracker."
- author="Chris Jones"
- category="Community"
- defaultEnabled="false"
- url="http://do.davebsd.com/wiki/RequestTracker_Plugin"
- >
-
- <Runtime>
- <Import assembly="RequestTracker.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <!-- Extensions included in this assembly -->
- <Extension path="/Do/Action">
- <Action type="RequestTracker.RTAction" />
- </Extension>
-
-</Addin>
diff --git a/Rhythmbox/Makefile.am b/Rhythmbox/Makefile.am
index 92818ee..068cce7 100644
--- a/Rhythmbox/Makefile.am
+++ b/Rhythmbox/Makefile.am
@@ -15,7 +15,7 @@ FILES = \
src/PreviousAction.cs \
src/PlayItemAction.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/Rhythmbox.addin.xml
REFERENCES = \
diff --git a/Rhythmbox/Makefile.in b/Rhythmbox/Makefile.in
index 7010e63..f6a2c7e 100644
--- a/Rhythmbox/Makefile.in
+++ b/Rhythmbox/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = Rhythmbox
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -297,7 +375,7 @@ FILES = \
src/PreviousAction.cs \
src/PlayItemAction.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/Rhythmbox.addin.xml
REFERENCES = \
@@ -332,6 +410,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -343,8 +422,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -358,14 +440,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -415,10 +495,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -501,16 +586,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/Rhythmbox/Resources/Rhythmbox.addin.xml b/Rhythmbox/Resources/Rhythmbox.addin.xml
deleted file mode 100644
index 1dc312c..0000000
--- a/Rhythmbox/Resources/Rhythmbox.addin.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<Addin
- id="Rhythmbox"
- namespace="Do"
- version="2.1"
- name="Rhythmbox"
- description="Search and play music in Rhythmbox."
- author="David Siegel"
- category="Official"
- defaultEnabled="false"
- url="http://do.davebsd.com/wiki/Rhythmbox_Plugin"
- >
-
- <Runtime>
- <Import assembly="Rhythmbox.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <Extension path = "/Do/ItemSource">
- <ItemSource type="Do.Rhythmbox.MusicItemSource" />
- </Extension>
- <Extension path= "/Do/Action">
- <Action type="Do.Rhythmbox.EnqueueAction" />
- <Action type="Do.Rhythmbox.PlayAction" />
- <Action type="Do.Rhythmbox.PlayItemAction" />
- <Action type="Do.Rhythmbox.PauseAction" />
- <Action type="Do.Rhythmbox.NextAction" />
- <Action type="Do.Rhythmbox.PreviousAction" />
- </Extension>
-</Addin>
diff --git a/Riptide/Makefile.am b/Riptide/Makefile.am
index a3925cd..3b5ae0d 100644
--- a/Riptide/Makefile.am
+++ b/Riptide/Makefile.am
@@ -7,7 +7,7 @@ FILES = \
src/TorrentResultItem.cs \
src/TorrentSearchAction.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/Riptide.addin.xml
REFERENCES = \
diff --git a/Riptide/Makefile.in b/Riptide/Makefile.in
index 739abc9..b3a5326 100644
--- a/Riptide/Makefile.in
+++ b/Riptide/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = Riptide
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -289,7 +367,7 @@ FILES = \
src/TorrentResultItem.cs \
src/TorrentSearchAction.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/Riptide.addin.xml
REFERENCES = \
@@ -325,6 +403,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -336,8 +415,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -351,14 +433,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -408,10 +488,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -494,16 +579,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/Riptide/Resources/Riptide.addin.xml b/Riptide/Resources/Riptide.addin.xml
deleted file mode 100644
index 5c8744b..0000000
--- a/Riptide/Resources/Riptide.addin.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<Addin
- id="Riptide"
- namespace="Do"
- version="1.0"
- name="Riptide"
- description="'Do' away with torrent sites!"
- author="Jason Smith"
- category="Community"
- defaultEnabled="false"
- >
-
- <Runtime>
- <Import assembly="Riptide.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <Extension path= "/Do/Action">
- <Action type="Do.Riptide.TorrentSearchAction" />
- <Action type="Do.Riptide.TorrentDownloadClientAction" />
- </Extension>
-
-</Addin>
diff --git a/SSH/Makefile.am b/SSH/Makefile.am
index 4da30bb..13228c8 100644
--- a/SSH/Makefile.am
+++ b/SSH/Makefile.am
@@ -7,7 +7,7 @@ FILES = \
src/SSHHostItem.cs \
src/SSHHostItemSource.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/SSH.addin.xml
REFERENCES = \
diff --git a/SSH/Makefile.in b/SSH/Makefile.in
index 8e32c71..2b815b6 100644
--- a/SSH/Makefile.in
+++ b/SSH/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = SSH
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -289,7 +367,7 @@ FILES = \
src/SSHHostItem.cs \
src/SSHHostItemSource.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/SSH.addin.xml
REFERENCES = \
@@ -323,6 +401,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -334,8 +413,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -349,14 +431,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -406,10 +486,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -492,16 +577,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/SSH/Resources/SSH.addin.xml b/SSH/Resources/SSH.addin.xml
deleted file mode 100644
index 485e9b9..0000000
--- a/SSH/Resources/SSH.addin.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<Addin
- id="SSH"
- namespace="Do"
- version="1.1"
- name="SSH"
- description="Search and connect to SSH hosts."
- author="Peter Stuifzand"
- category="Community"
- defaultEnabled="false"
- url="http://do.davebsd.com/wiki/SSH_Plugin"
- >
-
- <Runtime>
- <Import assembly="SSH.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <Extension path = "/Do/ItemSource">
- <ItemSource type="SSH.SSHHostItemSource" />
- </Extension>
- <Extension path = "/Do/Action">
- <Action type="SSH.SSHAction" />
- </Extension>
-</Addin>
diff --git a/Shelf/Makefile.am b/Shelf/Makefile.am
index 041b388..2a8a282 100644
--- a/Shelf/Makefile.am
+++ b/Shelf/Makefile.am
@@ -12,7 +12,7 @@ FILES = \
src/ShelfRenameShelfAction.cs \
src/ShelfDeleteShelfAction.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/Shelf.addin.xml
REFERENCES = \
diff --git a/Shelf/Makefile.in b/Shelf/Makefile.in
index 6cbbf89..71a729f 100644
--- a/Shelf/Makefile.in
+++ b/Shelf/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = Shelf
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -294,7 +372,7 @@ FILES = \
src/ShelfRenameShelfAction.cs \
src/ShelfDeleteShelfAction.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/Shelf.addin.xml
REFERENCES = \
@@ -327,6 +405,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -338,8 +417,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -353,14 +435,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -410,10 +490,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -496,16 +581,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/Shelf/Resources/Shelf.addin.xml b/Shelf/Resources/Shelf.addin.xml
deleted file mode 100644
index 2956c94..0000000
--- a/Shelf/Resources/Shelf.addin.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<Addin
- id="Shelf"
- namespace="Do"
- version="1.2"
- name="Shelf"
- description="Store items on a 'shelf' for quick access."
- author="Jason Smith"
- category="Community"
- defaultEnabled="false"
- url="http://do.davebsd.com/wiki/Shelf_Plugin"
- >
-
- <Runtime>
- <Import assembly="Shelf.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <Extension path="/Do/ItemSource">
- <ItemSource type="Shelf.ShelfItemSource" />
- </Extension>
-
- <Extension path="/Do/Action">
- <Action type="Shelf.ShelfAddToShelfAction" />
- <Action type="Shelf.ShelfCreateShelfAction" />
- <Action type="Shelf.ShelfExploreAction" />
- <Action type="Shelf.ShelfRemoveFromShelfAction" />
- <Action type="Shelf.ShelfRenameShelfAction" />
- <Action type="Shelf.ShelfDeleteShelfAction" />
- </Extension>
-
-</Addin>
diff --git a/Skype/Makefile.am b/Skype/Makefile.am
index b883622..4ac2d54 100644
--- a/Skype/Makefile.am
+++ b/Skype/Makefile.am
@@ -14,8 +14,9 @@ FILES = \
src/SkypeSetStatusAction.cs \
src/Skype.cs
+GENERATED_RESOURCES = \
+ Resources/Skype.addin.xml
RESOURCES = \
- Resources/Skype.addin.xml \
Resources/icons/CallStart.png \
Resources/icons/Message.png \
Resources/icons/SkypeOut.png \
@@ -28,11 +29,13 @@ RESOURCES = \
Resources/icons/StatusPending.png \
Resources/icons/StatusSkypeMe.png
+BUILD_DEFINES=$(DBUS_BUILD_DEFINES)
+
REFERENCES = \
System \
System.Core \
- $(NDESK_DBUS_10_LIBS) \
- $(NDESK_DBUS_GLIB_LIBS) \
+ $(DBUS_SHARP_LIBS) \
+ $(DBUS_SHARP_GLIB_LIBS) \
$(DO_PLATFORM_LIBS) \
$(DO_UNIVERSE_LIBS)
diff --git a/Skype/Makefile.in b/Skype/Makefile.in
index fe0ab64..699f6f8 100644
--- a/Skype/Makefile.in
+++ b/Skype/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = Skype
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -296,8 +374,10 @@ FILES = \
src/SkypeSetStatusAction.cs \
src/Skype.cs
+GENERATED_RESOURCES = \
+ Resources/Skype.addin.xml
+
RESOURCES = \
- Resources/Skype.addin.xml \
Resources/icons/CallStart.png \
Resources/icons/Message.png \
Resources/icons/SkypeOut.png \
@@ -310,11 +390,12 @@ RESOURCES = \
Resources/icons/StatusPending.png \
Resources/icons/StatusSkypeMe.png
+BUILD_DEFINES = $(DBUS_BUILD_DEFINES)
REFERENCES = \
System \
System.Core \
- $(NDESK_DBUS_10_LIBS) \
- $(NDESK_DBUS_GLIB_LIBS) \
+ $(DBUS_SHARP_LIBS) \
+ $(DBUS_SHARP_GLIB_LIBS) \
$(DO_PLATFORM_LIBS) \
$(DO_UNIVERSE_LIBS)
@@ -342,6 +423,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -353,8 +435,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -368,14 +453,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -425,10 +508,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -511,16 +599,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/Skype/Resources/Skype.addin.xml b/Skype/Resources/Skype.addin.xml
deleted file mode 100644
index ab89856..0000000
--- a/Skype/Resources/Skype.addin.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<Addin
- id="Skype"
- namespace="Do"
- version="2.0"
- name="Skype"
- description="Make calls, chats, change your status, and more."
- author="cszikszoy, kiwanami"
- category="Community"
- defaultEnabled="false"
- >
-
- <Runtime>
- <Import assembly="Skype.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <Extension path="/Do/Action">
- <Action type="Skype.SkypeCallAction" />
- <Action type="Skype.SkypeChatAction" />
- <Action type="Skype.SkypeSetStatusAction" />
- </Extension>
-
- <Extension path="/Do/ItemSource">
- <ItemSource type="Skype.SkypeContactItemSource" />
- <ItemSource type="Skype.SkypeStatusItemSource" />
- </Extension>
-</Addin>
diff --git a/Skype/src/Skype.cs b/Skype/src/Skype.cs
index fe5ccff..13a1a1f 100644
--- a/Skype/src/Skype.cs
+++ b/Skype/src/Skype.cs
@@ -23,7 +23,12 @@ using System.Diagnostics;
using System.Collections.Generic;
using System.Text.RegularExpressions;
+#if USE_DBUS_SHARP
+using DBus;
+#else
using NDesk.DBus;
+#endif
+
using org.freedesktop.DBus;
using Mono.Addins;
diff --git a/SqueezeCenter/Makefile.am b/SqueezeCenter/Makefile.am
index 15921f6..35e3bea 100644
--- a/SqueezeCenter/Makefile.am
+++ b/SqueezeCenter/Makefile.am
@@ -36,7 +36,9 @@ RESOURCES = \
Resources/icons/SB_off.png \
Resources/icons/SB_on.png \
Resources/icons/sync.png \
- Resources/icons/unsync.png \
+ Resources/icons/unsync.png
+
+GENERATED_RESOURCES = \
Resources/SqueezeCenter.addin.xml
REFERENCES = \
diff --git a/SqueezeCenter/Makefile.in b/SqueezeCenter/Makefile.in
index cba8e2f..e63b617 100644
--- a/SqueezeCenter/Makefile.in
+++ b/SqueezeCenter/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = SqueezeCenter
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -318,7 +396,9 @@ RESOURCES = \
Resources/icons/SB_off.png \
Resources/icons/SB_on.png \
Resources/icons/sync.png \
- Resources/icons/unsync.png \
+ Resources/icons/unsync.png
+
+GENERATED_RESOURCES = \
Resources/SqueezeCenter.addin.xml
REFERENCES = \
@@ -352,6 +432,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -363,8 +444,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -378,14 +462,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -435,10 +517,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -521,16 +608,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/SqueezeCenter/Resources/SqueezeCenter.addin.xml b/SqueezeCenter/Resources/SqueezeCenter.addin.xml
deleted file mode 100644
index e3067fa..0000000
--- a/SqueezeCenter/Resources/SqueezeCenter.addin.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<Addin
- id="SqueezeCenter"
- namespace="Do"
- version="1.3"
- name="SqueezeCenter"
- description="Control Logitech Squeezebox and Transport audio players."
- author="Anders Thomsen"
- category="Community"
- defaultEnabled="false"
- >
-
- <Runtime>
- <Import assembly="SqueezeCenter.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <!-- Extensions included in this assembly -->
- <Extension path="/Do/Action">
- <Action type="SqueezeCenter.Enqueue" />
- <Action type="SqueezeCenter.Play" />
- <Action type="SqueezeCenter.PlayerCommands.TurnOn" />
- <Action type="SqueezeCenter.PlayerCommands.TurnOff" />
- <Action type="SqueezeCenter.PlayerCommands.Pause" />
- <Action type="SqueezeCenter.PlayerCommands.Play" />
- <Action type="SqueezeCenter.PlayerCommands.Sync" />
- <Action type="SqueezeCenter.PlayerCommands.Unsync" />
- <Action type="SqueezeCenter.PlayerCommands.Prev" />
- <Action type="SqueezeCenter.PlayerCommands.Next" />
- </Extension>
-
- <Extension path="/Do/ItemSource">
- <ItemSource type="SqueezeCenter.ItemSource" />
- </Extension>
-
-</Addin>
diff --git a/StockQuote/Makefile.am b/StockQuote/Makefile.am
index 4b978f4..3a24552 100644
--- a/StockQuote/Makefile.am
+++ b/StockQuote/Makefile.am
@@ -5,8 +5,9 @@ ASSEMBLY=StockQuote
FILES = \
src/StockQuoteAction.cs
+GENERATED_RESOURCES = \
+ Resources/StockQuote.addin.xml
RESOURCES = \
- Resources/StockQuote.addin.xml \
Resources/icons/stock.png
REFERENCES = \
diff --git a/StockQuote/Makefile.in b/StockQuote/Makefile.in
index 74b70bb..3bffd07 100644
--- a/StockQuote/Makefile.in
+++ b/StockQuote/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = StockQuote
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -287,8 +365,10 @@ ASSEMBLY = StockQuote
FILES = \
src/StockQuoteAction.cs
+GENERATED_RESOURCES = \
+ Resources/StockQuote.addin.xml
+
RESOURCES = \
- Resources/StockQuote.addin.xml \
Resources/icons/stock.png
REFERENCES = \
@@ -321,6 +401,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -332,8 +413,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -347,14 +431,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -404,10 +486,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -490,16 +577,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/StockQuote/Resources/StockQuote.addin.xml b/StockQuote/Resources/StockQuote.addin.xml
deleted file mode 100644
index ca021b2..0000000
--- a/StockQuote/Resources/StockQuote.addin.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<Addin
- id="StockQuote"
- namespace="Do"
- version="1.0"
- name="Stock Quote"
- description="Get live stock quotes from Google Finance."
- author="DR Colkitt"
- category="Community"
- defaultEnabled="false"
- >
-
- <Runtime>
- <Import assembly="StockQuote.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <!-- Extensions included in this assembly -->
- <Extension path="/Do/Action">
- <Action type="StockQuote.QuoteAction" />
- </Extension>
-
-</Addin>
diff --git a/SystemServices/Makefile.am b/SystemServices/Makefile.am
index 967ef74..3000ef1 100644
--- a/SystemServices/Makefile.am
+++ b/SystemServices/Makefile.am
@@ -12,7 +12,7 @@ FILES = \
gtk-gui/generated.cs \
gtk-gui/SystemServices.SystemServicesConfig.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/SystemServices.addin.xml
REFERENCES = \
diff --git a/SystemServices/Makefile.in b/SystemServices/Makefile.in
index cba977c..b3e4d36 100644
--- a/SystemServices/Makefile.in
+++ b/SystemServices/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = SystemServices
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -294,7 +372,7 @@ FILES = \
gtk-gui/generated.cs \
gtk-gui/SystemServices.SystemServicesConfig.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/SystemServices.addin.xml
REFERENCES = \
@@ -330,6 +408,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -341,8 +420,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -356,14 +438,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -413,10 +493,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -499,16 +584,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/SystemServices/Resources/SystemServices.addin.xml b/SystemServices/Resources/SystemServices.addin.xml
deleted file mode 100644
index f2c6625..0000000
--- a/SystemServices/Resources/SystemServices.addin.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<Addin
- id="SystemServices"
- namespace="Do"
- version="1.0"
- name="System Services"
- description="Start, stop, and restart system services."
- author="Karol Będkowski, David Siegel"
- category="Community"
- defaultEnabled="false"
- >
-
- <Runtime>
- <Import assembly="SystemServices.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <Extension path = "/Do/ItemSource">
- <ItemSource type="SystemServices.ServiceItemSource" />
- </Extension>
- <Extension path = "/Do/Action">
- <Action type="SystemServices.ServiceRestartAction" />
- <Action type="SystemServices.ServiceStopAction" />
- <Action type="SystemServices.ServiceStartAction" />
- </Extension>
-</Addin>
diff --git a/Tasque/Makefile.am b/Tasque/Makefile.am
index d7a3b61..44a8df7 100644
--- a/Tasque/Makefile.am
+++ b/Tasque/Makefile.am
@@ -8,14 +8,16 @@ FILES = \
src/Tasque.cs \
src/TasqueAction.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/Tasque.addin.xml
+BUILD_DEFINES=$(DBUS_BUILD_DEFINES)
+
REFERENCES = \
System \
System.Core \
- $(NDESK_DBUS_10_LIBS) \
- $(NDESK_DBUS_GLIB_LIBS) \
+ $(DBUS_SHARP_LIBS) \
+ $(DBUS_SHARP_GLIB_LIBS) \
$(GCONF_SHARP_20_LIBS) \
$(DO_PLATFORM_LIBS) \
$(DO_UNIVERSE_LIBS)
diff --git a/Tasque/Makefile.in b/Tasque/Makefile.in
index 5be4c32..f2a8945 100644
--- a/Tasque/Makefile.in
+++ b/Tasque/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = Tasque
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -290,14 +368,15 @@ FILES = \
src/Tasque.cs \
src/TasqueAction.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/Tasque.addin.xml
+BUILD_DEFINES = $(DBUS_BUILD_DEFINES)
REFERENCES = \
System \
System.Core \
- $(NDESK_DBUS_10_LIBS) \
- $(NDESK_DBUS_GLIB_LIBS) \
+ $(DBUS_SHARP_LIBS) \
+ $(DBUS_SHARP_GLIB_LIBS) \
$(GCONF_SHARP_20_LIBS) \
$(DO_PLATFORM_LIBS) \
$(DO_UNIVERSE_LIBS)
@@ -326,6 +405,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -337,8 +417,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -352,14 +435,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -409,10 +490,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -495,16 +581,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/Tasque/Resources/Tasque.addin.xml b/Tasque/Resources/Tasque.addin.xml
deleted file mode 100644
index 5c8ae17..0000000
--- a/Tasque/Resources/Tasque.addin.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<Addin
- id="Tasque"
- namespace="Do"
- version="1.0"
- name="Tasque"
- description="Create new tasks in Tasque."
- author="Guillaume Béland"
- category="Community"
- defaultEnabled="false"
- url="http://do.davebsd.com/wiki/Tasque_Plugin"
- >
-
- <Runtime>
- <Import assembly="Tasque.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <!-- Extensions included in this assembly -->
- <!-- Sources -->
- <Extension path = "/Do/Action">
- <Action type="Tasque.TasqueCreateTask" />
- </Extension>
-</Addin>
diff --git a/Tasque/src/Tasque.cs b/Tasque/src/Tasque.cs
index 038911e..85db8ab 100644
--- a/Tasque/src/Tasque.cs
+++ b/Tasque/src/Tasque.cs
@@ -39,6 +39,7 @@ namespace Tasque
} catch (Exception e) {
Log.Error ("Could not read Tasque's category: {0}", e.Message);
Log.Debug (e.StackTrace);
+ categories = new string[] {};
}
return categories.Select (category => new TasqueCategoryItem (category));
}
diff --git a/Tasque/src/TasqueDBus.cs b/Tasque/src/TasqueDBus.cs
index 2095fb5..fb22e81 100644
--- a/Tasque/src/TasqueDBus.cs
+++ b/Tasque/src/TasqueDBus.cs
@@ -21,7 +21,12 @@ using System;
using System.Linq;
using System.Collections.Generic;
+#if USE_DBUS_SHARP
+using DBus;
+#else
using NDesk.DBus;
+#endif
+
using org.freedesktop.DBus;
using Do.Platform;
diff --git a/TerminalServerClient/Makefile.am b/TerminalServerClient/Makefile.am
index 8f19f7d..e6d694f 100644
--- a/TerminalServerClient/Makefile.am
+++ b/TerminalServerClient/Makefile.am
@@ -6,7 +6,7 @@ FILES = \
src/TSClientItem.cs \
src/TSClientItemSource.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/TerminalServerClient.addin.xml
REFERENCES = \
diff --git a/TerminalServerClient/Makefile.in b/TerminalServerClient/Makefile.in
index 1e7931a..9a9e289 100644
--- a/TerminalServerClient/Makefile.in
+++ b/TerminalServerClient/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = TerminalServerClient
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -288,7 +366,7 @@ FILES = \
src/TSClientItem.cs \
src/TSClientItemSource.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/TerminalServerClient.addin.xml
REFERENCES = \
@@ -322,6 +400,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -333,8 +412,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -348,14 +430,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -405,10 +485,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -491,16 +576,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/TerminalServerClient/Resources/TerminalServerClient.addin.xml b/TerminalServerClient/Resources/TerminalServerClient.addin.xml
deleted file mode 100644
index 5b7c059..0000000
--- a/TerminalServerClient/Resources/TerminalServerClient.addin.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<Addin
- id="TerminalServerClient"
- namespace="Do"
- version="1.1"
- name="Terminal Server Client"
- description="Search and open Terminal Server Client connections."
- author="Ankit Solanki"
- category="Community"
- defaultEnabled="false"
- url="http://do.davebsd.com/wiki/Terminal_Server_Client_Plugin"
- >
-
- <Runtime>
- <Import assembly="TerminalServerClient.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <!-- Extensions included in this assembly -->
- <Extension path="/Do/ItemSource">
- <ItemSource type="TSClient.TSClientItemSource" />
- </Extension>
-
-</Addin>
diff --git a/Text/Makefile.am b/Text/Makefile.am
index 65bebc7..736d887 100644
--- a/Text/Makefile.am
+++ b/Text/Makefile.am
@@ -5,7 +5,7 @@ ASSEMBLY=Text
FILES = \
src/AppendTextAction.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/Text.addin.xml
REFERENCES = \
diff --git a/Text/Makefile.in b/Text/Makefile.in
index 5a63bc9..9c3f901 100644
--- a/Text/Makefile.in
+++ b/Text/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = Text
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -287,7 +365,7 @@ ASSEMBLY = Text
FILES = \
src/AppendTextAction.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/Text.addin.xml
REFERENCES = \
@@ -320,6 +398,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -331,8 +410,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -346,14 +428,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -403,10 +483,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -489,16 +574,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/Text/Resources/Text.addin.xml b/Text/Resources/Text.addin.xml
deleted file mode 100644
index 3c7d8de..0000000
--- a/Text/Resources/Text.addin.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<Addin
- id="Text"
- namespace="Do"
- version="1.0"
- name="Text"
- description="Play with text! What could be more fun?"
- author="David Siegel"
- category="Community"
- defaultEnabled="false"
- >
-
- <Runtime>
- <Import assembly="Text.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <!-- Extensions included in this assembly -->
- <Extension path= "/Do/Action">
- <Action type="Text.AppendTextAction" />
- </Extension>
-</Addin>
diff --git a/Thunderbird/Makefile.am b/Thunderbird/Makefile.am
index 6bd6f2d..bd9b197 100644
--- a/Thunderbird/Makefile.am
+++ b/Thunderbird/Makefile.am
@@ -6,9 +6,10 @@ FILES = \
src/Mork.cs \
src/ThunderbirdContactItemSource.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/Thunderbird.addin.xml
REFERENCES = \
System \
- $(DO_UNIVERSE_LIBS)
+ $(DO_UNIVERSE_LIBS) \
+ $(DO_PLATFORM_LIBS)
diff --git a/Thunderbird/Makefile.in b/Thunderbird/Makefile.in
index 1f4bc8c..eda1e3b 100644
--- a/Thunderbird/Makefile.in
+++ b/Thunderbird/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = Thunderbird
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -288,12 +366,13 @@ FILES = \
src/Mork.cs \
src/ThunderbirdContactItemSource.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/Thunderbird.addin.xml
REFERENCES = \
System \
- $(DO_UNIVERSE_LIBS)
+ $(DO_UNIVERSE_LIBS) \
+ $(DO_PLATFORM_LIBS)
all: all-am
@@ -319,6 +398,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -330,8 +410,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -345,14 +428,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -402,10 +483,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -488,16 +574,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/Thunderbird/Resources/Thunderbird.addin.xml b/Thunderbird/Resources/Thunderbird.addin.xml
deleted file mode 100644
index c4233dc..0000000
--- a/Thunderbird/Resources/Thunderbird.addin.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<Addin
- id="Thunderbird"
- namespace="Do"
- version="1.0"
- name="Thunderbird"
- description="Search your Thunderbird contacts."
- author="David Siegel"
- category="Community"
- defaultEnabled="false"
- >
-
- <Runtime>
- <Import assembly="Thunderbird.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <!-- Extensions included in this assembly -->
- <Extension path = "/Do/ItemSource">
- <ItemSource type="Do.Addins.Thunderbird.ThunderbirdContactItemSource" />
- </Extension>
-</Addin>
diff --git a/Thunderbird/src/ThunderbirdContactItemSource.cs b/Thunderbird/src/ThunderbirdContactItemSource.cs
index c05689a..0d345c8 100644
--- a/Thunderbird/src/ThunderbirdContactItemSource.cs
+++ b/Thunderbird/src/ThunderbirdContactItemSource.cs
@@ -17,14 +17,13 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-//
-
using System;
using System.IO;
using System.Collections;
using System.Collections.Generic;
using Do.Universe;
+using Do.Platform;
using Beagle.Util;
@@ -33,22 +32,107 @@ namespace Do.Addins.Thunderbird
public class ThunderbirdContactItemSource : ItemSource
{
-
+
+ class EmailContactDetail: Item, IContactDetailItem
+ {
+ readonly string detail, description;
+ readonly ContactItem owner;
+
+ public EmailContactDetail (ContactItem owner, string detail)
+ {
+ this.owner = owner;
+ this.detail = detail;
+ description = string.IsNullOrEmpty (owner ["name"])
+ ? owner [detail]
+ : owner ["name"];
+ }
+
+ public override string Name {
+ get { return owner [detail]; }
+ }
+
+ public override string Description {
+ get { return description; }
+ }
+
+ public override string Icon {
+ get { return "thunderbird"; }
+ }
+
+ public string Key {
+ get { return detail; }
+ }
+
+ public string Value {
+ get { return owner [detail]; }
+ }
+ }
+
+ class EmailList
+ {
+ private Dictionary<string, uint> set;
+
+ public EmailList ()
+ {
+ set = new Dictionary<string, uint> ();
+ }
+
+ public void Add (string email, uint popularity)
+ {
+ if (!set.ContainsKey (email)) {
+ set.Add (email, popularity);
+ } else {
+ set [email] += popularity;
+ }
+ }
+
+ public bool Contains (string email)
+ {
+ return set.ContainsKey (email);
+ }
+
+ public uint this [string email] {
+ get { return set [email]; }
+ }
+
+ public int Count {
+ get { return set.Count; }
+ }
+
+ public ICollection<string> Keys {
+ get { return set.Keys; }
+ }
+ }
+
+ class ThunderbirdEmail
+ {
+ public readonly string email;
+ public readonly uint popularity;
+
+ public ThunderbirdEmail (string email, uint popularity)
+ {
+ this.email = email;
+ this.popularity = popularity;
+ }
+ }
+
+
const string BeginProfileName = "Path=";
const string BeginDefaultProfile = "Name=default";
-
- List<Item> contacts;
+ const string THUNDERBIRD_EMAIL = "email.thunderbird";
+ static readonly char[] nameDelimiters = { ' ', '\'', '"' };
+
+ Dictionary<string, Item> contacts; // name => ContactItem
public ThunderbirdContactItemSource ()
{
- contacts = new List<Item> ();
- UpdateItems ();
+ contacts = new Dictionary<string, Item> ();
}
public override IEnumerable<Type> SupportedItemTypes {
get {
return new Type[] {
- typeof (ContactItem),
+ typeof(ContactItem),
};
}
}
@@ -56,79 +140,132 @@ namespace Do.Addins.Thunderbird
public override string Name { get { return "Thunderbird Contacts"; } }
public override string Description { get { return "Thunderbird Contacts"; } }
public override string Icon { get { return "thunderbird"; } }
-
+
public override void UpdateItems ()
{
try {
_UpdateItems ();
} catch (Exception e) {
- Console.Error.WriteLine ("Cannot index Thunderbird contacts because a {0} was thrown: {1}", e.GetType (), e.Message);
+ Log<ThunderbirdContactItemSource>.Error ("Cannot index Thunderbird contacts because a {0} was thrown: {1}", e.GetType (), e.Message);
return;
}
}
public override IEnumerable<Item> Items {
- get { return contacts; }
+ get { return contacts.Values; }
}
public override IEnumerable<Item> ChildrenOfItem (Item item)
{
+ ContactItem contact = item as ContactItem;
+
+ foreach (string detail in contact.Details) {
+ if (detail.StartsWith (THUNDERBIRD_EMAIL)) {
+ yield return new EmailContactDetail (contact, detail);
+ }
+ }
yield break;
}
void _UpdateItems ()
{
- MorkDatabase database;
-
+ MorkDatabase abook, history;
+ Dictionary<string, EmailList> emails = new Dictionary<string, EmailList> ();
+
+ abook = new MorkDatabase (GetThunderbirdAddressBookFilePath ());
+ abook.Read ();
+ abook.EnumNamespace = "ns:addrbk:db:row:scope:card:all";
+
+ history = new MorkDatabase (GetThunderbirdHistoryFilePath ());
+ history.Read ();
+ history.EnumNamespace = "ns:addrbk:db:row:scope:card:all";
+
+ addEmails (emails, history);
+ addEmails (emails, abook);
+
contacts.Clear ();
- database = new MorkDatabase (GetThunderbirdAddressBookFilePath ());
- database.Read ();
- database.EnumNamespace = "ns:addrbk:db:row:scope:card:all";
+ foreach (string name in emails.Keys) {
+ CreateThunderbirdContactItem (name, emails [name]);
+ }
+ }
+ void addEmails (Dictionary<string, EmailList> emails, MorkDatabase database)
+ {
foreach (string id in database) {
- Hashtable contact_row;
- ContactItem contact;
-
- contact_row = database.Compile (id, database.EnumNamespace);
- contact = CreateThunderbirdContactItem (contact_row);
- if (contact != null)
- contacts.Add (contact);
+ Hashtable contact_row = database.Compile (id, database.EnumNamespace);
+ AddThunderbirdEmail (emails, contact_row);
}
}
- ContactItem CreateThunderbirdContactItem (Hashtable row) {
- ContactItem contact;
+ void AddThunderbirdEmail (Dictionary<string, EmailList> emails, Hashtable row)
+ {
string name, email;
-
-// foreach (object o in row.Keys)
-// Console.WriteLine ("\t{0} --> {1}", o, row[o]);
+ uint popularity;
// I think this will detect deleted contacts... Hmm...
- if (row["table"] == null || row["table"] as string == "C6")
- return null;
+ if (row ["table"] == null || row ["table"] as string == "C6")
+ return;
// Name
- name = row["DisplayName"] as string;
+ name = row ["DisplayName"] as string;
+ if (name != null) {
+ name = name.Trim (nameDelimiters);
+ }
if (name == null || name == string.Empty)
- name = string.Format ("{0} {1}", row["FirstName"], row["LastName"]);
- contact = ContactItem.Create (name);
+ name = string.Format ("{0} {1}", row ["FirstName"], row ["LastName"]);
// Email
- email = row["PrimaryEmail"] as string;
- if (email != null && email != string.Empty)
- contact["email"] = email;
+ email = row ["PrimaryEmail"] as string;
+ string p = row ["PopularityIndex"] as string;
+ try {
+ popularity = UInt32.Parse (p, System.Globalization.NumberStyles.HexNumber);
+ } catch (Exception) {
+ popularity = 0;
+ }
- return contact;
+ if (name == null || name.Trim () == string.Empty)
+ name = email;
+
+ if (string.IsNullOrEmpty (email))
+ return;
+
+ if (!emails.ContainsKey (name)) {
+ emails [name] = new EmailList ();
+ }
+ emails [name].Add (email, popularity);
}
-
- string GetThunderbirdAddressBookFilePath ()
+
+ void CreateThunderbirdContactItem (string name, EmailList emails)
+ {
+ int emailCount = emails.Count;
+ ThunderbirdEmail[] sortedEmails = new ThunderbirdEmail[emailCount];
+
+ int i = 0;
+ foreach (string key in emails.Keys) {
+ sortedEmails [i] = new ThunderbirdEmail (key, emails [key]);
+ i++;
+ }
+ Array.Sort (sortedEmails, (x, y) => (int)(y.popularity - x.popularity));
+
+ ContactItem contact = ContactItem.Create (name);
+ for (i = 0; i < emailCount; i++) {
+ string detail = THUNDERBIRD_EMAIL + "." + i;
+ contact [detail] = sortedEmails [i].email;
+ }
+
+ if (!contacts.ContainsKey (name.ToLower ())) {
+ contacts.Add (name.ToLower (), contact);
+ }
+ }
+
+ string GetThunderbirdDefaultProfilePath ()
{
string home, path, profile;
StreamReader reader;
profile = null;
home = System.Environment.GetFolderPath (System.Environment.SpecialFolder.Personal);
- path = System.IO.Path.Combine (home, ".mozilla-thunderbird/profiles.ini");
+ path = System.IO.Path.Combine (home, ".thunderbird/profiles.ini");
try {
reader = System.IO.File.OpenText (path);
} catch {
@@ -142,22 +279,36 @@ namespace Do.Addins.Thunderbird
line = line.Substring (BeginProfileName.Length);
profile = line;
break;
- }
- else if (line.StartsWith (BeginDefaultProfile)) {
+ } else if (line.StartsWith (BeginDefaultProfile)) {
got_default = true;
}
}
reader.Close ();
-
+ return profile;
+ }
+
+ string GetThunderbirdFilePath (string filename)
+ {
+ string path, home, profile;
+ home = System.Environment.GetFolderPath (System.Environment.SpecialFolder.Personal);
+ profile = GetThunderbirdDefaultProfilePath ();
if (profile == null) {
return null;
}
- path = System.IO.Path.Combine (home, ".mozilla-thunderbird");
+ path = System.IO.Path.Combine (home, ".thunderbird");
path = System.IO.Path.Combine (path, profile);
- path = System.IO.Path.Combine (path, "abook.mab");
+ path = System.IO.Path.Combine (path, filename);
return path;
-
}
+ string GetThunderbirdHistoryFilePath ()
+ {
+ return GetThunderbirdFilePath ("history.mab");
+ }
+
+ string GetThunderbirdAddressBookFilePath ()
+ {
+ return GetThunderbirdFilePath ("abook.mab");
+ }
}
}
diff --git a/TinyUrl/Makefile.am b/TinyUrl/Makefile.am
index 22cd88f..bc9e434 100644
--- a/TinyUrl/Makefile.am
+++ b/TinyUrl/Makefile.am
@@ -5,7 +5,7 @@ ASSEMBLY=TinyUrl
FILES = \
src/TinyUrl/MakeUrlTinyAction.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/TinyUrl.addin.xml
REFERENCES = \
diff --git a/TinyUrl/Makefile.in b/TinyUrl/Makefile.in
index b2929ce..0b3a35a 100644
--- a/TinyUrl/Makefile.in
+++ b/TinyUrl/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = TinyUrl
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -287,7 +365,7 @@ ASSEMBLY = TinyUrl
FILES = \
src/TinyUrl/MakeUrlTinyAction.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/TinyUrl.addin.xml
REFERENCES = \
@@ -321,6 +399,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -332,8 +411,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -347,14 +429,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -404,10 +484,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -490,16 +575,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/TinyUrl/Resources/TinyUrl.addin.xml b/TinyUrl/Resources/TinyUrl.addin.xml
deleted file mode 100644
index 8d199a6..0000000
--- a/TinyUrl/Resources/TinyUrl.addin.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<Addin
- id="TinyUrl"
- namespace="Do"
- version="1.0"
- name="TinyUrl"
- description="Make unwieldy urls tiny."
- author="David Siegel"
- category="Official"
- defaultEnabled="false"
- url="http://do.davebsd.com/wiki/TinyUrl_Plugin"
- >
-
- <Runtime>
- <Import assembly="TinyUrl.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <Extension path="/Do/Action">
- <Action type="TinyUrl.MakeUrlTinyAction" />
- </Extension>
-</Addin>
diff --git a/Tomboy/Makefile.am b/Tomboy/Makefile.am
index a0c12fa..35c9aa2 100644
--- a/Tomboy/Makefile.am
+++ b/Tomboy/Makefile.am
@@ -13,14 +13,16 @@ FILES = \
src/TomboyBrowseNotesItem.cs \
gtk-gui/Tomboy.TomboyConfiguration.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/Tomboy.addin.xml
+BUILD_DEFINES=$(DBUS_BUILD_DEFINES)
+
REFERENCES = \
System \
System.Core \
- $(NDESK_DBUS_10_LIBS) \
- $(NDESK_DBUS_GLIB_10_LIBS) \
+ $(DBUS_SHARP_LIBS) \
+ $(DBUS_SHARP_GLIB_LIBS) \
$(GTK_SHARP_20_LIBS) \
$(DO_PLATFORM_LIBS) \
$(DO_PLATFORM_LINUX_LIBS) \
diff --git a/Tomboy/Makefile.in b/Tomboy/Makefile.in
index 5c6532a..389b678 100644
--- a/Tomboy/Makefile.in
+++ b/Tomboy/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = Tomboy
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -295,14 +373,15 @@ FILES = \
src/TomboyBrowseNotesItem.cs \
gtk-gui/Tomboy.TomboyConfiguration.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/Tomboy.addin.xml
+BUILD_DEFINES = $(DBUS_BUILD_DEFINES)
REFERENCES = \
System \
System.Core \
- $(NDESK_DBUS_10_LIBS) \
- $(NDESK_DBUS_GLIB_10_LIBS) \
+ $(DBUS_SHARP_LIBS) \
+ $(DBUS_SHARP_GLIB_LIBS) \
$(GTK_SHARP_20_LIBS) \
$(DO_PLATFORM_LIBS) \
$(DO_PLATFORM_LINUX_LIBS) \
@@ -332,6 +411,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -343,8 +423,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -358,14 +441,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -415,10 +496,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -501,16 +587,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/Tomboy/Resources/Tomboy.addin.xml b/Tomboy/Resources/Tomboy.addin.xml
deleted file mode 100644
index 5222011..0000000
--- a/Tomboy/Resources/Tomboy.addin.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<Addin
- id="Tomboy"
- namespace="Do"
- version="1.4"
- name="Tomboy"
- description="Search and create new Tomboy notes."
- author="Rick Harding, Chris Szikszoy"
- category="Official"
- defaultEnabled="false"
- url="http://do.davebsd.com/wiki/Tomboy_Plugin"
- >
-
- <Runtime>
- <Import assembly="Tomboy.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <Extension path="/Do/ItemSource">
- <ItemSource type="Tomboy.NotesItemSource" />
- </Extension>
- <Extension path="/Do/Action">
- <Action type="Tomboy.NewNoteAction" />
- <Action type="Tomboy.SearchNotesAction" />
- </Extension>
-</Addin>
diff --git a/Tomboy/src/TomboyDBus.cs b/Tomboy/src/TomboyDBus.cs
index 9a4b715..ba05fd9 100644
--- a/Tomboy/src/TomboyDBus.cs
+++ b/Tomboy/src/TomboyDBus.cs
@@ -20,7 +20,12 @@
using System;
using System.Collections;
+#if USE_DBUS_SHARP
+using DBus;
+#else
using NDesk.DBus;
+#endif
+
using org.freedesktop.DBus;
namespace Tomboy
diff --git a/Tracker/Makefile.am b/Tracker/Makefile.am
index ae279ad..9772c1e 100644
--- a/Tracker/Makefile.am
+++ b/Tracker/Makefile.am
@@ -10,9 +10,11 @@ FILES = \
RESOURCES = \
Resources/TrackerSearch.addin.xml
+BUILD_DEFINES=$(DBUS_BUILD_DEFINES)
+
REFERENCES = \
System \
System.Core \
- $(NDESK_DBUS_10_LIBS) \
+ $(DBUS_SHARP_LIBS) \
$(DO_PLATFORM_LIBS) \
$(DO_UNIVERSE_LIBS)
diff --git a/Tracker/Makefile.in b/Tracker/Makefile.in
index f7990c1..8f7ca11 100644
--- a/Tracker/Makefile.in
+++ b/Tracker/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = Tracker
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -292,10 +370,11 @@ FILES = \
RESOURCES = \
Resources/TrackerSearch.addin.xml
+BUILD_DEFINES = $(DBUS_BUILD_DEFINES)
REFERENCES = \
System \
System.Core \
- $(NDESK_DBUS_10_LIBS) \
+ $(DBUS_SHARP_LIBS) \
$(DO_PLATFORM_LIBS) \
$(DO_UNIVERSE_LIBS)
@@ -323,6 +402,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -334,8 +414,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -349,14 +432,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -406,10 +487,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -492,16 +578,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/Tracker/src/ITrackerSearch.cs b/Tracker/src/ITrackerSearch.cs
index 1e4e140..f7b9fac 100644
--- a/Tracker/src/ITrackerSearch.cs
+++ b/Tracker/src/ITrackerSearch.cs
@@ -1,6 +1,11 @@
using System;
+#if USE_DBUS_SHARP
+using DBus;
+#else
using NDesk.DBus;
+#endif
+
using org.freedesktop.DBus;
namespace Tracker.Dbus
diff --git a/Tracker/src/Tracker.cs b/Tracker/src/Tracker.cs
index 0ca00af..38d9fd8 100644
--- a/Tracker/src/Tracker.cs
+++ b/Tracker/src/Tracker.cs
@@ -1,7 +1,12 @@
using System;
+#if USE_DBUS_SHARP
+using DBus;
+#else
using NDesk.DBus;
+#endif
+
using Do.Platform;
diff --git a/Translate/Makefile.am b/Translate/Makefile.am
index 3f52dd0..14af691 100644
--- a/Translate/Makefile.am
+++ b/Translate/Makefile.am
@@ -13,10 +13,12 @@ FILES = \
src/UI/ConfigUI.cs \
src/TranslateEngine.cs
+GENERATED_RESOURCES = \
+ Resources/Translate.addin.xml
+
RESOURCES = \
gtk-gui/gui.stetic \
gtk-gui/objects.xml \
- Resources/Translate.addin.xml \
Resources/icons/arabic.png \
Resources/icons/bulgarian.png \
Resources/icons/catalan.png \
@@ -51,7 +53,7 @@ RESOURCES = \
Resources/icons/slovak.png \
Resources/icons/slovenian.png \
Resources/icons/spanish.png \
- Resources/icons/swedish.png \
+ Resources/icons/swedish.png \
Resources/icons/ukranian.png \
Resources/icons/vietnamese.png \
Resources/icons/albanian.png \
diff --git a/Translate/Makefile.in b/Translate/Makefile.in
index 6d84cdb..7375122 100644
--- a/Translate/Makefile.in
+++ b/Translate/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = Translate
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -295,10 +373,12 @@ FILES = \
src/UI/ConfigUI.cs \
src/TranslateEngine.cs
+GENERATED_RESOURCES = \
+ Resources/Translate.addin.xml
+
RESOURCES = \
gtk-gui/gui.stetic \
gtk-gui/objects.xml \
- Resources/Translate.addin.xml \
Resources/icons/arabic.png \
Resources/icons/bulgarian.png \
Resources/icons/catalan.png \
@@ -333,7 +413,7 @@ RESOURCES = \
Resources/icons/slovak.png \
Resources/icons/slovenian.png \
Resources/icons/spanish.png \
- Resources/icons/swedish.png \
+ Resources/icons/swedish.png \
Resources/icons/ukranian.png \
Resources/icons/vietnamese.png \
Resources/icons/albanian.png \
@@ -377,6 +457,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -388,8 +469,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -403,14 +487,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -460,10 +542,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -546,16 +633,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/Translate/Resources/Translate.addin.xml b/Translate/Resources/Translate.addin.xml
deleted file mode 100644
index 0137a40..0000000
--- a/Translate/Resources/Translate.addin.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<Addin
- id="Translate"
- namespace="Do"
- version="1.1"
- name="Translate"
- description="Translate text and websites."
- author="Chris Szikszoy"
- category="Community"
- defaultEnabled="false"
->
-
- <Runtime>
- <Import assembly="Translate.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <Extension path="/Do/Action">
- <Action type="Translate.TranslateAction"/>
- </Extension>
-</Addin>
diff --git a/Transmission/Makefile.am b/Transmission/Makefile.am
new file mode 100644
index 0000000..e4d7874
--- /dev/null
+++ b/Transmission/Makefile.am
@@ -0,0 +1,40 @@
+include $(top_srcdir)/build.rules.mk
+
+ASSEMBLY=Transmission
+
+FILES = \
+ gtk-gui/Transmission.TransmissionConfig.cs \
+ gtk-gui/generated.cs \
+ src/Config/TransmissionConfig.cs \
+ src/ITorrentEntry.cs \
+ src/Utils.cs \
+ src/TorrentDirectoryItem.cs \
+ src/TorrentFileItem.cs \
+ src/TorrentFileSetPriorityAction.cs \
+ src/TorrentItem.cs \
+ src/TorrentItemSource.cs \
+ src/TorrentAbstractLimitSpeedAction.cs \
+ src/TorrentLimitDownloadSpeedAction.cs \
+ src/TorrentLimitUploadSpeedAction.cs \
+ src/TorrentMarkForDownloadAction.cs \
+ src/TorrentStartAction.cs \
+ src/TorrentStopAction.cs \
+ src/TorrentUnmarkForDownloadAction.cs \
+ src/TorrentVerifyAction.cs \
+ src/TorrentOperateAction.cs \
+ src/TransmissionAPI.cs \
+ src/TransmissionPlugin.cs
+
+GENERATED_RESOURCES = Resources/Transmission.addin.xml
+
+RESOURCES = \
+ gtk-gui/gui.stetic \
+ Resources/icons/transmission.png
+
+REFERENCES = \
+ System \
+ System.Core \
+ $(NEWTONSOFT_JSON_LIBS) \
+ $(DO_PLATFORM_LINUX_LIBS) \
+ $(DO_UNIVERSE_LIBS) \
+ $(GTK_SHARP_20_LIBS)
diff --git a/Dropbox/Makefile.in b/Transmission/Makefile.in
similarity index 73%
copy from Dropbox/Makefile.in
copy to Transmission/Makefile.in
index 1d7a326..ae60ba1 100644
--- a/Dropbox/Makefile.in
+++ b/Transmission/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,24 +80,41 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
-subdir = Dropbox
+subdir = Transmission
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,41 +355,45 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
MAINTAINERCLEANFILES = Makefile.in
-ASSEMBLY = Dropbox
+ASSEMBLY = Transmission
FILES = \
- gtk-gui/Dropbox.DropboxConfig.cs \
+ gtk-gui/Transmission.TransmissionConfig.cs \
gtk-gui/generated.cs \
- src/Config/DropboxConfig.cs \
- src/DropboxWebInterfaceAction.cs \
- src/DropboxAbstractAction.cs \
- src/DropboxRevisionsAction.cs \
- src/DropboxPuburlAction.cs \
- src/DropboxUnshareAction.cs \
- src/DropboxShareAction.cs \
- src/DropboxStartAction.cs \
- src/DropboxStopAction.cs \
- src/DropboxLinkAction.cs \
- src/Dropbox.cs
-
+ src/Config/TransmissionConfig.cs \
+ src/ITorrentEntry.cs \
+ src/Utils.cs \
+ src/TorrentDirectoryItem.cs \
+ src/TorrentFileItem.cs \
+ src/TorrentFileSetPriorityAction.cs \
+ src/TorrentItem.cs \
+ src/TorrentItemSource.cs \
+ src/TorrentAbstractLimitSpeedAction.cs \
+ src/TorrentLimitDownloadSpeedAction.cs \
+ src/TorrentLimitUploadSpeedAction.cs \
+ src/TorrentMarkForDownloadAction.cs \
+ src/TorrentStartAction.cs \
+ src/TorrentStopAction.cs \
+ src/TorrentUnmarkForDownloadAction.cs \
+ src/TorrentVerifyAction.cs \
+ src/TorrentOperateAction.cs \
+ src/TransmissionAPI.cs \
+ src/TransmissionPlugin.cs
+
+GENERATED_RESOURCES = Resources/Transmission.addin.xml
RESOURCES = \
- Resources/Dropbox.addin.xml \
gtk-gui/gui.stetic \
- Resources/icons/dropbox-add.png \
- Resources/icons/dropbox-remove.png \
- Resources/icons/dropbox-revisions.png \
- Resources/icons/dropbox-share.png \
- Resources/icons/dropbox-start.png \
- Resources/icons/dropbox-stop.png \
- Resources/icons/dropbox-web.png
+ Resources/icons/transmission.png
REFERENCES = \
System \
System.Core \
+ $(NEWTONSOFT_JSON_LIBS) \
$(DO_PLATFORM_LINUX_LIBS) \
$(DO_UNIVERSE_LIBS) \
$(GTK_SHARP_20_LIBS)
@@ -329,9 +410,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/build.rules.mk $(am_
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Dropbox/Makefile'; \
+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Transmission/Makefile'; \
$(am__cd) $(top_srcdir) && \
- $(AUTOMAKE) --foreign Dropbox/Makefile
+ $(AUTOMAKE) --foreign Transmission/Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
@@ -341,6 +422,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -352,8 +434,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -367,14 +452,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -424,10 +507,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -510,16 +598,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/Transmission/Resources/Transmission.addin.xml.in b/Transmission/Resources/Transmission.addin.xml.in
new file mode 100644
index 0000000..9f82d2c
--- /dev/null
+++ b/Transmission/Resources/Transmission.addin.xml.in
@@ -0,0 +1,37 @@
+<Addin
+ id="Transmission"
+ namespace="Do"
+ version="0.1"
+ name="Transmission"
+ description="Control Transmission torrent client."
+ author="Mikhail Trishchenkov"
+ category="Community"
+ defaultEnabled="true"
+ url="http://do.davebsd.com/wiki/Transmission_Plugin"
+ >
+
+ <Runtime>
+ <Import assembly="Transmission.dll"/>
+ </Runtime>
+
+ <!--Localizer type="Gettext" catalog="gnome-do-plugins" location="@expanded_datadir@/locale" /-->
+
+ <Dependencies>
+ <Addin id="Universe" version="1.0" />
+ </Dependencies>
+
+ <Extension path="/Do/ItemSource">
+ <ItemSource type="Transmission.TorrentItemSource" />
+ </Extension>
+ <Extension path="/Do/Action">
+ <Action type="Transmission.TorrentStopAction" />
+ <Action type="Transmission.TorrentStartAction" />
+ <Action type="Transmission.TorrentVerifyAction" />
+ <Action type="Transmission.TorrentLimitDownloadSpeedAction" />
+ <Action type="Transmission.TorrentLimitUploadSpeedAction" />
+ <Action type="Transmission.TorrentFileSetPriorityAction" />
+ <Action type="Transmission.TorrentMarkForDownloadAction" />
+ <Action type="Transmission.TorrentUnmarkForDownloadAction" />
+ <Action type="Transmission.TorrentOperateAction" />
+ </Extension>
+</Addin>
diff --git a/Transmission/Resources/icons/transmission.png b/Transmission/Resources/icons/transmission.png
new file mode 100644
index 0000000..a754a0a
Binary files /dev/null and b/Transmission/Resources/icons/transmission.png differ
diff --git a/Transmission/gtk-gui/Transmission.TransmissionConfig.cs b/Transmission/gtk-gui/Transmission.TransmissionConfig.cs
new file mode 100644
index 0000000..9878bb2
--- /dev/null
+++ b/Transmission/gtk-gui/Transmission.TransmissionConfig.cs
@@ -0,0 +1,161 @@
+// ------------------------------------------------------------------------------
+// <autogenerated>
+// This code was generated by a tool.
+//
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+// </autogenerated>
+// ------------------------------------------------------------------------------
+
+namespace Transmission {
+
+
+ public partial class TransmissionConfig {
+
+ private Gtk.Alignment alignment108;
+
+ private Gtk.Table table1;
+
+ private Gtk.HBox hbox1;
+
+ private Gtk.Entry address_entry;
+
+ private Gtk.Label remote_port_label;
+
+ private Gtk.Entry port_entry;
+
+ private Gtk.Label label1;
+
+ private Gtk.Label label2;
+
+ private Gtk.Label label3;
+
+ private Gtk.Entry password_entry;
+
+ private Gtk.Entry user_name_entry;
+
+ protected virtual void Build() {
+ Stetic.Gui.Initialize(this);
+ // Widget Transmission.TransmissionConfig
+ Stetic.BinContainer.Attach(this);
+ this.Name = "Transmission.TransmissionConfig";
+ // Container child Transmission.TransmissionConfig.Gtk.Container+ContainerChild
+ this.alignment108 = new Gtk.Alignment(0.5F, 0F, 1F, 0F);
+ this.alignment108.Name = "alignment108";
+ // Container child alignment108.Gtk.Container+ContainerChild
+ this.table1 = new Gtk.Table(((uint)(3)), ((uint)(2)), false);
+ this.table1.Name = "table1";
+ this.table1.RowSpacing = ((uint)(6));
+ this.table1.ColumnSpacing = ((uint)(6));
+ // Container child table1.Gtk.Table+TableChild
+ this.hbox1 = new Gtk.HBox();
+ this.hbox1.Name = "hbox1";
+ this.hbox1.Spacing = 6;
+ // Container child hbox1.Gtk.Box+BoxChild
+ this.address_entry = new Gtk.Entry();
+ this.address_entry.CanFocus = true;
+ this.address_entry.Name = "address_entry";
+ this.address_entry.IsEditable = true;
+ this.address_entry.InvisibleChar = '●';
+ this.hbox1.Add(this.address_entry);
+ Gtk.Box.BoxChild w1 = ((Gtk.Box.BoxChild)(this.hbox1[this.address_entry]));
+ w1.Position = 0;
+ // Container child hbox1.Gtk.Box+BoxChild
+ this.remote_port_label = new Gtk.Label();
+ this.remote_port_label.Name = "remote_port_label";
+ this.remote_port_label.LabelProp = Mono.Addins.AddinManager.CurrentLocalizer.GetString("Port");
+ this.hbox1.Add(this.remote_port_label);
+ Gtk.Box.BoxChild w2 = ((Gtk.Box.BoxChild)(this.hbox1[this.remote_port_label]));
+ w2.Position = 1;
+ w2.Expand = false;
+ w2.Fill = false;
+ // Container child hbox1.Gtk.Box+BoxChild
+ this.port_entry = new Gtk.Entry();
+ this.port_entry.CanFocus = true;
+ this.port_entry.Name = "port_entry";
+ this.port_entry.IsEditable = true;
+ this.port_entry.WidthChars = 5;
+ this.port_entry.MaxLength = 5;
+ this.port_entry.InvisibleChar = '●';
+ this.hbox1.Add(this.port_entry);
+ Gtk.Box.BoxChild w3 = ((Gtk.Box.BoxChild)(this.hbox1[this.port_entry]));
+ w3.Position = 2;
+ w3.Expand = false;
+ this.table1.Add(this.hbox1);
+ Gtk.Table.TableChild w4 = ((Gtk.Table.TableChild)(this.table1[this.hbox1]));
+ w4.LeftAttach = ((uint)(1));
+ w4.RightAttach = ((uint)(2));
+ w4.YOptions = ((Gtk.AttachOptions)(4));
+ // Container child table1.Gtk.Table+TableChild
+ this.label1 = new Gtk.Label();
+ this.label1.Name = "label1";
+ this.label1.Xalign = 0F;
+ this.label1.LabelProp = Mono.Addins.AddinManager.CurrentLocalizer.GetString("_Address");
+ this.label1.UseUnderline = true;
+ this.table1.Add(this.label1);
+ Gtk.Table.TableChild w5 = ((Gtk.Table.TableChild)(this.table1[this.label1]));
+ w5.XOptions = ((Gtk.AttachOptions)(4));
+ w5.YOptions = ((Gtk.AttachOptions)(4));
+ // Container child table1.Gtk.Table+TableChild
+ this.label2 = new Gtk.Label();
+ this.label2.Name = "label2";
+ this.label2.Xalign = 0F;
+ this.label2.LabelProp = Mono.Addins.AddinManager.CurrentLocalizer.GetString("_Password");
+ this.label2.UseUnderline = true;
+ this.table1.Add(this.label2);
+ Gtk.Table.TableChild w6 = ((Gtk.Table.TableChild)(this.table1[this.label2]));
+ w6.TopAttach = ((uint)(2));
+ w6.BottomAttach = ((uint)(3));
+ w6.XOptions = ((Gtk.AttachOptions)(4));
+ w6.YOptions = ((Gtk.AttachOptions)(4));
+ // Container child table1.Gtk.Table+TableChild
+ this.label3 = new Gtk.Label();
+ this.label3.Name = "label3";
+ this.label3.Xalign = 0F;
+ this.label3.LabelProp = Mono.Addins.AddinManager.CurrentLocalizer.GetString("_Login");
+ this.label3.UseUnderline = true;
+ this.table1.Add(this.label3);
+ Gtk.Table.TableChild w7 = ((Gtk.Table.TableChild)(this.table1[this.label3]));
+ w7.TopAttach = ((uint)(1));
+ w7.BottomAttach = ((uint)(2));
+ w7.XOptions = ((Gtk.AttachOptions)(4));
+ w7.YOptions = ((Gtk.AttachOptions)(4));
+ // Container child table1.Gtk.Table+TableChild
+ this.password_entry = new Gtk.Entry();
+ this.password_entry.CanFocus = true;
+ this.password_entry.Name = "password_entry";
+ this.password_entry.IsEditable = true;
+ this.password_entry.Visibility = false;
+ this.password_entry.InvisibleChar = '●';
+ this.table1.Add(this.password_entry);
+ Gtk.Table.TableChild w8 = ((Gtk.Table.TableChild)(this.table1[this.password_entry]));
+ w8.TopAttach = ((uint)(2));
+ w8.BottomAttach = ((uint)(3));
+ w8.LeftAttach = ((uint)(1));
+ w8.RightAttach = ((uint)(2));
+ w8.YOptions = ((Gtk.AttachOptions)(4));
+ // Container child table1.Gtk.Table+TableChild
+ this.user_name_entry = new Gtk.Entry();
+ this.user_name_entry.CanFocus = true;
+ this.user_name_entry.Name = "user_name_entry";
+ this.user_name_entry.IsEditable = true;
+ this.user_name_entry.InvisibleChar = '●';
+ this.table1.Add(this.user_name_entry);
+ Gtk.Table.TableChild w9 = ((Gtk.Table.TableChild)(this.table1[this.user_name_entry]));
+ w9.TopAttach = ((uint)(1));
+ w9.BottomAttach = ((uint)(2));
+ w9.LeftAttach = ((uint)(1));
+ w9.RightAttach = ((uint)(2));
+ w9.YOptions = ((Gtk.AttachOptions)(4));
+ this.alignment108.Add(this.table1);
+ this.Add(this.alignment108);
+ if ((this.Child != null)) {
+ this.Child.ShowAll();
+ }
+ this.Hide();
+ this.user_name_entry.Changed += new System.EventHandler(this.OnUserNameEntryChanged);
+ this.password_entry.Changed += new System.EventHandler(this.OnPasswordEntryChanged);
+ }
+ }
+}
diff --git a/Transmission/gtk-gui/generated.cs b/Transmission/gtk-gui/generated.cs
new file mode 100644
index 0000000..7381c4d
--- /dev/null
+++ b/Transmission/gtk-gui/generated.cs
@@ -0,0 +1,82 @@
+// ------------------------------------------------------------------------------
+// <autogenerated>
+// This code was generated by a tool.
+//
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+// </autogenerated>
+// ------------------------------------------------------------------------------
+
+namespace Stetic {
+
+
+ internal class Gui {
+
+ private static bool initialized;
+
+ internal static void Initialize(Gtk.Widget iconRenderer) {
+ if ((Stetic.Gui.initialized == false)) {
+ Stetic.Gui.initialized = true;
+ }
+ }
+ }
+
+ internal class BinContainer {
+
+ private Gtk.Widget child;
+
+ private Gtk.UIManager uimanager;
+
+ public static BinContainer Attach(Gtk.Bin bin) {
+ BinContainer bc = new BinContainer();
+ bin.SizeRequested += new Gtk.SizeRequestedHandler(bc.OnSizeRequested);
+ bin.SizeAllocated += new Gtk.SizeAllocatedHandler(bc.OnSizeAllocated);
+ bin.Added += new Gtk.AddedHandler(bc.OnAdded);
+ return bc;
+ }
+
+ private void OnSizeRequested(object sender, Gtk.SizeRequestedArgs args) {
+ if ((this.child != null)) {
+ args.Requisition = this.child.SizeRequest();
+ }
+ }
+
+ private void OnSizeAllocated(object sender, Gtk.SizeAllocatedArgs args) {
+ if ((this.child != null)) {
+ this.child.Allocation = args.Allocation;
+ }
+ }
+
+ private void OnAdded(object sender, Gtk.AddedArgs args) {
+ this.child = args.Widget;
+ }
+
+ public void SetUiManager(Gtk.UIManager uim) {
+ this.uimanager = uim;
+ this.child.Realized += new System.EventHandler(this.OnRealized);
+ }
+
+ private void OnRealized(object sender, System.EventArgs args) {
+ if ((this.uimanager != null)) {
+ Gtk.Widget w;
+ w = this.child.Toplevel;
+ if (((w != null) && typeof(Gtk.Window).IsInstanceOfType(w))) {
+ ((Gtk.Window)(w)).AddAccelGroup(this.uimanager.AccelGroup);
+ this.uimanager = null;
+ }
+ }
+ }
+ }
+
+ internal class ActionGroups {
+
+ public static Gtk.ActionGroup GetActionGroup(System.Type type) {
+ return Stetic.ActionGroups.GetActionGroup(type.FullName);
+ }
+
+ public static Gtk.ActionGroup GetActionGroup(string name) {
+ return null;
+ }
+ }
+}
diff --git a/Transmission/gtk-gui/gui.stetic b/Transmission/gtk-gui/gui.stetic
new file mode 100644
index 0000000..0f42bf4
--- /dev/null
+++ b/Transmission/gtk-gui/gui.stetic
@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="utf-8"?>
+<stetic-interface>
+ <configuration>
+ <images-root-path>..</images-root-path>
+ <target-gtk-version>2.12</target-gtk-version>
+ </configuration>
+ <import>
+ <widget-library name="Do.Platform.Linux, Version=0.9.0.0, Culture=neutral" />
+ <widget-library name="../bin/Debug/Transmission.dll" internal="true" />
+ </import>
+ <widget class="Gtk.Bin" id="Transmission.TransmissionConfig" design-size="444 300">
+ <property name="MemberName" />
+ <property name="Visible">False</property>
+ <child>
+ <widget class="Gtk.Alignment" id="alignment108">
+ <property name="MemberName" />
+ <property name="Yscale">0</property>
+ <property name="Yalign">0</property>
+ <child>
+ <widget class="Gtk.Table" id="table1">
+ <property name="MemberName" />
+ <property name="NRows">3</property>
+ <property name="NColumns">2</property>
+ <property name="RowSpacing">6</property>
+ <property name="ColumnSpacing">6</property>
+ <child>
+ <widget class="Gtk.HBox" id="hbox1">
+ <property name="MemberName" />
+ <property name="Spacing">6</property>
+ <child>
+ <widget class="Gtk.Entry" id="address_entry">
+ <property name="MemberName" />
+ <property name="CanFocus">True</property>
+ <property name="IsEditable">True</property>
+ <property name="InvisibleChar">●</property>
+ </widget>
+ <packing>
+ <property name="Position">0</property>
+ <property name="AutoSize">True</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="Gtk.Label" id="remote_port_label">
+ <property name="MemberName">remote_port_label</property>
+ <property name="LabelProp" translatable="yes">Port</property>
+ </widget>
+ <packing>
+ <property name="Position">1</property>
+ <property name="AutoSize">True</property>
+ <property name="Expand">False</property>
+ <property name="Fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="Gtk.Entry" id="port_entry">
+ <property name="MemberName">port_entry</property>
+ <property name="CanFocus">True</property>
+ <property name="IsEditable">True</property>
+ <property name="WidthChars">5</property>
+ <property name="MaxLength">5</property>
+ <property name="InvisibleChar">●</property>
+ </widget>
+ <packing>
+ <property name="Position">2</property>
+ <property name="AutoSize">False</property>
+ <property name="Expand">False</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="LeftAttach">1</property>
+ <property name="RightAttach">2</property>
+ <property name="AutoSize">True</property>
+ <property name="YOptions">Fill</property>
+ <property name="XExpand">True</property>
+ <property name="XFill">True</property>
+ <property name="XShrink">False</property>
+ <property name="YExpand">False</property>
+ <property name="YFill">True</property>
+ <property name="YShrink">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="Gtk.Label" id="label1">
+ <property name="MemberName" />
+ <property name="Xalign">0</property>
+ <property name="LabelProp" translatable="yes">_Address</property>
+ <property name="UseUnderline">True</property>
+ </widget>
+ <packing>
+ <property name="AutoSize">True</property>
+ <property name="XOptions">Fill</property>
+ <property name="YOptions">Fill</property>
+ <property name="XExpand">False</property>
+ <property name="XFill">True</property>
+ <property name="XShrink">False</property>
+ <property name="YExpand">False</property>
+ <property name="YFill">True</property>
+ <property name="YShrink">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="Gtk.Label" id="label2">
+ <property name="MemberName" />
+ <property name="Xalign">0</property>
+ <property name="LabelProp" translatable="yes">_Password</property>
+ <property name="UseUnderline">True</property>
+ </widget>
+ <packing>
+ <property name="TopAttach">2</property>
+ <property name="BottomAttach">3</property>
+ <property name="AutoSize">True</property>
+ <property name="XOptions">Fill</property>
+ <property name="YOptions">Fill</property>
+ <property name="XExpand">False</property>
+ <property name="XFill">True</property>
+ <property name="XShrink">False</property>
+ <property name="YExpand">False</property>
+ <property name="YFill">True</property>
+ <property name="YShrink">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="Gtk.Label" id="label3">
+ <property name="MemberName" />
+ <property name="Xalign">0</property>
+ <property name="LabelProp" translatable="yes">_Login</property>
+ <property name="UseUnderline">True</property>
+ </widget>
+ <packing>
+ <property name="TopAttach">1</property>
+ <property name="BottomAttach">2</property>
+ <property name="AutoSize">True</property>
+ <property name="XOptions">Fill</property>
+ <property name="YOptions">Fill</property>
+ <property name="XExpand">False</property>
+ <property name="XFill">True</property>
+ <property name="XShrink">False</property>
+ <property name="YExpand">False</property>
+ <property name="YFill">True</property>
+ <property name="YShrink">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="Gtk.Entry" id="password_entry">
+ <property name="MemberName" />
+ <property name="CanFocus">True</property>
+ <property name="IsEditable">True</property>
+ <property name="Visibility">False</property>
+ <property name="InvisibleChar">●</property>
+ <signal name="Changed" handler="OnPasswordEntryChanged" />
+ </widget>
+ <packing>
+ <property name="TopAttach">2</property>
+ <property name="BottomAttach">3</property>
+ <property name="LeftAttach">1</property>
+ <property name="RightAttach">2</property>
+ <property name="AutoSize">True</property>
+ <property name="YOptions">Fill</property>
+ <property name="XExpand">True</property>
+ <property name="XFill">True</property>
+ <property name="XShrink">False</property>
+ <property name="YExpand">False</property>
+ <property name="YFill">True</property>
+ <property name="YShrink">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="Gtk.Entry" id="user_name_entry">
+ <property name="MemberName" />
+ <property name="CanFocus">True</property>
+ <property name="IsEditable">True</property>
+ <property name="InvisibleChar">●</property>
+ <signal name="Changed" handler="OnUserNameEntryChanged" />
+ </widget>
+ <packing>
+ <property name="TopAttach">1</property>
+ <property name="BottomAttach">2</property>
+ <property name="LeftAttach">1</property>
+ <property name="RightAttach">2</property>
+ <property name="AutoSize">True</property>
+ <property name="YOptions">Fill</property>
+ <property name="XExpand">True</property>
+ <property name="XFill">True</property>
+ <property name="XShrink">False</property>
+ <property name="YExpand">False</property>
+ <property name="YFill">True</property>
+ <property name="YShrink">False</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+</stetic-interface>
\ No newline at end of file
diff --git a/Transmission/src/Config/TransmissionConfig.cs b/Transmission/src/Config/TransmissionConfig.cs
new file mode 100644
index 0000000..7fe6b13
--- /dev/null
+++ b/Transmission/src/Config/TransmissionConfig.cs
@@ -0,0 +1,91 @@
+using System;
+using System.IO;
+using System.Text;
+
+using Mono.Addins;
+
+using Gtk;
+
+using Do.Platform;
+
+namespace Transmission
+{
+
+ [System.ComponentModel.Category("File")]
+ [System.ComponentModel.ToolboxItem(true)]
+ public partial class TransmissionConfig : Gtk.Bin
+ {
+ public static string home_path = Environment.GetFolderPath (Environment.SpecialFolder.Personal);
+ public static string settings_path = System.IO.Path.Combine (home_path, ".config/transmission/settings.json");
+
+ static IPreferences prefs;
+
+ public TransmissionConfig()
+ {
+ Build();
+ RefreshView();
+ }
+
+ private void RefreshView()
+ {
+ address_entry.Text = Address;
+ port_entry.Text = Port.ToString();
+ user_name_entry.Text = UserName;
+ password_entry.Text = Password;
+ }
+
+ static TransmissionConfig()
+ {
+ prefs = Services.Preferences.Get<TransmissionConfig>();
+ }
+
+ public static string Address
+ {
+ get { return prefs.Get<string>("Address", "127.0.0.1"); }
+ set { prefs.Set<string> ("Address", value); }
+ }
+
+ public static int Port
+ {
+ get { return prefs.Get<int>("Port", TransmissionAPI.DEFAULT_PORT); }
+ set { prefs.Set<int> ("Port", value); }
+ }
+
+ public static string UserName
+ {
+ get { return prefs.Get<string>("UserName", ""); }
+ set { prefs.Set<string> ("UserName", value); }
+ }
+
+ public static string Password
+ {
+ get { return prefs.Get<string>("Password", ""); }
+ set { prefs.Set<string> ("Password", value); }
+ }
+
+ protected virtual void OnAddressEntryChanged (object sender, System.EventArgs e)
+ {
+ Address = address_entry.Text;
+ TransmissionPlugin.ResetConnection();
+ }
+
+ protected virtual void OnUserNameEntryChanged (object sender, System.EventArgs e)
+ {
+ UserName = user_name_entry.Text;
+ TransmissionPlugin.ResetConnection();
+ }
+
+ protected virtual void OnPasswordEntryChanged (object sender, System.EventArgs e)
+ {
+ Password = password_entry.Text;
+ TransmissionPlugin.ResetConnection();
+ }
+
+ protected virtual void OnPortEntryChanged (object sender, System.EventArgs e)
+ {
+ Port = int.Parse(port_entry.Text);
+ TransmissionPlugin.ResetConnection();
+ }
+
+ }
+}
diff --git a/Transmission/src/ITorrentEntry.cs b/Transmission/src/ITorrentEntry.cs
new file mode 100644
index 0000000..a3d7785
--- /dev/null
+++ b/Transmission/src/ITorrentEntry.cs
@@ -0,0 +1,16 @@
+using System.Collections.Generic;
+
+namespace Transmission {
+
+ public interface ITorrentEntry {
+ // Owner torrent.
+ TorrentItem Torrent { get; }
+
+ // Path on FS.
+ string Path { get; }
+
+ // Get all files under this entry (recursively).
+ // For files return file itself.
+ IEnumerable<TorrentFileItem> GetFiles();
+ }
+}
diff --git a/Transmission/src/TorrentAbstractLimitSpeedAction.cs b/Transmission/src/TorrentAbstractLimitSpeedAction.cs
new file mode 100644
index 0000000..be08088
--- /dev/null
+++ b/Transmission/src/TorrentAbstractLimitSpeedAction.cs
@@ -0,0 +1,80 @@
+
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+
+using Mono.Addins;
+
+using Do.Platform;
+using Do.Universe;
+
+namespace Transmission {
+
+ public abstract class TorrentAbstractLimitSpeedAction: Act {
+
+ public override IEnumerable<Type> SupportedItemTypes {
+ get { yield return typeof (TorrentItem); }
+ }
+
+ public override IEnumerable<Type> SupportedModifierItemTypes {
+ get {
+ yield return typeof (ITextItem);
+ yield return typeof (PredefinedSpeed);
+ }
+ }
+
+ public override bool ModifierItemsOptional {
+ get { return false; }
+ }
+
+ protected abstract PredefinedSpeed GetCurrentSpeedItem(TorrentItem torrent);
+
+ public override IEnumerable<Item> DynamicModifierItemsForItem(Item item) {
+ TorrentItem torrent = (TorrentItem)item;
+
+ yield return new PredefinedSpeed(0, "Unlimited", "Turn download speed limit off");
+ yield return GetCurrentSpeedItem(torrent);
+ foreach (PredefinedSpeed speed in Utils.PredefinedSpeedItems)
+ yield return speed;
+ }
+
+ protected abstract void SetSpeedLimit(TransmissionAPI api, IEnumerable<TorrentItem> torrents, int speed);
+
+ public override IEnumerable<Item> Perform(IEnumerable<Item> items, IEnumerable<Item> modItems) {
+ int? speed = null;
+
+ // Get speed item, it can be either ITextItem or PredefinedSpeed.
+ Item modItem = modItems.First();
+ if (modItem is PredefinedSpeed) {
+ speed = ((PredefinedSpeed)modItem).Value;
+ } else {
+ string speed_str = ((ITextItem)modItem).Text;
+
+ try {
+ // Try to parse entered speed value.
+ speed = Utils.ParseSpeed(speed_str);
+
+ } catch (ArgumentException) {
+ Log<TransmissionPlugin>.Debug("Invalid speed string: {0}", speed_str);
+
+ // Show notification about invalid speed value with some hints on
+ // accepted formats.
+ string message = AddinManager.CurrentLocalizer.GetString(
+ "Can't recognize \"{0}\" as speed\nUse values like: 100k, 50 kb, 20m, 10 mib"
+ );
+ Services.Notifications.Notify("Transmission", string.Format(message, speed_str), "transmission");
+ }
+ }
+
+ // If speed is recognized successfully, set speed limit and update item.
+ if (speed.HasValue) {
+ TransmissionAPI api = TransmissionPlugin.getTransmission();
+ IEnumerable<TorrentItem> torrents = items.Cast<TorrentItem>();
+ SetSpeedLimit(api, torrents, speed.Value);
+ }
+
+ yield break;
+ }
+ }
+}
diff --git a/Transmission/src/TorrentDirectoryItem.cs b/Transmission/src/TorrentDirectoryItem.cs
new file mode 100644
index 0000000..096dc95
--- /dev/null
+++ b/Transmission/src/TorrentDirectoryItem.cs
@@ -0,0 +1,64 @@
+
+using System;
+using System.Collections.Generic;
+
+using Do.Universe;
+
+namespace Transmission {
+
+ public class TorrentDirectoryItem: Item, ITorrentEntry {
+
+ private TorrentItem _torrent;
+ private TorrentDirectoryItem _parent;
+ private string _name;
+ private IList<Item> _files;
+
+ public TorrentDirectoryItem(TorrentItem torrent, TorrentDirectoryItem parent, string name) {
+ _torrent = torrent;
+ _parent = parent;
+ _name = name;
+ _files = new List<Item>();
+ }
+
+ public TorrentItem Torrent {
+ get { return _torrent; }
+ }
+
+ public IEnumerable<TorrentFileItem> GetFiles() {
+ foreach (ITorrentEntry entry in _files)
+ foreach (TorrentFileItem file in entry.GetFiles())
+ yield return file;
+ }
+
+ public override string Name {
+ get { return _name; }
+ }
+
+ public override string Description {
+ get { return string.Empty; }
+ }
+
+ public override string Icon {
+ get { return "folder"; }
+ }
+
+ public IList<Item> Files {
+ get { return _files; }
+ }
+
+ public string Path {
+ get {
+ if (_parent != null) {
+ return _parent.Path + '/' + _name;
+ } else {
+ return _name;
+ }
+ }
+ }
+
+ public string Uri {
+ get { return "file://" + Path; }
+ }
+ }
+
+}
diff --git a/Transmission/src/TorrentFileItem.cs b/Transmission/src/TorrentFileItem.cs
new file mode 100644
index 0000000..55337e1
--- /dev/null
+++ b/Transmission/src/TorrentFileItem.cs
@@ -0,0 +1,97 @@
+
+using System;
+using System.Collections.Generic;
+
+using Do.Universe;
+
+namespace Transmission {
+
+ public class TorrentFileItem: Item, ITorrentEntry {
+
+ // Owner torrent.
+ private TorrentItem _torrent;
+ // Position of this file within torrents file list.
+ private int _index;
+
+ private TorrentDirectoryItem _parent;
+ private string _name;
+ private ulong _size, _downloaded;
+ private bool _wanted;
+ private TransmissionAPI.FilePriority _priority;
+
+ public TorrentFileItem(
+ TorrentItem torrent, int index, TorrentDirectoryItem parent,
+ string name, TransmissionAPI.TorrentFileInfo info
+ ) {
+ _torrent = torrent;
+ _index = index;
+
+ _parent = parent;
+ _name = name;
+ _size = info.Length;
+ _downloaded = info.BytesCompleted;
+
+ _wanted = info.Wanted;
+ _priority = info.Priority;
+ }
+
+ public TorrentItem Torrent {
+ get { return _torrent; }
+ }
+
+ public int Index {
+ get { return _index; }
+ }
+
+ public TransmissionAPI.FilePriority Priority {
+ get { return _priority; }
+ }
+
+ public IEnumerable<TorrentFileItem> GetFiles() {
+ yield return this;
+ }
+
+ public override string Name {
+ get { return _name; }
+ }
+
+ public override string Description {
+ get {
+ // I don't use special percentage format string, because it rounds
+ // value and I don't want to get "100%" until file is really downloaded.
+ // High precision isn't needed, because info is mostly out-of-date.
+
+ if (_downloaded == _size)
+ return string.Format("Complete, {0}", Utils.FormatSize(_size));
+
+ else if (_wanted)
+ return string.Format("{0} of {1} complete ({2:0}%)",
+ Utils.FormatSize(_downloaded), Utils.FormatSize(_size),
+ Math.Floor(100.0 * _downloaded / _size)
+ );
+
+ else if (_downloaded != 0)
+ return string.Format("Skipped, {0} of {1} complete ({2:0}%)",
+ Utils.FormatSize(_downloaded),Utils.FormatSize(_size),
+ Math.Floor(100.0 * _downloaded / _size)
+ );
+
+ else
+ return string.Format("Skipped, {0}", Utils.FormatSize(_size));
+ }
+ }
+
+ public override string Icon {
+ get { return "document"; }
+ }
+
+ public string Path {
+ get { return _parent.Path + '/' + _name; }
+ }
+
+ public string Uri {
+ get { return "file://" + Path; }
+ }
+ }
+
+}
diff --git a/Transmission/src/TorrentFileSetPriorityAction.cs b/Transmission/src/TorrentFileSetPriorityAction.cs
new file mode 100644
index 0000000..97086b5
--- /dev/null
+++ b/Transmission/src/TorrentFileSetPriorityAction.cs
@@ -0,0 +1,108 @@
+
+using System;
+using System.Linq;
+using System.Collections.Generic;
+
+using Mono.Addins;
+
+using Do.Platform;
+using Do.Universe;
+
+namespace Transmission {
+
+ public class PriorityItem: Item {
+ private TransmissionAPI.FilePriority _value;
+ private string _name;
+ private string _icon;
+
+ public PriorityItem(TransmissionAPI.FilePriority value, string name, string icon) {
+ _value = value;
+ _name = name;
+ _icon = icon;
+ }
+
+ public override string Name {
+ get { return _name; }
+ }
+
+ public override string Description {
+ get { return ""; }
+ }
+
+ public override string Icon {
+ get { return _icon; }
+ }
+
+ public TransmissionAPI.FilePriority Value {
+ get { return _value; }
+ }
+ }
+
+ public class TorrentFileSetPriorityAction: Act {
+
+ public TorrentFileSetPriorityAction() {
+ }
+
+ public override string Name {
+ get { return AddinManager.CurrentLocalizer.GetString ("Set priority"); }
+ }
+
+ public override string Description {
+ get { return AddinManager.CurrentLocalizer.GetString ("Set download priority"); }
+ }
+
+ public override string Icon {
+ get { return "object-flip-vertical"; }
+ }
+
+ public override IEnumerable<Type> SupportedItemTypes {
+ get {
+ yield return typeof (ITorrentEntry);
+ }
+ }
+
+ public override IEnumerable<Type> SupportedModifierItemTypes {
+ get {
+ yield return typeof (PriorityItem);
+ }
+ }
+
+ public override bool ModifierItemsOptional {
+ get { return false; }
+ }
+
+ public override IEnumerable<Item> DynamicModifierItemsForItem(Item item) {
+ yield return new PriorityItem(TransmissionAPI.FilePriority.Low, "Low", "down");
+ yield return new PriorityItem(TransmissionAPI.FilePriority.Normal, "Normal", "forward");
+ yield return new PriorityItem(TransmissionAPI.FilePriority.High, "High", "up");
+ }
+
+ public override IEnumerable<Item> Perform(IEnumerable<Item> items, IEnumerable<Item> modItems) {
+ TransmissionAPI.FilePriority priority = (modItems.First() as PriorityItem).Value;
+
+ TransmissionAPI.FileOperation operation = new TransmissionAPI.FileOperation(null, priority);
+
+ // Group torrent entries by torrent.
+ var files_by_torrent = items
+ .Cast<ITorrentEntry>()
+ .GroupBy(
+ item => item.Torrent,
+ (torrent, entries) => new {
+ Torrent = torrent,
+ Files = entries.SelectMany(entry => entry.GetFiles())
+ }
+ );
+
+ TransmissionAPI api = TransmissionPlugin.getTransmission();
+
+ // Expand entries for each torrent into set of torrent file entries.
+ // Perform action for each torrent separately.
+ foreach (var group in files_by_torrent) {
+ var operations = group.Files.ToDictionary(f => f.Index, f => operation);
+ api.SetTorrent(group.Torrent.HashString, null, null, null, null, null, operations);
+ }
+
+ yield break;
+ }
+ }
+}
diff --git a/Transmission/src/TorrentItem.cs b/Transmission/src/TorrentItem.cs
new file mode 100644
index 0000000..5dfe607
--- /dev/null
+++ b/Transmission/src/TorrentItem.cs
@@ -0,0 +1,72 @@
+
+using System;
+using System.Collections.Generic;
+
+using Do.Universe;
+
+namespace Transmission {
+
+ public class TorrentItem: Item {
+
+ private string _name;
+ private string _comment;
+ private string _hash_string;
+ private ulong _size;
+ private TransmissionAPI.TorrentStatus _status;
+ private int _download_speed_limit, _upload_speed_limit;
+ private TorrentDirectoryItem _root;
+
+ public TorrentItem(TransmissionAPI.TorrentInfo info) {
+ _hash_string = info.HashString;
+ _name = info.Name;
+ _comment = info.Comment;
+ _status = info.Status;
+ _size = info.TotalSize;
+ _download_speed_limit = info.DownloadLimit;
+ _upload_speed_limit = info.UploadLimit;
+ _root = new TorrentDirectoryItem(this, null, info.DownloadDir);
+ }
+
+ public override string Name {
+ get { return _name; }
+ }
+
+ public override string Description {
+ get {
+ string status_text = "";
+ switch (_status) {
+ case TransmissionAPI.TorrentStatus.CheckWait: status_text = "Waiting for check"; break;
+ case TransmissionAPI.TorrentStatus.Check: status_text = "Checking"; break;
+ case TransmissionAPI.TorrentStatus.Download: status_text = "Downloading"; break;
+ case TransmissionAPI.TorrentStatus.Seed: status_text = "Seeding"; break;
+ case TransmissionAPI.TorrentStatus.Stopped: status_text = "Stopped"; break;
+ }
+
+ return string.Format("{0}, {1}", Utils.FormatSize(_size), status_text);
+ }
+ }
+
+ public override string Icon {
+ get { return "transmission"; }
+ }
+
+ public string HashString {
+ get { return _hash_string; }
+ }
+
+ public TorrentDirectoryItem Root {
+ get { return _root; }
+ }
+
+ public int DownloadSpeedLimit {
+ get { return _download_speed_limit; }
+ set { _download_speed_limit = value; }
+ }
+
+ public int UploadSpeedLimit {
+ get { return _upload_speed_limit; }
+ set { _upload_speed_limit = value; }
+ }
+ }
+
+}
diff --git a/Transmission/src/TorrentItemSource.cs b/Transmission/src/TorrentItemSource.cs
new file mode 100644
index 0000000..81dfdfe
--- /dev/null
+++ b/Transmission/src/TorrentItemSource.cs
@@ -0,0 +1,130 @@
+
+using System;
+using System.Collections.Generic;
+
+using Mono.Addins;
+
+using Do.Universe;
+using Do.Platform;
+using Do.Platform.Linux;
+
+namespace Transmission {
+
+ public class TorrentItemSource: ItemSource, IConfigurable {
+
+ private List<Item> _torrents = new List<Item>();
+
+ public TorrentItemSource() {
+ }
+
+ public override string Name {
+ get { return "Torrents"; }
+ }
+
+ public override string Description {
+ get { return "Transmission torrent client downloads"; }
+ }
+
+ public override string Icon {
+ get { return "transmission"; }
+ }
+
+ public override void UpdateItems () {
+ Log<TorrentItemSource>.Debug("Updating torrents list");
+
+ // Clear current torrents list.
+ _torrents.Clear();
+
+ TransmissionAPI api = TransmissionPlugin.getTransmission();
+
+ foreach (TransmissionAPI.TorrentInfo t in api.GetAllTorrents()) {
+ Log<TorrentItemSource>.Debug("Torrent: {0}", t.Name);
+
+ TorrentItem torrent = new TorrentItem(t);
+
+ // Transmission returns files as flat list with full names, this map
+ // is used to organize files into hierarchy.
+ // It maps directory path to directory item.
+ Dictionary<string, TorrentDirectoryItem> dirs = new Dictionary<string, TorrentDirectoryItem>();
+ dirs.Add("", torrent.Root);
+
+ int index = 0; // File index within list.
+ foreach (TransmissionAPI.TorrentFileInfo f in t.Files) {
+ // Split path and name.
+ int sep_pos = f.Name.LastIndexOf('/');
+
+ string name = f.Name.Substring(sep_pos+1);
+ string path = f.Name.Substring(0, sep_pos == -1 ? 0 : sep_pos);
+ Log<TorrentItemSource>.Debug("File {0} in dir {1}", name, path);
+ TorrentDirectoryItem dir = FindOrCreateDirectory(path, dirs);
+
+ dir.Files.Add(new TorrentFileItem(torrent, index, dir, name, f));
+
+ ++index;
+ }
+
+ _torrents.Add(torrent);
+ }
+ }
+
+ private TorrentDirectoryItem FindOrCreateDirectory(
+ string path,
+ Dictionary<string, TorrentDirectoryItem> dirs
+ ) {
+ TorrentDirectoryItem dir;
+ dirs.TryGetValue(path, out dir);
+
+ if (dir != null) {
+ // Found already added directory.
+ return dir;
+
+ } else {
+ // Directory doesn't exist, find or add parent one, then add this one.
+ int sep_pos = path.LastIndexOf('/');
+
+ string parent_path = path.Substring(0, sep_pos == -1 ? 0 : sep_pos);
+ TorrentDirectoryItem parent = FindOrCreateDirectory(parent_path, dirs);
+
+ string name = path.Substring(sep_pos+1);
+ dir = new TorrentDirectoryItem(parent.Torrent, parent, name);
+
+ parent.Files.Add(dir);
+ dirs.Add(path, dir);
+
+ return dir;
+ }
+ }
+
+ public override IEnumerable<Item> Items {
+ get { return _torrents; }
+ }
+
+ public override IEnumerable<Item> ChildrenOfItem(Item item) {
+ if (item is TorrentItem) {
+ foreach (Item entry in ((TorrentItem)item).Root.Files)
+ yield return entry;
+
+ } else if (item is TorrentDirectoryItem) {
+ foreach (Item entry in ((TorrentDirectoryItem)item).Files)
+ yield return entry;
+
+ } else {
+ yield break;
+
+ }
+ }
+
+ public override IEnumerable<Type> SupportedItemTypes {
+ get {
+ yield return typeof(TorrentItem);
+ yield return typeof(TorrentDirectoryItem);
+ yield return typeof(TorrentFileItem);
+ }
+ }
+
+ public Gtk.Bin GetConfiguration() {
+ return new TransmissionConfig();
+ }
+
+ }
+}
diff --git a/Transmission/src/TorrentLimitDownloadSpeedAction.cs b/Transmission/src/TorrentLimitDownloadSpeedAction.cs
new file mode 100644
index 0000000..a132d56
--- /dev/null
+++ b/Transmission/src/TorrentLimitDownloadSpeedAction.cs
@@ -0,0 +1,47 @@
+
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+
+using Mono.Addins;
+
+using Do.Platform;
+using Do.Universe;
+
+namespace Transmission {
+
+ public class TorrentLimitDownloadSpeedAction: TorrentAbstractLimitSpeedAction {
+
+ public override string Name {
+ get { return AddinManager.CurrentLocalizer.GetString("Limit download speed"); }
+ }
+
+ public override string Description {
+ get { return AddinManager.CurrentLocalizer.GetString("Set download speed limit"); }
+ }
+
+ public override string Icon {
+ get { return "top"; }
+ }
+
+ protected override PredefinedSpeed GetCurrentSpeedItem(TorrentItem torrent) {
+ int currentSpeed = torrent.DownloadSpeedLimit;
+ return new PredefinedSpeed(
+ currentSpeed,
+ string.Format("Saved: {0}", Utils.FormatSpeed(currentSpeed)),
+ "Use limit from torrent settings"
+ );
+ }
+
+ protected override void SetSpeedLimit(TransmissionAPI api, IEnumerable<TorrentItem> torrents, int speed) {
+ bool limit_speed = (speed != 0);
+ int? limit = (speed == 0 ? (int?)null : speed);
+ api.SetTorrents(torrents.Select(t => t.HashString), null, limit_speed, limit, null, null);
+
+ foreach (TorrentItem torrent in torrents)
+ torrent.DownloadSpeedLimit = speed;
+ }
+
+ }
+}
diff --git a/Transmission/src/TorrentLimitUploadSpeedAction.cs b/Transmission/src/TorrentLimitUploadSpeedAction.cs
new file mode 100644
index 0000000..2ebdf3f
--- /dev/null
+++ b/Transmission/src/TorrentLimitUploadSpeedAction.cs
@@ -0,0 +1,47 @@
+
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+
+using Mono.Addins;
+
+using Do.Platform;
+using Do.Universe;
+
+namespace Transmission {
+
+ public class TorrentLimitUploadSpeedAction: TorrentAbstractLimitSpeedAction {
+
+ public override string Name {
+ get { return AddinManager.CurrentLocalizer.GetString ("Limit upload speed"); }
+ }
+
+ public override string Description {
+ get { return AddinManager.CurrentLocalizer.GetString ("Set upload speed limit"); }
+ }
+
+ public override string Icon {
+ get { return "top"; }
+ }
+
+ protected override PredefinedSpeed GetCurrentSpeedItem(TorrentItem torrent) {
+ int currentSpeed = torrent.UploadSpeedLimit;
+ return new PredefinedSpeed(
+ currentSpeed,
+ string.Format("Saved: {0}", Utils.FormatSpeed(currentSpeed)),
+ "Use limit from torrent settings"
+ );
+ }
+
+ protected override void SetSpeedLimit(TransmissionAPI api, IEnumerable<TorrentItem> torrents, int speed) {
+ bool limit_speed = (speed != 0);
+ int? limit = (speed == 0 ? (int?)null : speed);
+ api.SetTorrents(torrents.Select(t => t.HashString), null, null, null, limit_speed, limit);
+
+ foreach (TorrentItem torrent in torrents)
+ torrent.UploadSpeedLimit = speed;
+ }
+
+ }
+}
diff --git a/Transmission/src/TorrentMarkForDownloadAction.cs b/Transmission/src/TorrentMarkForDownloadAction.cs
new file mode 100644
index 0000000..e3e2b82
--- /dev/null
+++ b/Transmission/src/TorrentMarkForDownloadAction.cs
@@ -0,0 +1,62 @@
+
+using System;
+using System.Linq;
+using System.Collections.Generic;
+
+using Mono.Addins;
+
+using Do.Platform;
+using Do.Universe;
+
+namespace Transmission {
+
+ public class TorrentMarkForDownloadAction: Act {
+
+ public TorrentMarkForDownloadAction() {
+ }
+
+ public override string Name {
+ get { return AddinManager.CurrentLocalizer.GetString ("Mark for download"); }
+ }
+
+ public override string Description {
+ get { return AddinManager.CurrentLocalizer.GetString ("Mark file as needed to be downloaded"); }
+ }
+
+ public override string Icon {
+ get { return "add"; }
+ }
+
+ public override IEnumerable<Type> SupportedItemTypes {
+ get {
+ yield return typeof (ITorrentEntry);
+ }
+ }
+
+ public override IEnumerable<Item> Perform(IEnumerable<Item> items, IEnumerable<Item> modItems) {
+ TransmissionAPI api = TransmissionPlugin.getTransmission();
+
+ // Operation is common for all files.
+ TransmissionAPI.FileOperation operation = new TransmissionAPI.FileOperation(true, null);
+
+ // Group selected items by owner torrent.
+ var files_by_torrent = items
+ .Cast<ITorrentEntry>()
+ .GroupBy(
+ item => item.Torrent,
+ (torrent, entries) => new {
+ Torrent = torrent,
+ Files = entries.SelectMany(entry => entry.GetFiles())
+ }
+ );
+
+ // Perform action for each torrent separately.
+ foreach (var group in files_by_torrent) {
+ var operations = group.Files.ToDictionary(f => f.Index, f => operation);
+ api.SetTorrent(group.Torrent.HashString, null, null, null, null, null, operations);
+ }
+
+ yield break;
+ }
+ }
+}
diff --git a/Transmission/src/TorrentOperateAction.cs b/Transmission/src/TorrentOperateAction.cs
new file mode 100644
index 0000000..eb5d926
--- /dev/null
+++ b/Transmission/src/TorrentOperateAction.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Linq;
+using System.Collections.Generic;
+
+using Mono.Addins;
+
+using Do.Universe;
+using Do.Platform;
+
+namespace Transmission {
+
+ public class TorrentOperateAction: Act {
+
+ public override string Name {
+ get { return AddinManager.CurrentLocalizer.GetString ("Operate on files"); }
+ }
+
+ public override string Description {
+ get { return AddinManager.CurrentLocalizer.GetString ("Operate on downloaded file"); }
+ }
+
+ public override string Icon {
+ get { return "file"; }
+ }
+
+ public override IEnumerable<Type> SupportedItemTypes {
+ get { yield return typeof (ITorrentEntry); }
+ }
+
+ public override IEnumerable<Item> Perform(IEnumerable<Item> items, IEnumerable<Item> modItems) {
+ foreach (Item item in items) {
+ ITorrentEntry entry = (ITorrentEntry)item;
+ yield return Services.UniverseFactory.NewFileItem(entry.Path) as Item;
+ }
+ }
+ }
+}
diff --git a/Transmission/src/TorrentStartAction.cs b/Transmission/src/TorrentStartAction.cs
new file mode 100644
index 0000000..8904f6f
--- /dev/null
+++ b/Transmission/src/TorrentStartAction.cs
@@ -0,0 +1,42 @@
+
+using System;
+using System.Linq;
+using System.Collections.Generic;
+
+using Mono.Addins;
+
+using Do.Universe;
+
+namespace Transmission {
+
+ public class TorrentStartAction: Act {
+
+ public TorrentStartAction() {
+ }
+
+ public override string Name {
+ get { return AddinManager.CurrentLocalizer.GetString ("Start"); }
+ }
+
+ public override string Description {
+ get { return AddinManager.CurrentLocalizer.GetString ("Start downloading torrent"); }
+ }
+
+ public override string Icon {
+ get { return "gtk-media-play"; }
+ }
+
+ public override IEnumerable<Type> SupportedItemTypes {
+ get { yield return typeof (TorrentItem); }
+ }
+
+ public override IEnumerable<Item> Perform(IEnumerable<Item> items, IEnumerable<Item> modItems) {
+ TransmissionAPI api = TransmissionPlugin.getTransmission();
+
+ var hashes = items.Cast<TorrentItem>().Select(t => t.HashString);
+ api.StartTorrents(hashes);
+
+ return null;
+ }
+ }
+}
diff --git a/Transmission/src/TorrentStopAction.cs b/Transmission/src/TorrentStopAction.cs
new file mode 100644
index 0000000..356fa75
--- /dev/null
+++ b/Transmission/src/TorrentStopAction.cs
@@ -0,0 +1,42 @@
+
+using System;
+using System.Linq;
+using System.Collections.Generic;
+
+using Mono.Addins;
+
+using Do.Universe;
+
+namespace Transmission {
+
+ public class TorrentStopAction: Act {
+
+ public TorrentStopAction() {
+ }
+
+ public override string Name {
+ get { return AddinManager.CurrentLocalizer.GetString ("Stop"); }
+ }
+
+ public override string Description {
+ get { return AddinManager.CurrentLocalizer.GetString ("Stop downloading torrent"); }
+ }
+
+ public override string Icon {
+ get { return "gtk-media-pause"; }
+ }
+
+ public override IEnumerable<Type> SupportedItemTypes {
+ get { yield return typeof (TorrentItem); }
+ }
+
+ public override IEnumerable<Item> Perform(IEnumerable<Item> items, IEnumerable<Item> modItems) {
+ TransmissionAPI api = TransmissionPlugin.getTransmission();
+
+ var hashes = items.Cast<TorrentItem>().Select(t => t.HashString);
+ api.StopTorrents(hashes);
+
+ return null;
+ }
+ }
+}
diff --git a/Transmission/src/TorrentUnmarkForDownloadAction.cs b/Transmission/src/TorrentUnmarkForDownloadAction.cs
new file mode 100644
index 0000000..a143172
--- /dev/null
+++ b/Transmission/src/TorrentUnmarkForDownloadAction.cs
@@ -0,0 +1,62 @@
+
+using System;
+using System.Linq;
+using System.Collections.Generic;
+
+using Mono.Addins;
+
+using Do.Platform;
+using Do.Universe;
+
+namespace Transmission {
+
+ public class TorrentUnmarkForDownloadAction: Act {
+
+ public TorrentUnmarkForDownloadAction() {
+ }
+
+ public override string Name {
+ get { return AddinManager.CurrentLocalizer.GetString ("Unmark for download"); }
+ }
+
+ public override string Description {
+ get { return AddinManager.CurrentLocalizer.GetString ("Unmark file as needed to be downloaded"); }
+ }
+
+ public override string Icon {
+ get { return "remove"; }
+ }
+
+ public override IEnumerable<Type> SupportedItemTypes {
+ get {
+ yield return typeof (ITorrentEntry);
+ }
+ }
+
+ public override IEnumerable<Item> Perform(IEnumerable<Item> items, IEnumerable<Item> modItems) {
+ TransmissionAPI api = TransmissionPlugin.getTransmission();
+
+ // Operation is common for all files.
+ TransmissionAPI.FileOperation operation = new TransmissionAPI.FileOperation(false, null);
+
+ // Group selected items by owner torrent.
+ var files_by_torrent = items
+ .Cast<ITorrentEntry>()
+ .GroupBy(
+ item => item.Torrent,
+ (torrent, entries) => new {
+ Torrent = torrent,
+ Files = entries.SelectMany(entry => entry.GetFiles())
+ }
+ );
+
+ // Perform action for each torrent separately.
+ foreach (var group in files_by_torrent) {
+ var operations = group.Files.ToDictionary(f => f.Index, f => operation);
+ api.SetTorrent(group.Torrent.HashString, null, null, null, null, null, operations);
+ }
+
+ yield break;
+ }
+ }
+}
diff --git a/Transmission/src/TorrentVerifyAction.cs b/Transmission/src/TorrentVerifyAction.cs
new file mode 100644
index 0000000..4b06b6c
--- /dev/null
+++ b/Transmission/src/TorrentVerifyAction.cs
@@ -0,0 +1,42 @@
+
+using System;
+using System.Linq;
+using System.Collections.Generic;
+
+using Mono.Addins;
+
+using Do.Universe;
+
+namespace Transmission {
+
+ public class TorrentVerifyAction: Act {
+
+ public TorrentVerifyAction() {
+ }
+
+ public override string Name {
+ get { return AddinManager.CurrentLocalizer.GetString ("Verify"); }
+ }
+
+ public override string Description {
+ get { return AddinManager.CurrentLocalizer.GetString ("Verify torrent"); }
+ }
+
+ public override string Icon {
+ get { return "dialog-question"; }
+ }
+
+ public override IEnumerable<Type> SupportedItemTypes {
+ get { yield return typeof (TorrentItem); }
+ }
+
+ public override IEnumerable<Item> Perform(IEnumerable<Item> items, IEnumerable<Item> modItems) {
+ TransmissionAPI api = TransmissionPlugin.getTransmission();
+
+ var hashes = items.Cast<TorrentItem>().Select(t => t.HashString);
+ api.VerifyTorrents(hashes);
+
+ return null;
+ }
+ }
+}
diff --git a/Transmission/src/TransmissionAPI.cs b/Transmission/src/TransmissionAPI.cs
new file mode 100644
index 0000000..fd97e66
--- /dev/null
+++ b/Transmission/src/TransmissionAPI.cs
@@ -0,0 +1,547 @@
+
+using System;
+using System.IO;
+using System.Collections;
+using System.Collections.Generic;
+using System.Net;
+using System.Text;
+using Newtonsoft.Json;
+
+namespace Transmission {
+
+ /// <summary>
+ /// Transmission API client.
+ /// Compatible with RPC version 5 to 10 (release version 1.60 to 2.10).
+ /// </summary>
+ public class TransmissionAPI {
+
+ /// <summary>
+ /// File loading priority.
+ /// </summary>
+ public enum FilePriority : int {
+ Low = -1,
+ Normal = 0,
+ High = 1
+ };
+
+ /// <summary>
+ /// Operation on individual file from torrent.
+ /// </summary>
+ /// <remarks>
+ /// All fields are nullable, <c>null</c> means "don't change current value".
+ /// </remarks>
+ public struct FileOperation {
+ public FileOperation(bool? download, FilePriority? priority) {
+ this.download = download;
+ this.priority = priority;
+ }
+
+ /// <summary>Whether it is needed to download this file</summary>
+ public bool? download;
+
+ /// <summary>Priority relative to other files of the same torrent</summary>
+ public FilePriority? priority;
+ };
+
+ /// <summary>
+ /// Error communicating to Transmission.
+ /// </summary>
+ public class TransmissionAPIError: Exception {
+ public TransmissionAPIError(string message): base(message) {}
+ public TransmissionAPIError(string message, Exception reason): base(message, reason) {}
+ };
+
+ /// <summary>
+ /// Error returned by Transmission.
+ /// </summary>
+ public class TransmissionError: Exception {
+ public TransmissionError(string message): base(message) {
+ }
+ };
+
+ public const int DEFAULT_PORT = 9091;
+ public const string DEFAULT_PATH = "/transmission/rpc";
+ public const string SESSION_HEADER = "X-Transmission-Session-Id";
+
+ private string _url, _username, _password;
+ private string _session_id = "";
+
+ private delegate void ResultReader(JsonReader json);
+
+ /// <summary>Response handler which does nothing</summary>
+ /// <remarks>Prefer using <see cref="Call(string, IDictionary<string, object>)"/> instead</remarks>
+ private void NullHandler(JsonReader json) {}
+
+ /// <summary>
+ /// Create API client.
+ /// </summary>
+ /// <param name="url">Transmission API-RPC URL</param>
+ /// <param name="username">Username for authentication</param>
+ /// <param name="password">Password for authentication</param>
+ /// <remarks>Pass <c>null</c> for both <paramref="username"/> and <paramref="username"/> is
+ /// authentication isn't needed.</remarks>
+ public TransmissionAPI(string url, string username, string password) {
+ _url = url;
+ _username = username;
+ _password = password;
+ }
+
+ /// <summary></summary>
+ /// <param name="payload">HTTP POST request content</param>
+ /// <returns>HTTP response content</returns>
+ /// <exception cref="System.Net.WebException"/>
+ protected string PerformRequest(byte[] payload) {
+ // Prepare request.
+ HttpWebRequest request = (HttpWebRequest)WebRequest.Create(_url);
+ request.Method = "POST";
+ request.ContentType = "application/x-www-form-urlencoded";
+ request.Headers[SESSION_HEADER] = _session_id;
+ request.ContentLength = payload.Length;
+
+ // Authenticate if credentials are given.
+ if (_username != null && _password != null) {
+ string auth = Convert.ToBase64String(Encoding.Default.GetBytes(_username + ":" + _password));
+ request.Headers["Authorization"] = "Basic " + auth;
+ }
+
+ // Perform request.
+ using (Stream stream = request.GetRequestStream()) {
+ stream.Write(payload, 0, payload.Length);
+ }
+
+ // Get response.
+ HttpWebResponse response = (HttpWebResponse)request.GetResponse();
+ return new StreamReader(response.GetResponseStream(), System.Text.Encoding.UTF8).ReadToEnd();
+ }
+
+ private class APIRequest
+ {
+ public string method;
+ public IDictionary<string, object> arguments = new Dictionary<string, object> ();
+ public int? tag;
+ }
+
+ private class APIResult<T> where T : class
+ {
+ public string result;
+ public T arguments;
+ public int? tag;
+ }
+
+ /// <summary>
+ /// Call Transmission API method.
+ /// </summary>
+ /// <param name="method">API method name</param>
+ /// <param name="arguments">Arguments passed to API method</param>
+ /// <param name="handler">Function called with value returned by method</param>
+ /// <exception cref="TransmissionError" />
+ /// <exception cref="TransmissionAPIError" />
+ private T Call<T>(APIRequest request) where T : class {
+ // Compose request and encode it to UTF-8.
+ string req = JsonConvert.SerializeObject (request, new JsonSerializerSettings { DefaultValueHandling = DefaultValueHandling.Ignore });
+ byte[] reqb = System.Text.Encoding.UTF8.GetBytes(req);
+
+ try {
+
+ string resp = null;
+ try {
+ resp = PerformRequest(reqb);
+
+ } catch (System.Net.WebException err) {
+ HttpWebResponse response = (HttpWebResponse)err.Response;
+
+ // Transmission 1.53 and 1.6 introduced X-Transmission-Session-Id header
+ // in order to protect from CSRF attacks. If you make request without
+ // this header (or your session expire) you'll get 409 response with
+ // this header set. Just copy header to your request and try again.
+ if (
+ err.Status == WebExceptionStatus.ProtocolError &&
+ response.StatusCode == HttpStatusCode.Conflict
+ ) {
+ _session_id = response.Headers[SESSION_HEADER];
+ resp = PerformRequest(reqb);
+
+ } else {
+ throw;
+ }
+ }
+
+ var result = JsonConvert.DeserializeObject<APIResult<T>> (resp, new JsonSerializerSettings { DefaultValueHandling = DefaultValueHandling.IgnoreAndPopulate });
+ return result.arguments;
+ } catch (System.Net.WebException err) {
+ throw new TransmissionAPIError("Cannot access Transmission RPC service", err);
+ }
+ }
+
+ /// <summary>Call API method and ignore return value</summary>
+ /// <remarks>This is equivalent to <c>Call(method, arguments, NullHandler)</c>.</remarks>
+ private void Call(string method, IDictionary<string, object> arguments)
+ {
+ APIRequest request = new APIRequest ();
+ request.method = method;
+ request.arguments = arguments;
+ Call<object>(request);
+ }
+
+ /// <summary>
+ /// Start torrents.
+ /// </summary>
+ /// <param name="torrent_hashes">Sequence of torrent's hashes</param>
+ /// <exception cref="TransmissionAPIError" />
+ /// <exception cref="TransmissionError" />
+ public void StartTorrents(IEnumerable<string> torrent_hashes) {
+ Dictionary<string, object> arguments = new Dictionary<string, object>();
+ arguments.Add("ids", torrent_hashes);
+ Call("torrent-start", arguments);
+ }
+
+ /// <summary>
+ /// Start all torrents.
+ /// </summary>
+ /// <exception cref="TransmissionAPIError" />
+ /// <exception cref="TransmissionError" />
+ public void StartAllTorrents() {
+ Call("torrent-start", new Dictionary<string, object>());
+ }
+
+ /// <summary>
+ /// Stop torrents.
+ /// </summary>
+ /// <param name="torrent_hashes">Sequence of torrent's hashes</param>
+ /// <exception cref="TransmissionAPIError" />
+ /// <exception cref="TransmissionError" />
+ public void StopTorrents(IEnumerable<string> torrent_hashes) {
+ Dictionary<string, object> arguments = new Dictionary<string, object>();
+ arguments.Add("ids", torrent_hashes);
+ Call("torrent-stop", arguments);
+ }
+
+ /// <summary>
+ /// Stop all torrents.
+ /// </summary>
+ /// <exception cref="TransmissionAPIError" />
+ /// <exception cref="TransmissionError" />
+ public void StopAllTorrents() {
+ Call("torrent-stop", new Dictionary<string, object>());
+ }
+
+ /// <summary>
+ /// Start torrents verification.
+ /// </summary>
+ /// <param name="torrent_hashes">Sequence of torrent's hashes to verify</param>
+ /// <exception cref="TransmissionAPIError" />
+ /// <exception cref="TransmissionError" />
+ public void VerifyTorrents(IEnumerable<string> torrent_hashes) {
+ Dictionary<string, object> arguments = new Dictionary<string, object>();
+ arguments.Add("ids", torrent_hashes);
+ Call("torrent-verify", arguments);
+ }
+
+ /// <summary>
+ /// Start torrents verification for all torrents.
+ /// </summary>
+ /// <exception cref="TransmissionAPIError" />
+ /// <exception cref="TransmissionError" />
+ public void VerifyAllTorrents() {
+ Call("torrent-verify", new Dictionary<string, object>());
+ }
+
+ /// <summary>
+ /// Set torrents' properties.
+ ///
+ /// Not all torrent properties can be changed using this method, because some of them
+ /// are meaningless for torrent group, e.g. file priorities. Use <c>SetTorrent</c> method
+ /// to set such properties.
+ /// </summary>
+ /// <param name="torrent_hashes">Sequence of torrents hashed to modify</param>
+ /// <param name="peer_limit">Maximum number of used peers, if it is <c>null</c> then value won't be changed.</param>
+ /// <param name="limit_download">
+ /// Downloading speed limit switch, if it is <c>true</c>, downloading speed will be limited,
+ /// if it is <c>false</c>, downloading speed isn't limited, if it is <c>null</c>, limit switch won't be changed.
+ /// A <see cref="System.Nullable"/>
+ /// </param>
+ /// <param name="download_speed_limit">
+ /// A <see cref="System.Nullable"/>
+ /// </param>
+ /// <param name="limit_upload">
+ /// A <see cref="System.Nullable"/>
+ /// </param>
+ /// <param name="upload_speed_limit">
+ /// A <see cref="System.Nullable"/>
+ /// </param>
+ public void SetTorrents(IEnumerable<string> torrent_hashes, int? peer_limit, bool? limit_download, int? download_speed_limit, bool? limit_upload, int? upload_speed_limit) {
+ Dictionary<string, object> arguments = new Dictionary<string, object>();
+
+ arguments.Add("ids", torrent_hashes);
+ arguments.Add("peer-limit", peer_limit);
+
+ if (limit_download.HasValue) {
+ if (limit_download.Value) {
+ arguments.Add("downloadLimited", true);
+ if (download_speed_limit.HasValue)
+ arguments.Add("downloadLimit", download_speed_limit.Value);
+ } else {
+ arguments.Add("downloadLimited", false);
+ }
+ }
+
+ if (limit_upload.HasValue) {
+ if (limit_upload.Value) {
+ arguments.Add("uploadLimited", true);
+ if (upload_speed_limit.HasValue)
+ arguments.Add("uploadLimit", upload_speed_limit.Value);
+ } else {
+ arguments.Add("uploadLimited", false);
+ }
+ }
+
+ Call("torrent-set", arguments);
+ }
+
+ public void SetTorrent(string torrent_hash, int? peer_limit, bool? limit_download, int? download_speed_limit, bool? limit_upload, int? upload_speed_limit, IDictionary<int, FileOperation> files) {
+ Dictionary<string, object> arguments = new Dictionary<string, object>();
+
+ arguments.Add("ids", new string[] { torrent_hash });
+ arguments.Add("peer-limit", peer_limit);
+
+ if (limit_download.HasValue) {
+ if (limit_download.Value) {
+ arguments.Add("downloadLimited", true);
+ if (download_speed_limit.HasValue)
+ arguments.Add("downloadLimit", download_speed_limit.Value);
+ } else {
+ arguments.Add("downloadLimited", false);
+ }
+ }
+
+ if (limit_upload.HasValue) {
+ if (limit_upload.Value) {
+ arguments.Add("uploadLimited", true);
+ if (upload_speed_limit.HasValue)
+ arguments.Add("uploadLimit", upload_speed_limit.Value);
+ } else {
+ arguments.Add("uploadLimited", false);
+ }
+ }
+
+ List<int> wanted_files = new List<int>();
+ List<int> unwanted_files = new List<int>();
+ List<int> low_priority_files = new List<int>();
+ List<int> normal_priority_files = new List<int>();
+ List<int> high_priority_files = new List<int>();
+ foreach (KeyValuePair<int, FileOperation> op in files) {
+ int index = op.Key;
+ FileOperation file = op.Value;
+
+ if (file.download.HasValue) {
+ if (file.download.Value) wanted_files.Add(index);
+ else unwanted_files.Add(index);
+ }
+
+ if (file.priority.HasValue) {
+ switch (file.priority.Value) {
+ case FilePriority.Low: low_priority_files.Add(index); break;
+ case FilePriority.Normal: normal_priority_files.Add(index); break;
+ case FilePriority.High: high_priority_files.Add(index); break;
+ }
+ }
+ }
+ if (wanted_files.Count > 0) arguments.Add("files-wanted", wanted_files);
+ if (unwanted_files.Count > 0) arguments.Add("files-unwanted", unwanted_files);
+ if (low_priority_files.Count > 0) arguments.Add("priority-low", low_priority_files);
+ if (normal_priority_files.Count > 0) arguments.Add("priority-normal", normal_priority_files);
+ if (high_priority_files.Count > 0) arguments.Add("priority-high", high_priority_files);
+
+ Call("torrent-set", arguments);
+ }
+
+ /// <summary>
+ /// Torrent status.
+ /// </summary>
+ public enum TorrentStatus {
+ CheckWait = 1, Check = 2, Download = 4, Seed = 8, Stopped = 16
+ };
+
+ public class TorrentInfo {
+ [JsonProperty("id")]
+ public int Id; // Torrent's unique ID within Transmission.
+
+ [JsonProperty("comment")]
+ public string Comment;
+
+ [JsonProperty("hashString")]
+ public string HashString;
+
+ [JsonProperty("name")]
+ public string Name;
+
+ [JsonProperty("downloadDir")]
+ public string DownloadDir;
+
+ [JsonProperty("files")]
+ private IList<FileResponse> files;
+ [JsonProperty("wanted")]
+ private IList<bool> wanted;
+ [JsonProperty("priorities")]
+ private IList<int> priorities;
+
+ [JsonIgnore]
+ public IEnumerable<TorrentFileInfo> Files
+ {
+ get {
+ for (int i = 0; i < files.Count ; ++i) {
+ yield return new TorrentFileInfo {
+ Name = files[i].name,
+ Length = files[i].length,
+ BytesCompleted = files[i].bytesCompleted,
+ Wanted = wanted[i],
+ Priority = (FilePriority)priorities[i]
+ };
+ }
+ yield break;
+ }
+ }
+
+ [JsonProperty("status")]
+ private int status;
+ [JsonIgnore]
+ public TorrentStatus Status {
+ get {
+ return (TorrentStatus)status;
+ }
+ }
+
+ [JsonProperty("totalSize")]
+ public ulong TotalSize;
+
+ [JsonProperty("downloadLimit")]
+ public int DownloadLimit;
+
+ [JsonProperty("downloadLimited")]
+ public bool DownloadLimited;
+
+ [JsonProperty("uploadLimit")]
+ public int UploadLimit;
+
+ [JsonProperty("uploadLimited")]
+ public bool UploadLimited;
+ };
+
+ public class TorrentFileInfo {
+ public string Name;
+ public ulong Length;
+ public ulong BytesCompleted;
+ public bool Wanted;
+ public FilePriority Priority;
+ };
+
+ public class FileResponse
+ {
+ public UInt64 bytesCompleted;
+ public UInt64 length;
+ public string name;
+ }
+
+ public class TorrentGetResponse
+ {
+ public IList<TorrentInfo> torrents;
+ }
+
+ /// <summary>Get information about all torrents.</summary>
+ /// <remarks>This is equivalent to <c>GetTorrents(null)</c>.</remarks>
+ public IEnumerable<TorrentInfo> GetAllTorrents() {
+ return GetTorrents(null);
+ }
+
+ public IEnumerable<TorrentInfo> GetTorrents(IEnumerable<string> torrent_hashes) {
+ APIRequest request = new APIRequest ();
+
+ request.method = "torrent-get";
+
+ if (torrent_hashes != null)
+ request.arguments.Add("ids", torrent_hashes);
+ request.arguments.Add("fields", new string[] {"comment", "downloadDir", "files", "hashString", "id",
+ "name", "priorities", "status", "totalSize", "wanted",
+ "downloadLimited", "downloadLimit", "uploadLimited",
+ "uploadLimit"});
+
+ return Call<TorrentGetResponse> (request).torrents;
+ }
+
+ // Transmission RPC allows to use .torrent file content instead of it's filename, but
+ // this isn't supported.
+ public void AddTorrent(string filename, string download_to, bool paused, int? peer_limit) {
+ Dictionary<string, object> arguments = new Dictionary<string, object>();
+ arguments.Add("filename", filename);
+ arguments.Add("download-dir", download_to);
+ arguments.Add("paused", paused);
+ if (peer_limit.HasValue) arguments.Add("peer-limit", peer_limit.Value);
+ Call("torrent-add", arguments);
+ }
+
+ /// <summary>
+ /// Remove torrents.
+ /// </summary>
+ /// <param name="hashes">Sequence of torrent hashes to remove.</param>
+ /// <param name="delete_files">Whether downloaded files should be deleted or not.</param>
+ public void RemoveTorrent(IEnumerable<string> hashes, bool delete_files) {
+ Dictionary<string, object> arguments = new Dictionary<string, object>();
+ arguments.Add("ids", hashes);
+ arguments.Add("delete-load-data", delete_files);
+ Call("torrent-remove", arguments);
+ }
+
+ /// <summary>
+ /// Set session parameters.
+ /// </summary>
+ /// <param name="download_dir">
+ /// Path to directory to download torrent contents to.
+ /// Pass <c>null</c> to keep old value.
+ /// </param>
+ /// <param name="peer_limit">
+ /// Global limit on number of connected peers. Pass <c>null</c> to keep old value.
+ /// </param>
+ /// <param name="limit_download">
+ /// Global limit on number of connected peers. Pass <c>null</c> to keep old value.
+ /// </param>
+ public void SetSession(
+ string download_dir, int? peer_limit,
+ bool? limit_download, int? download_speed_limit, bool? limit_upload, int? upload_speed_limit
+ ) {
+ Dictionary<string, object> arguments = new Dictionary<string, object>();
+
+ if (download_dir != null)
+ arguments.Add("download-dir", download_dir);
+
+ if (peer_limit.HasValue)
+ arguments.Add("peer-limit", peer_limit.Value);
+
+ if (limit_download.HasValue) {
+ if (limit_download.Value) {
+ arguments.Add("downloadLimited", true);
+ if (download_speed_limit.HasValue)
+ arguments.Add("downloadLimit", download_speed_limit.Value);
+ } else {
+ arguments.Add("downloadLimited", false);
+ }
+ }
+
+ if (limit_upload.HasValue) {
+ if (limit_upload.Value) {
+ arguments.Add("uploadLimited", true);
+ if (upload_speed_limit.HasValue)
+ arguments.Add("uploadLimit", upload_speed_limit.Value);
+ } else {
+ arguments.Add("uploadLimited", false);
+ }
+ }
+
+ Call("session-set", arguments);
+ }
+
+ public void GetSession() {
+ Call("session-get", new Dictionary<string, object>());
+ }
+
+ }
+}
diff --git a/Transmission/src/TransmissionPlugin.cs b/Transmission/src/TransmissionPlugin.cs
new file mode 100644
index 0000000..039780e
--- /dev/null
+++ b/Transmission/src/TransmissionPlugin.cs
@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+
+using Do.Platform;
+
+namespace Transmission {
+
+ public class ConnectionParameters {
+ public ConnectionParameters(string url, string username, string password) {
+ this.url = url;
+ this.username = username;
+ this.password = password;
+ }
+
+ public string url;
+ public string username;
+ public string password;
+ };
+
+ public class TransmissionPlugin {
+ private static TransmissionAPI transmission;
+
+ public static TransmissionAPI getTransmission() {
+ if (transmission == null) {
+ ConnectionParameters p = getTransmissionConnectionParameters();
+ Log<TransmissionPlugin>.Info("Using Transmission on {0}", p.url);
+ Log<TransmissionPlugin>.Debug("Using name, password: {0}:{1}", p.username, p.password);
+ transmission = new TransmissionAPI(p.url, p.username, p.password);
+ }
+ return transmission;
+ }
+
+ public static void ResetConnection() {
+ transmission = null;
+ }
+
+ public static ConnectionParameters getTransmissionConnectionParameters() {
+ string host = TransmissionConfig.Address;
+ int port = TransmissionConfig.Port;
+ string username = TransmissionConfig.UserName;
+ string password = TransmissionConfig.Password;
+
+ string url = string.Format("http://{0}:{1}/transmission/rpc", host, port);
+ return new ConnectionParameters(url, username, password);
+ }
+
+ };
+
+}
+
diff --git a/Transmission/src/Utils.cs b/Transmission/src/Utils.cs
new file mode 100644
index 0000000..f585cd9
--- /dev/null
+++ b/Transmission/src/Utils.cs
@@ -0,0 +1,111 @@
+
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+
+using Do.Platform;
+using Do.Universe;
+
+namespace Transmission {
+
+ class Utils {
+
+ public static int ParseSpeed(string speed) {
+ Regex regex = new Regex(
+ @"^(\d+)\s*(b|[km]i?b?)$",
+ RegexOptions.IgnoreCase | RegexOptions.IgnorePatternWhitespace
+ );
+ Match match = regex.Match(speed);
+
+ if (match.Success) {
+ int number = int.Parse(match.Groups[1].Value);
+ string unit = match.Groups[2].Value.ToLower();
+ int scale = 1;
+
+ if (unit == "" || unit[0] == 'k') scale = 1;
+ else if (unit[0] == 'm') scale = 1024;
+
+ return number * scale;
+
+ } else {
+ throw new ArgumentException("Invalid speed string");
+ }
+ }
+
+ public static string FormatAmount(float amount, string baseFormat, float[] scales, string[] formats) {
+ if (scales.Length != formats.Length)
+ throw new ArgumentException("'scales' and 'formats' arguments must have equal length");
+
+ // The typical scales count is three to five, so don't use binary search,
+ // but just plain reverse loop.
+ for (int i = scales.Length-1; i >= 0; --i) {
+ if (amount >= scales[i])
+ return string.Format(formats[i], amount / scales[i]);
+ }
+
+ return string.Format(baseFormat, amount);
+ }
+
+ // Format speed in KiB/sec into human-readable representation.
+ public static string FormatSpeed(int speed_kbytes_sec) {
+ return FormatAmount(speed_kbytes_sec, "{0} KiB/sec",
+ new float[] { 1024, 1024*1024},
+ new string[] {"{0:#.#} MiB/sec", "{0:#.#} GiB/sec"}
+ );
+ }
+
+ // Format size in bytes into human-readable representation.
+ public static string FormatSize(ulong size_bytes) {
+ return FormatAmount(size_bytes, "{0} B",
+ new float[] { 1024, 1024*1024, 1024*1024*1024},
+ new string[] {"{0:#.#} KiB", "{0:#.#} MiB", "{0:#.##} GiB"}
+ );
+ }
+
+ public readonly static IEnumerable<PredefinedSpeed> PredefinedSpeedItems = new List<PredefinedSpeed>() {
+ new PredefinedSpeed( 10, "10 KiB/sec", ""),
+ new PredefinedSpeed( 20, "20 KiB/sec", ""),
+ new PredefinedSpeed( 50, "50 KiB/sec", ""),
+ new PredefinedSpeed( 100, "100 KiB/sec", ""),
+ new PredefinedSpeed( 200, "200 KiB/sec", ""),
+ new PredefinedSpeed( 500, "500 KiB/sec", ""),
+ new PredefinedSpeed( 1 * 1024, "1 MiB/sec", ""),
+ new PredefinedSpeed( 2 * 1024, "2 MiB/sec", ""),
+ new PredefinedSpeed( 5 * 1024, "5 MiB/sec", ""),
+ new PredefinedSpeed( 10 * 1024, "10 MiB/sec", ""),
+ new PredefinedSpeed( 20 * 1024, "20 MiB/sec", ""),
+ new PredefinedSpeed( 50 * 1024, "50 MiB/sec", ""),
+ new PredefinedSpeed(100 * 1024, "100 MiB/sec", ""),
+ };
+
+ }
+
+ public class PredefinedSpeed: Item {
+ private string _name, _desc;
+ private int _value;
+
+ public PredefinedSpeed(int value, string name, string desc) {
+ _value = value;
+ _name = name;
+ _desc = desc;
+ }
+
+ public override string Name {
+ get { return _name; }
+ }
+
+ public override string Description {
+ get { return _desc; }
+ }
+
+ public override string Icon {
+ get { return "top"; }
+ }
+
+ public int Value {
+ get { return _value; }
+ }
+ }
+
+}
diff --git a/Vinagre/Makefile.am b/Vinagre/Makefile.am
index 583b8e0..22af82b 100644
--- a/Vinagre/Makefile.am
+++ b/Vinagre/Makefile.am
@@ -8,7 +8,7 @@ FILES = \
src/VinagreBrowseBookmarksItem.cs \
src/VNCHostSource.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/Vinagre.addin.xml
REFERENCES = \
diff --git a/Vinagre/Makefile.in b/Vinagre/Makefile.in
index 15e74d3..c682477 100644
--- a/Vinagre/Makefile.in
+++ b/Vinagre/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = Vinagre
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -290,7 +368,7 @@ FILES = \
src/VinagreBrowseBookmarksItem.cs \
src/VNCHostSource.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/Vinagre.addin.xml
REFERENCES = \
@@ -324,6 +402,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -335,8 +414,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -350,14 +432,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -407,10 +487,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -493,16 +578,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/Vinagre/Resources/Vinagre.addin.xml b/Vinagre/Resources/Vinagre.addin.xml
deleted file mode 100644
index 13d84da..0000000
--- a/Vinagre/Resources/Vinagre.addin.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<Addin
- id="VinagreVNC"
- namespace="Do"
- version="1.1"
- name="Vinagre VNC"
- description="Browse your VNC Viewer bookmarks and connect to remote servers."
- author="Alex Launi"
- category="Official"
- defaultEnabled="false"
- url="http://do.davebsd.com/wiki/Vinagre_Plugin"
- >
-
- <Runtime>
- <Import assembly="Vinagre.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <Extension path = "/Do/Action">
- <Action type="VinagreVNC.VNCAction" />
- </Extension>
-
- <Extension path = "/Do/ItemSource">
- <ItemSource type="VinagreVNC.VNCHostItem" />
- </Extension>
-</Addin>
diff --git a/VirtualBox/Makefile.am b/VirtualBox/Makefile.am
index d3e647e..dc08b81 100644
--- a/VirtualBox/Makefile.am
+++ b/VirtualBox/Makefile.am
@@ -17,8 +17,9 @@ FILES = \
src/VBoxBrowseVMSItem.cs \
src/IconMap.cs
+GENERATED_RESOURCES = Resources/VirtualBox.addin.xml
+
RESOURCES = \
- Resources/VirtualBox.addin.xml \
Resources/icons/os_dos.png \
Resources/icons/os_os2warp4.png \
Resources/icons/os_win95.png \
diff --git a/VirtualBox/Makefile.in b/VirtualBox/Makefile.in
index 1f07404..a28fc68 100644
--- a/VirtualBox/Makefile.in
+++ b/VirtualBox/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = VirtualBox
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -299,8 +377,8 @@ FILES = \
src/VBoxBrowseVMSItem.cs \
src/IconMap.cs
+GENERATED_RESOURCES = Resources/VirtualBox.addin.xml
RESOURCES = \
- Resources/VirtualBox.addin.xml \
Resources/icons/os_dos.png \
Resources/icons/os_os2warp4.png \
Resources/icons/os_win95.png \
@@ -393,6 +471,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -404,8 +483,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -419,14 +501,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -476,10 +556,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -562,16 +647,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/VirtualBox/Resources/VirtualBox.addin.xml b/VirtualBox/Resources/VirtualBox.addin.xml
deleted file mode 100644
index beb319f..0000000
--- a/VirtualBox/Resources/VirtualBox.addin.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<Addin
- id="VirtualBox"
- namespace="Do"
- version="1.3"
- name="VirtualBox"
- description="Control virtual machines in VirtualBox."
- author="Chris Szikszoy"
- category="Community"
- defaultEnabled="false"
- url="http://do.davebsd.com/wiki/VirtualBox_Plugin"
- >
-
- <Runtime>
- <Import assembly="VirtualBox.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <!-- Extensions included in this assembly -->
- <Extension path="/Do/ItemSource">
- <ItemSource type="VirtualBox.VMItemSource" />
- </Extension>
- <Extension path="/Do/Action">
- <Action type="VirtualBox.StartVM"/>
- <Action type="VirtualBox.PauseVM"/>
- <Action type="VirtualBox.ResumeVM"/>
- <Action type="VirtualBox.SaveVM"/>
- <Action type="VirtualBox.PowerOffVM"/>
- <Action type="VirtualBox.TakeSnapshot"/>
- <Action type="VirtualBox.RestoreFromSnapshot"/>
- </Extension>
-</Addin>
diff --git a/VolumeControl/Makefile.am b/VolumeControl/Makefile.am
index b9855aa..abb47e3 100644
--- a/VolumeControl/Makefile.am
+++ b/VolumeControl/Makefile.am
@@ -11,7 +11,7 @@ FILES = \
src/VolumeMaximizeItem.cs \
src/VolumeItemSource.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/VolumeControl.addin.xml
REFERENCES = \
diff --git a/VolumeControl/Makefile.in b/VolumeControl/Makefile.in
index 1873956..c58224d 100644
--- a/VolumeControl/Makefile.in
+++ b/VolumeControl/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = VolumeControl
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -293,7 +371,7 @@ FILES = \
src/VolumeMaximizeItem.cs \
src/VolumeItemSource.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/VolumeControl.addin.xml
REFERENCES = \
@@ -326,6 +404,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -337,8 +416,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -352,14 +434,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -409,10 +489,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -495,16 +580,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/VolumeControl/Resources/VolumeControl.addin.xml b/VolumeControl/Resources/VolumeControl.addin.xml
deleted file mode 100644
index 6127010..0000000
--- a/VolumeControl/Resources/VolumeControl.addin.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<Addin
- id="VolumeControl"
- namespace="Do"
- version="1.0"
- name="Volume Control"
- description="Control your system volume."
- author="Alex Launi"
- category="Official"
- defaultEnabled="false"
- url="http://do.davebsd.com/wiki/Volume_Control_Plugin"
- >
-
- <Runtime>
- <Import assembly="VolumeControl.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <Extension path = "/Do/ItemSource">
- <ItemSource type="VolumeControl.VolumeItemSource" />
- </Extension>
-</Addin>
diff --git a/WindowManager/Makefile.am b/WindowManager/Makefile.am
index 87da2a9..9cf8ab8 100644
--- a/WindowManager/Makefile.am
+++ b/WindowManager/Makefile.am
@@ -34,10 +34,10 @@ FILES = \
src/Xlib/X11Atoms.cs \
src/Xlib/Xlib.cs
+DLL_CONFIG_FILES = \
+ WindowManager.dll.config
-
-
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/WindowManager.addin.xml
REFERENCES = \
diff --git a/WindowManager/Makefile.in b/WindowManager/Makefile.in
index 1c9e250..0339dd0 100644
--- a/WindowManager/Makefile.in
+++ b/WindowManager/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE@@HAVE_WNCK_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE@@HAVE_WNCK_TRUE at am__append_2 = -debug -d:DEBUG
subdir = WindowManager
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
@HAVE_WNCK_TRUE at TARGET = library
@HAVE_WNCK_TRUE at SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
@HAVE_WNCK_TRUE at RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
- at HAVE_WNCK_TRUE@RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+ at HAVE_WNCK_TRUE@GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+ at HAVE_WNCK_TRUE@RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
@HAVE_WNCK_TRUE@ -resource:$(resource),$(notdir $(resource)))
@HAVE_WNCK_TRUE at BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ top_srcdir = @top_srcdir@
# Install plugins as data; there's no need for them to be excutable
@HAVE_WNCK_TRUE at plugindir = ${libdir}/gnome-do/plugins
- at HAVE_WNCK_TRUE@plugin_DATA = $(OUTPUT_FILES)
+ at HAVE_WNCK_TRUE@plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ top_srcdir = @top_srcdir@
# Clean and dist targets
#
@HAVE_WNCK_TRUE at EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- at HAVE_WNCK_TRUE@ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ at HAVE_WNCK_TRUE@ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ at HAVE_WNCK_TRUE@ $(DLL_CONFIG_FILES)
@HAVE_WNCK_TRUE at CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
@HAVE_WNCK_TRUE at DISTCLEANFILES = *.pidb
@@ -314,7 +392,10 @@ FILES = \
src/Xlib/X11Atoms.cs \
src/Xlib/Xlib.cs
-RESOURCES = \
+DLL_CONFIG_FILES = \
+ WindowManager.dll.config
+
+GENERATED_RESOURCES = \
Resources/WindowManager.addin.xml
REFERENCES = \
@@ -352,6 +433,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -363,8 +445,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -378,14 +463,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -435,10 +518,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -521,16 +609,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
@HAVE_WNCK_TRUE at all: $(OUTPUT_FILES)
diff --git a/WindowManager/Resources/WindowManager.addin.xml b/WindowManager/Resources/WindowManager.addin.xml
deleted file mode 100644
index 6b56f50..0000000
--- a/WindowManager/Resources/WindowManager.addin.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<Addin
- id="WindowManager"
- namespace= "Do"
- version="1.2"
- name="Window Manager"
- description="Control your windows or groups of windows with Do."
- author="Jason Smith"
- category="Official"
- defaultEnabled="false"
- url="http://do.davebsd.com/wiki/Window_Manager_Plugin"
- >
-
- <Runtime>
- <Import assembly="WindowManager.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <!-- Extensions included in this assembly -->
- <Extension path="/Do/Action">
- <Action type="WindowManager.WindowMinimizeAction" />
- <Action type="WindowManager.WindowMaximizeAction" />
- <Action type="WindowManager.WindowCloseAction" />
- <Action type="WindowManager.WindowFocusAction" />
- <Action type="WindowManager.WindowMoveAction" />
- <Action type="WindowManager.ScreenTileAction" />
- <Action type="WindowManager.ScreenCascadeAction" />
- <Action type="WindowManager.ScreenRestoreAction" />
- <Action type="WindowManager.ScreenSwapAction" />
- <Action type="WindowManager.ShowDesktopAction" />
- </Extension>
-
- <Extension path="/Do/ItemSource">
- <ItemSource type="WindowManager.ScreenItemSource" />
- <ItemSource type="WindowManager.WindowItemSource" />
- </Extension>
-</Addin>
diff --git a/WindowManager/WindowManager.dll.config b/WindowManager/WindowManager.dll.config
new file mode 100644
index 0000000..5c54554
--- /dev/null
+++ b/WindowManager/WindowManager.dll.config
@@ -0,0 +1,4 @@
+<configuration>
+ <dllmap dll="libgdk-x11" target="libgdk-x11-2.0.so"/>
+ <dllmap dll="X11" target="libX11.so.6"/>
+</configuration>
diff --git a/Woof/Makefile.am b/Woof/Makefile.am
index cf5688f..a01c6a6 100644
--- a/Woof/Makefile.am
+++ b/Woof/Makefile.am
@@ -6,12 +6,14 @@ FILES = \
src/Woof.cs \
src/WoofAction.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/Woof.addin.xml
+BUILD_DEFINES=$(DBUS_BUILD_DEFINES)
+
REFERENCES = \
System \
System.Core \
- $(NDESK_DBUS_10_LIBS) \
+ $(DBUS_SHARP_LIBS) \
$(DO_PLATFORM_LIBS) \
$(DO_UNIVERSE_LIBS)
diff --git a/Woof/Makefile.in b/Woof/Makefile.in
index e9aa8a0..ae59bdc 100644
--- a/Woof/Makefile.in
+++ b/Woof/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = Woof
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -288,13 +366,14 @@ FILES = \
src/Woof.cs \
src/WoofAction.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/Woof.addin.xml
+BUILD_DEFINES = $(DBUS_BUILD_DEFINES)
REFERENCES = \
System \
System.Core \
- $(NDESK_DBUS_10_LIBS) \
+ $(DBUS_SHARP_LIBS) \
$(DO_PLATFORM_LIBS) \
$(DO_UNIVERSE_LIBS)
@@ -322,6 +401,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -333,8 +413,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -348,14 +431,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -405,10 +486,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -491,16 +577,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/Woof/Resources/Woof.addin.xml b/Woof/Resources/Woof.addin.xml
deleted file mode 100644
index a0685aa..0000000
--- a/Woof/Resources/Woof.addin.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<Addin
- id="Woof"
- namespace="Do"
- version="1.0"
- name="Woof! (Web Offer One File)"
- description="Send files and folders at blazing speed to Pidgin contacts on your local network."
- author="Mathieu Cadet"
- category="Community"
- defaultEnabled="false"
- >
-
- <Runtime>
- <Import assembly="Woof.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <!-- Extensions included in this assembly -->
- <Extension path="/Do/Action">
- <Action type="Woof.WoofSendFileAction" />
- </Extension>
-
-</Addin>
diff --git a/Woof/src/Woof.cs b/Woof/src/Woof.cs
index 4593899..4e48fd7 100644
--- a/Woof/src/Woof.cs
+++ b/Woof/src/Woof.cs
@@ -22,7 +22,11 @@ using System.IO;
using System.Collections.Generic;
using System.Reflection;
using System.Threading;
+#if USE_DBUS_SHARP
+using DBus;
+#else
using NDesk.DBus;
+#endif
using org.freedesktop.DBus;
using Do.Universe;
diff --git a/Wordnet/Makefile.am b/Wordnet/Makefile.am
index 827371e..becb2da 100644
--- a/Wordnet/Makefile.am
+++ b/Wordnet/Makefile.am
@@ -5,7 +5,7 @@ ASSEMBLY=Wordnet
FILES = \
src/WordnetAction.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/Wordnet.addin.xml
REFERENCES = \
diff --git a/Wordnet/Makefile.in b/Wordnet/Makefile.in
index 467a2f0..e4f1f70 100644
--- a/Wordnet/Makefile.in
+++ b/Wordnet/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = Wordnet
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -287,7 +365,7 @@ ASSEMBLY = Wordnet
FILES = \
src/WordnetAction.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/Wordnet.addin.xml
REFERENCES = \
@@ -319,6 +397,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -330,8 +409,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -345,14 +427,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -402,10 +482,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -488,16 +573,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/Wordnet/Resources/Wordnet.addin.xml b/Wordnet/Resources/Wordnet.addin.xml
deleted file mode 100644
index 6efffdd..0000000
--- a/Wordnet/Resources/Wordnet.addin.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<Addin
- id="Wordnet"
- namespace="Do"
- version="1.0"
- name="Wordnet"
- description="Define words on Wordnet."
- author="Ankit Solanki"
- category="Community"
- defaultEnabled="false"
- url="http://do.davebsd.com/wiki/Wordnet_Plugin"
- >
-
- <Runtime>
- <Import assembly="Wordnet.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <!-- Extensions included in this assembly -->
- <Extension path="/Do/Action">
- <Action type="Simulacra.WordnetAction" />
- </Extension>
-
-</Addin>
diff --git a/XRandR/Makefile.am b/XRandR/Makefile.am
index 1851a09..2c49903 100644
--- a/XRandR/Makefile.am
+++ b/XRandR/Makefile.am
@@ -9,7 +9,10 @@ FILES = \
src/OutputModeItem.cs \
src/XRandRItemSource.cs
-RESOURCES = \
+DLL_CONFIG_FILES = \
+ XRandR.dll.config
+
+GENERATED_RESOURCES = \
Resources/XRandR.addin.xml
REFERENCES = \
diff --git a/XRandR/Makefile.in b/XRandR/Makefile.in
index cb5de78..87e389a 100644
--- a/XRandR/Makefile.in
+++ b/XRandR/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = XRandR
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -291,7 +369,10 @@ FILES = \
src/OutputModeItem.cs \
src/XRandRItemSource.cs
-RESOURCES = \
+DLL_CONFIG_FILES = \
+ XRandR.dll.config
+
+GENERATED_RESOURCES = \
Resources/XRandR.addin.xml
REFERENCES = \
@@ -325,6 +406,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -336,8 +418,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -351,14 +436,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -408,10 +491,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -494,16 +582,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/XRandR/Resources/XRandR.addin.xml b/XRandR/Resources/XRandR.addin.xml
deleted file mode 100644
index 27f05ea..0000000
--- a/XRandR/Resources/XRandR.addin.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<Addin
- id="XRandR"
- namespace="Do"
- version="0.5.1"
- name="XRandR Screen Resolution Control"
- description="Control the resolution of your X outputs."
- author="Johannes Rudolph, Alex Launi"
- category="Community"
- defaultEnabled="false"
- >
-
- <Runtime>
- <Import assembly="XRandR.dll"/>
- </Runtime>
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <Extension path = "/Do/ItemSource">
- <ItemSource type="XRandR.XRandRItemSource" />
- </Extension>
-</Addin>
diff --git a/XRandR/XRandR.dll.config b/XRandR/XRandR.dll.config
new file mode 100644
index 0000000..6166c25
--- /dev/null
+++ b/XRandR/XRandR.dll.config
@@ -0,0 +1,4 @@
+<configuration>
+ <dllmap dll="libXrandr" target="libXrandr.so.2"/>
+ <dllmap dll="libX11" target="libX11.so.6" />
+</configuration>
diff --git a/Xmms2/Makefile.am b/Xmms2/Makefile.am
index 13284e4..6c24052 100644
--- a/Xmms2/Makefile.am
+++ b/Xmms2/Makefile.am
@@ -13,7 +13,7 @@ FILES = \
src/xmms2QueueAction.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/xmms2.addin.xml
REFERENCES = \
diff --git a/Xmms2/Makefile.in b/Xmms2/Makefile.in
index f0929d0..747aa59 100644
--- a/Xmms2/Makefile.in
+++ b/Xmms2/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = Xmms2
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -294,7 +372,7 @@ FILES = \
src/xmms2PlaylistActions.cs \
src/xmms2QueueAction.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/xmms2.addin.xml
REFERENCES = \
@@ -326,6 +404,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -337,8 +416,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -352,14 +434,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -409,10 +489,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -495,16 +580,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/Xmms2/Resources/xmms2.addin.xml b/Xmms2/Resources/xmms2.addin.xml
deleted file mode 100644
index 56142b6..0000000
--- a/Xmms2/Resources/xmms2.addin.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<Addin
- id="xmms2"
- namespace="Do"
- version="1.0"
- name="xmms2"
- description="Search and play xmms2 music."
- author="Scott Albertine"
- category="Community"
- defaultEnabled="false"
- >
-
- <Runtime>
- <Import assembly="xmms2.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <!-- Extensions included in this assembly -->
- <!-- Sources -->
- <Extension path = "/Do/ItemSource">
- <ItemSource type="Do.Addins.xmms2.xmms2MusicItemSource" />
- </Extension>
- <Extension path = "/Do/Action">
- <Action type="Do.Addins.xmms2.xmms2PlayAction" />
- <Action type="Do.Addins.xmms2.xmms2LoadAction" />
- <Action type="Do.Addins.xmms2.xmms2QueueAction" />
- <Action type="Do.Addins.xmms2.xmms2ClearAction" />
- <Action type="Do.Addins.xmms2.xmms2ShuffleAction" />
- <Action type="Do.Addins.xmms2.xmms2RepeatAction" />
- <Action type="Do.Addins.xmms2.xmms2CreatePlaylistAction" />
- <Action type="Do.Addins.xmms2.xmms2RemovePlaylistAction" />
- </Extension>
-</Addin>
diff --git a/YouTube/Makefile.am b/YouTube/Makefile.am
index a4bc589..d10e23d 100644
--- a/YouTube/Makefile.am
+++ b/YouTube/Makefile.am
@@ -16,8 +16,9 @@ FILES = \
src/YoutubeVideoItem.cs \
src/CertHandler.cs
+GENERATED_RESOURCES = \
+ Resources/Youtube.addin.xml
RESOURCES = \
- Resources/Youtube.addin.xml \
Resources/youtube_user.png \
Resources/youtube_logo.png
diff --git a/YouTube/Makefile.in b/YouTube/Makefile.in
index c21ee6d..7aa6c17 100644
--- a/YouTube/Makefile.in
+++ b/YouTube/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE@@HAVE_YOUTUBE_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE@@HAVE_YOUTUBE_TRUE at am__append_2 = -debug -d:DEBUG
subdir = YouTube
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
@HAVE_YOUTUBE_TRUE at TARGET = library
@HAVE_YOUTUBE_TRUE at SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
@HAVE_YOUTUBE_TRUE at RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
- at HAVE_YOUTUBE_TRUE@RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+ at HAVE_YOUTUBE_TRUE@GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+ at HAVE_YOUTUBE_TRUE@RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
@HAVE_YOUTUBE_TRUE@ -resource:$(resource),$(notdir $(resource)))
@HAVE_YOUTUBE_TRUE at BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ top_srcdir = @top_srcdir@
# Install plugins as data; there's no need for them to be excutable
@HAVE_YOUTUBE_TRUE at plugindir = ${libdir}/gnome-do/plugins
- at HAVE_YOUTUBE_TRUE@plugin_DATA = $(OUTPUT_FILES)
+ at HAVE_YOUTUBE_TRUE@plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ top_srcdir = @top_srcdir@
# Clean and dist targets
#
@HAVE_YOUTUBE_TRUE at EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- at HAVE_YOUTUBE_TRUE@ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ at HAVE_YOUTUBE_TRUE@ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ at HAVE_YOUTUBE_TRUE@ $(DLL_CONFIG_FILES)
@HAVE_YOUTUBE_TRUE at CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
@HAVE_YOUTUBE_TRUE at DISTCLEANFILES = *.pidb
@@ -296,8 +374,10 @@ FILES = \
src/YoutubeVideoItem.cs \
src/CertHandler.cs
+GENERATED_RESOURCES = \
+ Resources/Youtube.addin.xml
+
RESOURCES = \
- Resources/Youtube.addin.xml \
Resources/youtube_user.png \
Resources/youtube_logo.png
@@ -335,6 +415,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -346,8 +427,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -361,14 +445,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -418,10 +500,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -504,16 +591,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
@HAVE_YOUTUBE_TRUE at all: $(OUTPUT_FILES)
diff --git a/YouTube/Resources/Youtube.addin.xml b/YouTube/Resources/Youtube.addin.xml
deleted file mode 100644
index b4010b8..0000000
--- a/YouTube/Resources/Youtube.addin.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<Addin
- id="YouTube"
- namespace= "Do"
- version="1.1"
- name="YouTube"
- description="Search your favorites, subscriptions, uploaded videos, and more."
- author="Luis Miguel Montiel G"
- category="Community"
- defaultEnabled="false"
- >
-
- <Runtime>
- <Import assembly="YouTube.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <!-- Extensions included in this assembly -->
- <!-- Sources -->
- <Extension path = "/Do/ItemSource">
- <ItemSource type="Youtube.YouTubeFavoriteItemSource" />
- <ItemSource type="Youtube.YouTubeSubscriptionItemSource" />
- <ItemSource type="Youtube.YouTubeOwnVideosItemSource" />
- </Extension>
- <Extension path = "/Do/Action">
- <Action type="Youtube.YouTubeSearchAction" />
- </Extension>
-</Addin>
diff --git a/Zim/Makefile.am b/Zim/Makefile.am
index c8af087..ac609ff 100644
--- a/Zim/Makefile.am
+++ b/Zim/Makefile.am
@@ -9,7 +9,7 @@ FILES = \
src/ZimPage.cs \
src/ZimPagesItemSource.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/Zim.addin.xml
REFERENCES = \
diff --git a/Zim/Makefile.in b/Zim/Makefile.in
index 07779e2..dfc7d93 100644
--- a/Zim/Makefile.in
+++ b/Zim/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.13.3 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -20,6 +19,51 @@
# Inspired and adapted from Banshee's build system
VPATH = @srcdir@
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+ case $${target_option-} in \
+ ?) ;; \
+ *) echo "am__make_running_with_option: internal error: invalid" \
+ "target option '$${target_option-}' specified" >&2; \
+ exit 1;; \
+ esac; \
+ has_opt=no; \
+ sane_makeflags=$$MAKEFLAGS; \
+ if $(am__is_gnu_make); then \
+ sane_makeflags=$$MFLAGS; \
+ else \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+ bs=\\; \
+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+ esac; \
+ fi; \
+ skip_next=no; \
+ strip_trailopt () \
+ { \
+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+ }; \
+ for flg in $$sane_makeflags; do \
+ test $$skip_next = yes && { skip_next=no; continue; }; \
+ case $$flg in \
+ *=*|--*) continue;; \
+ -*I) strip_trailopt 'I'; skip_next=yes;; \
+ -*I?*) strip_trailopt 'I';; \
+ -*O) strip_trailopt 'O'; skip_next=yes;; \
+ -*O?*) strip_trailopt 'O';; \
+ -*l) strip_trailopt 'l'; skip_next=yes;; \
+ -*l?*) strip_trailopt 'l';; \
+ -[dEDm]) skip_next=yes;; \
+ -[JT]) skip_next=yes;; \
+ esac; \
+ case $$flg in \
+ *$$target_option*) has_opt=yes; break;; \
+ esac; \
+ done; \
+ test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
@@ -36,8 +80,8 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
- $(top_srcdir)/build.rules.mk
+DIST_COMMON = $(top_srcdir)/build.rules.mk $(srcdir)/Makefile.in \
+ $(srcdir)/Makefile.am
@ENABLE_DEBUG_TRUE at am__append_1 = $(ASSEMBLY_FILE).mdb
@ENABLE_DEBUG_TRUE at am__append_2 = -debug -d:DEBUG
subdir = Zim
@@ -46,14 +90,31 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/shamrock/expansions.m4 \
$(top_srcdir)/m4/shamrock/i18n.m4 \
$(top_srcdir)/m4/shamrock/mono.m4 \
$(top_srcdir)/m4/shamrock/programs.m4 \
- $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
+am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+ *) (install-info --version) >/dev/null 2>&1;; \
+ esac
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,12 +136,20 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+ $(am__cd) "$$dir" && rm -f $$files; }; \
+ }
am__installdirs = "$(DESTDIR)$(plugindir)"
DATA = $(plugin_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
ASM_VERSION = @ASM_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -99,12 +168,14 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
+DBUS_BUILD_DEFINES = @DBUS_BUILD_DEFINES@
DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@
DBUS_SHARP_GLIB_CFLAGS = @DBUS_SHARP_GLIB_CFLAGS@
DBUS_SHARP_GLIB_LIBS = @DBUS_SHARP_GLIB_LIBS@
DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DMCS = @DMCS@
DO_PLATFORM_CFLAGS = @DO_PLATFORM_CFLAGS@
DO_PLATFORM_LIBS = @DO_PLATFORM_LIBS@
DO_PLATFORM_LINUX_CFLAGS = @DO_PLATFORM_LINUX_CFLAGS@
@@ -133,6 +204,7 @@ GLADE_SHARP_20_CFLAGS = @GLADE_SHARP_20_CFLAGS@
GLADE_SHARP_20_LIBS = @GLADE_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GMCS = @GMCS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOME_DESKTOP_SHARP_20_CFLAGS = @GNOME_DESKTOP_SHARP_20_CFLAGS@
@@ -157,6 +229,10 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
+INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
+INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
+INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
@@ -175,10 +251,8 @@ MONO_ADDINS_SETUP_LIBS = @MONO_ADDINS_SETUP_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
-NDESK_DBUS_10_CFLAGS = @NDESK_DBUS_10_CFLAGS@
-NDESK_DBUS_10_LIBS = @NDESK_DBUS_10_LIBS@
-NDESK_DBUS_GLIB_10_CFLAGS = @NDESK_DBUS_GLIB_10_CFLAGS@
-NDESK_DBUS_GLIB_10_LIBS = @NDESK_DBUS_GLIB_10_LIBS@
+NEWTONSOFT_JSON_CFLAGS = @NEWTONSOFT_JSON_CFLAGS@
+NEWTONSOFT_JSON_LIBS = @NEWTONSOFT_JSON_LIBS@
NOTIFY_SHARP_CFLAGS = @NOTIFY_SHARP_CFLAGS@
NOTIFY_SHARP_LIBS = @NOTIFY_SHARP_LIBS@
OBJEXT = @OBJEXT@
@@ -232,6 +306,8 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
+intltool__v_merge_options_ = @intltool__v_merge_options_@
+intltool__v_merge_options_0 = @intltool__v_merge_options_0@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
@@ -254,7 +330,8 @@ top_srcdir = @top_srcdir@
TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -266,7 +343,7 @@ OUTPUT_FILES = $(ASSEMBLY_FILE) $(am__append_1)
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -278,7 +355,8 @@ MCS_FLAGS = $(MCS_LINQ_FLAG) -noconfig -codepage:utf8 -warn:4 \
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
@@ -291,7 +369,7 @@ FILES = \
src/ZimPage.cs \
src/ZimPagesItemSource.cs
-RESOURCES = \
+GENERATED_RESOURCES = \
Resources/Zim.addin.xml
REFERENCES = \
@@ -325,6 +403,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
+$(top_srcdir)/build.rules.mk:
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -336,8 +415,11 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps)
$(am__aclocal_m4_deps):
install-pluginDATA: $(plugin_DATA)
@$(NORMAL_INSTALL)
- test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
+ if test -n "$$list"; then \
+ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
+ $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \
+ fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -351,14 +433,12 @@ uninstall-pluginDATA:
@$(NORMAL_UNINSTALL)
@list='$(plugin_DATA)'; test -n "$(plugindir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(plugindir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(plugindir)" && rm -f $$files
-tags: TAGS
-TAGS:
+ dir='$(DESTDIR)$(plugindir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
distdir: $(DISTFILES)
@@ -408,10 +488,15 @@ install-am: all-am
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- `test -z '$(STRIP)' || \
- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ if test -z '$(STRIP)'; then \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ install; \
+ else \
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
mostlyclean-generic:
clean-generic:
@@ -494,16 +579,17 @@ uninstall-am: uninstall-pluginDATA
.MAKE: install-am install-strip
-.PHONY: all all-am check check-am clean clean-generic distclean \
- distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pluginDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-pluginDATA
+.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
+ ctags-am distclean distclean-generic distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-pluginDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags-am uninstall uninstall-am \
+ uninstall-pluginDATA
all: $(OUTPUT_FILES)
diff --git a/Zim/Resources/Zim.addin.xml b/Zim/Resources/Zim.addin.xml
deleted file mode 100644
index 7866123..0000000
--- a/Zim/Resources/Zim.addin.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<Addin
- id="Zim"
- namespace="Do"
- version="1.0"
- name="Zim"
- description="Access Zim pages."
- author="Karol Będkowski"
- category="Community"
- defaultEnabled="false"
- >
-
- <Runtime>
- <Import assembly="Zim.dll"/>
- </Runtime>
-
- <Localizer type="Gettext" catalog="gnome-do-plugins" location="/usr/local/share/locale" />
-
- <Dependencies>
- <Addin id="Universe" version="1.0" />
- </Dependencies>
-
- <Extension path="/Do/ItemSource">
- <ItemSource type="Zim.ZimPagesItemSource" />
- </Extension>
- <Extension path="/Do/Action">
- <Action type="Zim.ZimOpenPageAction" />
- <Action type="Zim.ZimNewPageAction" />
- </Extension>
-</Addin>
diff --git a/aclocal.m4 b/aclocal.m4
index c3e82a8..4a4bbf6 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.13.3 -*- Autoconf -*-
+
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -11,13 +11,14 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
+m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
-[m4_warning([this file was generated for autoconf 2.68.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
+[m4_warning([this file was generated for autoconf 2.69.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically `autoreconf'.])])
+To do so, use the procedure documented by the package, typically 'autoreconf'.])])
# Copyright (C) 1995-2002 Free Software Foundation, Inc.
# Copyright (C) 2001-2003,2004 Red Hat, Inc.
@@ -260,6 +261,10 @@ msgstr ""
[CATOBJEXT=.mo
DATADIRNAME=lib])
;;
+ *-*-openbsd*)
+ CATOBJEXT=.mo
+ DATADIRNAME=share
+ ;;
*)
CATOBJEXT=.mo
DATADIRNAME=lib
@@ -332,7 +337,6 @@ msgstr ""
dnl
glib_DEFUN([GLIB_GNU_GETTEXT],
[AC_REQUIRE([AC_PROG_CC])dnl
- AC_REQUIRE([AC_HEADER_STDC])dnl
GLIB_LC_MESSAGES
GLIB_WITH_NLS
@@ -452,200 +456,6 @@ sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
fi])
-
-dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
-# serial 40 IT_PROG_INTLTOOL
-AC_DEFUN([IT_PROG_INTLTOOL], [
-AC_PREREQ([2.50])dnl
-AC_REQUIRE([AM_NLS])dnl
-
-case "$am__api_version" in
- 1.[01234])
- AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
- ;;
- *)
- ;;
-esac
-
-if test -n "$1"; then
- AC_MSG_CHECKING([for intltool >= $1])
-
- INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
- INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
- [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
- ]
- AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
- test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
- AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.])
-fi
-
-AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update])
-AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge])
-AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract])
-if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
- AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])
-fi
-
- INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@'
- INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@'
- INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-
-_IT_SUBST(INTLTOOL_DESKTOP_RULE)
-_IT_SUBST(INTLTOOL_DIRECTORY_RULE)
-_IT_SUBST(INTLTOOL_KEYS_RULE)
-_IT_SUBST(INTLTOOL_PROP_RULE)
-_IT_SUBST(INTLTOOL_OAF_RULE)
-_IT_SUBST(INTLTOOL_PONG_RULE)
-_IT_SUBST(INTLTOOL_SERVER_RULE)
-_IT_SUBST(INTLTOOL_SHEET_RULE)
-_IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
-_IT_SUBST(INTLTOOL_UI_RULE)
-_IT_SUBST(INTLTOOL_XAM_RULE)
-_IT_SUBST(INTLTOOL_KBD_RULE)
-_IT_SUBST(INTLTOOL_XML_RULE)
-_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
-_IT_SUBST(INTLTOOL_CAVES_RULE)
-_IT_SUBST(INTLTOOL_SCHEMAS_RULE)
-_IT_SUBST(INTLTOOL_THEME_RULE)
-_IT_SUBST(INTLTOOL_SERVICE_RULE)
-_IT_SUBST(INTLTOOL_POLICY_RULE)
-
-# Check the gettext tools to make sure they are GNU
-AC_PATH_PROG(XGETTEXT, xgettext)
-AC_PATH_PROG(MSGMERGE, msgmerge)
-AC_PATH_PROG(MSGFMT, msgfmt)
-AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
- AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
-fi
-xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
-mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
-mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
-if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
- AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
-fi
-
-AC_PATH_PROG(INTLTOOL_PERL, perl)
-if test -z "$INTLTOOL_PERL"; then
- AC_MSG_ERROR([perl not found])
-fi
-AC_MSG_CHECKING([for perl >= 5.8.1])
-$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
-if test $? -ne 0; then
- AC_MSG_ERROR([perl 5.8.1 is required for intltool])
-else
- IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
- AC_MSG_RESULT([$IT_PERL_VERSION])
-fi
-if test "x$2" != "xno-xml"; then
- AC_MSG_CHECKING([for XML::Parser])
- if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
- AC_MSG_RESULT([ok])
- else
- AC_MSG_ERROR([XML::Parser perl module is required for intltool])
- fi
-fi
-
-# Substitute ALL_LINGUAS so we can use it in po/Makefile
-AC_SUBST(ALL_LINGUAS)
-
-# Set DATADIRNAME correctly if it is not set yet
-# (copied from glib-gettext.m4)
-if test -z "$DATADIRNAME"; then
- AC_LINK_IFELSE(
- [AC_LANG_PROGRAM([[]],
- [[extern int _nl_msg_cat_cntr;
- return _nl_msg_cat_cntr]])],
- [DATADIRNAME=share],
- [case $host in
- *-*-solaris*)
- dnl On Solaris, if bind_textdomain_codeset is in libc,
- dnl GNU format message catalog is always supported,
- dnl since both are added to the libc all together.
- dnl Hence, we'd like to go with DATADIRNAME=share
- dnl in this case.
- AC_CHECK_FUNC(bind_textdomain_codeset,
- [DATADIRNAME=share], [DATADIRNAME=lib])
- ;;
- *)
- [DATADIRNAME=lib]
- ;;
- esac])
-fi
-AC_SUBST(DATADIRNAME)
-
-IT_PO_SUBDIR([po])
-
-])
-
-
-# IT_PO_SUBDIR(DIRNAME)
-# ---------------------
-# All po subdirs have to be declared with this macro; the subdir "po" is
-# declared by IT_PROG_INTLTOOL.
-#
-AC_DEFUN([IT_PO_SUBDIR],
-[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
-dnl
-dnl The following CONFIG_COMMANDS should be executed at the very end
-dnl of config.status.
-AC_CONFIG_COMMANDS_PRE([
- AC_CONFIG_COMMANDS([$1/stamp-it], [
- if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
- AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
- fi
- rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
- >"$1/stamp-it.tmp"
- [sed '/^#/d
- s/^[[].*] *//
- /^[ ]*$/d
- '"s|^| $ac_top_srcdir/|" \
- "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
- ]
- [sed '/^POTFILES =/,/[^\\]$/ {
- /^POTFILES =/!d
- r $1/POTFILES
- }
- ' "$1/Makefile.in" >"$1/Makefile"]
- rm -f "$1/Makefile.tmp"
- mv "$1/stamp-it.tmp" "$1/stamp-it"
- ])
-])dnl
-])
-
-# _IT_SUBST(VARIABLE)
-# -------------------
-# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
-#
-AC_DEFUN([_IT_SUBST],
-[
-AC_SUBST([$1])
-m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
-]
-)
-
-# deprecated macros
-AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
-# A hint is needed for aclocal from Automake <= 1.9.4:
-# AC_DEFUN([AC_PROG_INTLTOOL], ...)
-
-
# nls.m4 serial 5 (gettext-0.18)
dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
dnl Inc.
@@ -839,7 +649,7 @@ else
fi[]dnl
])# PKG_CHECK_MODULES
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2002-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -851,10 +661,10 @@ fi[]dnl
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.11'
+[am__api_version='1.13'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.11.1], [],
+m4_if([$1], [1.13.3], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -870,22 +680,22 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.1])dnl
+[AM_AUTOMAKE_VERSION([1.13.3])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to
+# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
#
# Of course, Automake must honor this variable whenever it calls a
# tool from the auxiliary directory. The problem is that $srcdir (and
@@ -904,7 +714,7 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
#
# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
# are both prefixed by $srcdir. In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
+# harmless because $srcdir is '.', but things will broke when you
# start a VPATH build or use an absolute $srcdir.
#
# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
@@ -930,22 +740,19 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 9
-
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
# -------------------------------------
# Define a conditional.
AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+[AC_PREREQ([2.52])dnl
+ m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
AC_SUBST([$1_TRUE])dnl
AC_SUBST([$1_FALSE])dnl
_AM_SUBST_NOTMAKE([$1_TRUE])dnl
@@ -964,16 +771,14 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 10
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
# written in clear, in which case automake, when reading aclocal.m4,
# will think it sees a *use*, and therefore will trigger all it's
# C support machinery. Also note that it means that autoscan, seeing
@@ -983,7 +788,7 @@ fi])])
# _AM_DEPENDENCIES(NAME)
# ----------------------
# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
+# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
# We try a few techniques and use that to set a single cache variable.
#
# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
@@ -996,12 +801,13 @@ AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
AC_REQUIRE([AM_MAKE_INCLUDE])dnl
AC_REQUIRE([AM_DEP_TRACK])dnl
-ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
- [$1], CXX, [depcc="$CXX" am_compiler_list=],
- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
- [$1], UPC, [depcc="$UPC" am_compiler_list=],
- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
- [depcc="$$1" am_compiler_list=])
+m4_if([$1], [CC], [depcc="$CC" am_compiler_list=],
+ [$1], [CXX], [depcc="$CXX" am_compiler_list=],
+ [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+ [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
+ [$1], [UPC], [depcc="$UPC" am_compiler_list=],
+ [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
+ [depcc="$$1" am_compiler_list=])
AC_CACHE_CHECK([dependency style of $depcc],
[am_cv_$1_dependencies_compiler_type],
@@ -1009,8 +815,9 @@ AC_CACHE_CHECK([dependency style of $depcc],
# We make a subdir and do the tests there. Otherwise we can end up
# making bogus files that we don't know about and never remove. For
# instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
+ # making a dummy file named 'D' -- because '-MD' means "put the output
+ # in D".
+ rm -rf conftest.dir
mkdir conftest.dir
# Copy depcomp to subdir because otherwise we won't find it if we're
# using a relative directory.
@@ -1049,16 +856,16 @@ AC_CACHE_CHECK([dependency style of $depcc],
: > sub/conftest.c
for i in 1 2 3 4 5 6; do
echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
- # Solaris 8's {/usr,}/bin/sh.
- touch sub/conftst$i.h
+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+ # Solaris 10 /bin/sh.
+ echo '/* dummy */' > sub/conftst$i.h
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # We check with '-c' and '-o' for the sake of the "dashmstdout"
# mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this. Also, some Intel
- # versions had trouble with output in subdirs
+ # handle '-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs.
am__obj=sub/conftest.${OBJEXT-o}
am__minus_obj="-o $am__obj"
case $depmode in
@@ -1067,16 +874,16 @@ AC_CACHE_CHECK([dependency style of $depcc],
test "$am__universal" = false || continue
;;
nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
+ # After this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested.
if test "x$enable_dependency_tracking" = xyes; then
continue
else
break
fi
;;
- msvisualcpp | msvcmsys)
- # This compiler won't grok `-c -o', but also, the minuso test has
+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+ # This compiler won't grok '-c -o', but also, the minuso test has
# not run yet. These depmodes are late enough in the game, and
# so weak that their functioning should not be impacted.
am__obj=conftest.${OBJEXT-o}
@@ -1124,7 +931,7 @@ AM_CONDITIONAL([am__fastdep$1], [
# AM_SET_DEPDIR
# -------------
# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
AC_DEFUN([AM_SET_DEPDIR],
[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
@@ -1134,34 +941,39 @@ AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
# AM_DEP_TRACK
# ------------
AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[ --disable-dependency-tracking speeds up one-time build
- --enable-dependency-tracking do not reject slow dependency extractors])
+[AC_ARG_ENABLE([dependency-tracking], [dnl
+AS_HELP_STRING(
+ [--enable-dependency-tracking],
+ [do not reject slow dependency extractors])
+AS_HELP_STRING(
+ [--disable-dependency-tracking],
+ [speeds up one-time build])])
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
+ am__nodep='_no'
fi
AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
AC_SUBST([AMDEPBACKSLASH])dnl
_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+AC_SUBST([am__nodep])dnl
+_AM_SUBST_NOTMAKE([am__nodep])dnl
])
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-#serial 5
# _AM_OUTPUT_DEPENDENCY_COMMANDS
# ------------------------------
AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
[{
- # Autoconf 2.62 quotes --file arguments for eval, but not when files
+ # Older Autoconf quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval
# if we detect the quoting.
case $CONFIG_FILES in
@@ -1174,7 +986,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
# Strip MF so we end up with the name of the file.
mf=`echo "$mf" | sed -e 's/:.*$//'`
# Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
+ # We used to match only the files named 'Makefile.in', but
# some people rename them; so instead we look at the file content.
# Grep'ing the first line is not enough: some people post-process
# each Makefile.in and add a new line on top of each file to say so.
@@ -1186,21 +998,19 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
continue
fi
# Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
+ # from the Makefile without running 'make'.
DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
test -z "$DEPDIR" && continue
am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "am__include" && continue
+ test -z "$am__include" && continue
am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
# Find all dependency output files, they are included files with
# $(DEPDIR) in their names. We invoke sed twice because it is the
# simplest approach to changing $(DEPDIR) to its actual value in the
# expansion.
for file in `sed -n "
s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
fdir=`AS_DIRNAME(["$file"])`
@@ -1218,7 +1028,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
# This macro should only be invoked once -- use via AC_REQUIRE.
#
# This code is only required when automatic dependency tracking
-# is enabled. FIXME. This creates each `.P' file that we will
+# is enabled. FIXME. This creates each '.P' file that we will
# need in order to bootstrap the dependency handling code.
AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
[AC_CONFIG_COMMANDS([depfiles],
@@ -1228,15 +1038,12 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 16
-
# This macro actually does too much. Some checks are only needed if
# your package does certain things. But this isn't really a big deal.
@@ -1252,7 +1059,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
# arguments mandatory, and then we can depend on a new Autoconf
# release and drop the old call support.
AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.62])dnl
+[AC_PREREQ([2.65])dnl
dnl Autoconf wants to disallow AM_ names. We explicitly allow
dnl the ones we care about.
m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
@@ -1281,31 +1088,40 @@ AC_SUBST([CYGPATH_W])
# Define the identity of the package.
dnl Distinguish between old-style and new-style calls.
m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+[AC_DIAGNOSE([obsolete],
+ [$0: two- and three-arguments forms are deprecated.])
+m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
AC_SUBST([PACKAGE], [$1])dnl
AC_SUBST([VERSION], [$2])],
[_AM_SET_OPTIONS([$1])dnl
dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+m4_if(
+ m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
+ [ok:ok],,
[m4_fatal([AC_INIT should be called with package and version arguments])])dnl
AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
+ AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
# Some tools Automake needs.
AC_REQUIRE([AM_SANITY_CHECK])dnl
AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
+AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
+AM_MISSING_PROG([AUTOCONF], [autoconf])
+AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
+AM_MISSING_PROG([AUTOHEADER], [autoheader])
+AM_MISSING_PROG([MAKEINFO], [makeinfo])
AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+# For better backward compatibility. To be removed once Automake 1.9.x
+# dies out for good. For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
AC_REQUIRE([AC_PROG_AWK])dnl
@@ -1316,28 +1132,32 @@ _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
[_AM_PROG_TAR([v7])])])
_AM_IF_OPTION([no-dependencies],,
[AC_PROVIDE_IFELSE([AC_PROG_CC],
- [_AM_DEPENDENCIES(CC)],
- [define([AC_PROG_CC],
- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+ [_AM_DEPENDENCIES([CC])],
+ [m4_define([AC_PROG_CC],
+ m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
AC_PROVIDE_IFELSE([AC_PROG_CXX],
- [_AM_DEPENDENCIES(CXX)],
- [define([AC_PROG_CXX],
- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+ [_AM_DEPENDENCIES([CXX])],
+ [m4_define([AC_PROG_CXX],
+ m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
AC_PROVIDE_IFELSE([AC_PROG_OBJC],
- [_AM_DEPENDENCIES(OBJC)],
- [define([AC_PROG_OBJC],
- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+ [_AM_DEPENDENCIES([OBJC])],
+ [m4_define([AC_PROG_OBJC],
+ m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
+ [_AM_DEPENDENCIES([OBJCXX])],
+ [m4_define([AC_PROG_OBJCXX],
+ m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
])
-_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
-dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
-dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_REQUIRE([AM_SILENT_RULES])dnl
+dnl The testsuite driver may need to know about EXEEXT, so add the
+dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This
+dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
AC_CONFIG_COMMANDS_PRE(dnl
[m4_provide_if([_AM_COMPILER_EXEEXT],
[AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
])
-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
+dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
dnl mangled by Autoconf and run in a shell conditional statement.
m4_define([_AC_COMPILER_EXEEXT],
@@ -1365,7 +1185,7 @@ for _am_header in $config_headers :; do
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1384,16 +1204,14 @@ if test x"${install_sh}" != xset; then
install_sh="\${SHELL} $am_aux_dir/install-sh"
esac
fi
-AC_SUBST(install_sh)])
+AC_SUBST([install_sh])])
-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2003-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 2
-
# Check whether the underlying file-system supports filenames
# with a leading dot. For instance MS-DOS doesn't.
AC_DEFUN([AM_SET_LEADING_DOT],
@@ -1409,14 +1227,12 @@ AC_SUBST([am__leading_dot])])
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 4
-
# AM_MAKE_INCLUDE()
# -----------------
# Check to see how make treats includes.
@@ -1434,7 +1250,7 @@ am__quote=
_am_result=none
# First try GNU make style include.
echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# Ignore all kinds of additional output from 'make'.
case `$am_make -s -f confmf 2> /dev/null` in #(
*the\ am__doit\ target*)
am__include=include
@@ -1461,15 +1277,12 @@ rm -f confinc confmf
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 6
-
# AM_MISSING_PROG(NAME, PROGRAM)
# ------------------------------
AC_DEFUN([AM_MISSING_PROG],
@@ -1477,11 +1290,10 @@ AC_DEFUN([AM_MISSING_PROG],
$1=${$1-"${am_missing_run}$2"}
AC_SUBST($1)])
-
# AM_MISSING_HAS_RUN
# ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
+# Define MISSING if not defined so far and test if it is modern enough.
+# If it is, set am_missing_run to use it, otherwise, to nothing.
AC_DEFUN([AM_MISSING_HAS_RUN],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
AC_REQUIRE_AUX_FILE([missing])dnl
@@ -1494,63 +1306,35 @@ if test x"${MISSING+set}" != xset; then
esac
fi
# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
- am_missing_run="$MISSING --run "
+if eval "$MISSING --is-lightweight"; then
+ am_missing_run="$MISSING "
else
am_missing_run=
- AC_MSG_WARN([`missing' script is too old or missing])
+ AC_MSG_WARN(['missing' script is too old or missing])
fi
])
-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check for `mkdir -p'.
-AC_DEFUN([AM_PROG_MKDIR_P],
-[AC_PREREQ([2.60])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
-dnl while keeping a definition of mkdir_p for backward compatibility.
-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-dnl Makefile.ins that do not define MKDIR_P, so we do our own
-dnl adjustment using top_builddir (which is defined more often than
-dnl MKDIR_P).
-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-case $mkdir_p in
- [[\\/$]]* | ?:[[\\/]]*) ;;
- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-])
-
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 4
-
# _AM_MANGLE_OPTION(NAME)
# -----------------------
AC_DEFUN([_AM_MANGLE_OPTION],
[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
# _AM_SET_OPTION(NAME)
-# ------------------------------
+# --------------------
# Set option NAME. Presently that only means defining a flag for this option.
AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
# _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
+# ------------------------
# OPTIONS is a space-separated list of Automake options.
AC_DEFUN([_AM_SET_OPTIONS],
[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
@@ -1561,7 +1345,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1580,22 +1364,16 @@ AC_DEFUN([AM_RUN_LOG],
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 5
-
# AM_SANITY_CHECK
# ---------------
AC_DEFUN([AM_SANITY_CHECK],
[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
# Reject unsafe characters in $srcdir or the absolute working directory
# name. Accept space and tab only in the latter.
am_lf='
@@ -1606,32 +1384,40 @@ case `pwd` in
esac
case $srcdir in
*[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
- AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
+ AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
esac
-# Do `set' in a subshell so we don't clobber the current shell's
+# Do 'set' in a subshell so we don't clobber the current shell's
# arguments. Must try -L first in case configure is actually a
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
if (
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
- if test "$[*]" = "X"; then
- # -L didn't work.
- set X `ls -t "$srcdir/configure" conftest.file`
- fi
- rm -f conftest.file
- if test "$[*]" != "X $srcdir/configure conftest.file" \
- && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
-alias in your environment])
- fi
-
+ am_has_slept=no
+ for am_try in 1 2; do
+ echo "timestamp, slept: $am_has_slept" > conftest.file
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$[*]" = "X"; then
+ # -L didn't work.
+ set X `ls -t "$srcdir/configure" conftest.file`
+ fi
+ if test "$[*]" != "X $srcdir/configure conftest.file" \
+ && test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
+ alias in your environment])
+ fi
+ if test "$[2]" = conftest.file || test $am_try -eq 2; then
+ break
+ fi
+ # Just in case.
+ sleep 1
+ am_has_slept=yes
+ done
test "$[2]" = conftest.file
)
then
@@ -1641,9 +1427,85 @@ else
AC_MSG_ERROR([newly created file is older than distributed files!
Check your system clock])
fi
-AC_MSG_RESULT(yes)])
+AC_MSG_RESULT([yes])
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+ ( sleep 1 ) &
+ am_sleep_pid=$!
+fi
+AC_CONFIG_COMMANDS_PRE(
+ [AC_MSG_CHECKING([that generated files are newer than configure])
+ if test -n "$am_sleep_pid"; then
+ # Hide warnings about reused PIDs.
+ wait $am_sleep_pid 2>/dev/null
+ fi
+ AC_MSG_RESULT([done])])
+rm -f conftest.file
+])
-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2009-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# AM_SILENT_RULES([DEFAULT])
+# --------------------------
+# Enable less verbose build rules; with the default set to DEFAULT
+# ("yes" being less verbose, "no" or empty being verbose).
+AC_DEFUN([AM_SILENT_RULES],
+[AC_ARG_ENABLE([silent-rules], [dnl
+AS_HELP_STRING(
+ [--enable-silent-rules],
+ [less verbose build output (undo: "make V=1")])
+AS_HELP_STRING(
+ [--disable-silent-rules],
+ [verbose build output (undo: "make V=0")])dnl
+])
+case $enable_silent_rules in @%:@ (((
+ yes) AM_DEFAULT_VERBOSITY=0;;
+ no) AM_DEFAULT_VERBOSITY=1;;
+ *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+esac
+dnl
+dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
+dnl do not support nested variable expansions.
+dnl See automake bug#9928 and bug#10237.
+am_make=${MAKE-make}
+AC_CACHE_CHECK([whether $am_make supports nested variables],
+ [am_cv_make_support_nested_variables],
+ [if AS_ECHO([['TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+ @$(TRUE)
+.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
+ am_cv_make_support_nested_variables=yes
+else
+ am_cv_make_support_nested_variables=no
+fi])
+if test $am_cv_make_support_nested_variables = yes; then
+ dnl Using '$V' instead of '$(V)' breaks IRIX make.
+ AM_V='$(V)'
+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+ AM_V=$AM_DEFAULT_VERBOSITY
+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AC_SUBST([AM_V])dnl
+AM_SUBST_NOTMAKE([AM_V])dnl
+AC_SUBST([AM_DEFAULT_V])dnl
+AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
+AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
+AM_BACKSLASH='\'
+AC_SUBST([AM_BACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
+])
+
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1651,34 +1513,32 @@ AC_MSG_RESULT(yes)])
# AM_PROG_INSTALL_STRIP
# ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
+# One issue with vendor 'install' (even GNU) is that you can't
# specify the program used to strip binaries. This is especially
# annoying in cross-compiling environments, where the build's strip
# is unlikely to handle the host's binaries.
# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
+# always use install-sh in "make install-strip", and initialize
# STRIPPROG with the value of the STRIP variable (set by the user).
AC_DEFUN([AM_PROG_INSTALL_STRIP],
[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'. However `strip' might not be the right
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip". However 'strip' might not be the right
# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+# will honor the 'STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
if test "$cross_compiling" != no; then
AC_CHECK_TOOL([STRIP], [strip], :)
fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2006-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 2
-
# _AM_SUBST_NOTMAKE(VARIABLE)
# ---------------------------
# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
@@ -1686,24 +1546,22 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
AC_DEFUN([_AM_SUBST_NOTMAKE])
# AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
+# --------------------------
# Public sister of _AM_SUBST_NOTMAKE.
AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2004-2013 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 2
-
# _AM_PROG_TAR(FORMAT)
# --------------------
# Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
+# FORMAT should be one of 'v7', 'ustar', or 'pax'.
#
# Substitute a variable $(am__tar) that is a command
# writing to stdout a FORMAT-tarball containing the directory
@@ -1713,75 +1571,114 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Substitute a variable $(am__untar) that extract such
# a tarball read from stdin.
# $(am__untar) < result.tar
+#
AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
-m4_if([$1], [v7],
- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
- [m4_case([$1], [ustar],, [pax],,
- [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
+[# Always define AMTAR for backward compatibility. Yes, it's still used
+# in the wild :-( We should find a proper way to deprecate it ...
+AC_SUBST([AMTAR], ['$${TAR-tar}'])
+
+# We'll loop over all known methods to create a tar archive until one works.
_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
- case $_am_tool in
- gnutar)
- for _am_tar in tar gnutar gtar;
- do
- AM_RUN_LOG([$_am_tar --version]) && break
- done
- am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
- am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
- am__untar="$_am_tar -xf -"
- ;;
- plaintar)
- # Must skip GNU tar: if it does not support --format= it doesn't create
- # ustar tarball either.
- (tar --version) >/dev/null 2>&1 && continue
- am__tar='tar chf - "$$tardir"'
- am__tar_='tar chf - "$tardir"'
- am__untar='tar xf -'
- ;;
- pax)
- am__tar='pax -L -x $1 -w "$$tardir"'
- am__tar_='pax -L -x $1 -w "$tardir"'
- am__untar='pax -r'
- ;;
- cpio)
- am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
- am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
- am__untar='cpio -i -H $1 -d'
- ;;
- none)
- am__tar=false
- am__tar_=false
- am__untar=false
- ;;
- esac
- # If the value was cached, stop now. We just wanted to have am__tar
- # and am__untar set.
- test -n "${am_cv_prog_tar_$1}" && break
+m4_if([$1], [v7],
+ [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
+
+ [m4_case([$1],
+ [ustar],
+ [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
+ # There is notably a 21 bits limit for the UID and the GID. In fact,
+ # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
+ # and bug#13588).
+ am_max_uid=2097151 # 2^21 - 1
+ am_max_gid=$am_max_uid
+ # The $UID and $GID variables are not portable, so we need to resort
+ # to the POSIX-mandated id(1) utility. Errors in the 'id' calls
+ # below are definitely unexpected, so allow the users to see them
+ # (that is, avoid stderr redirection).
+ am_uid=`id -u || echo unknown`
+ am_gid=`id -g || echo unknown`
+ AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
+ if test $am_uid -le $am_max_uid; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ _am_tools=none
+ fi
+ AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
+ if test $am_gid -le $am_max_gid; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ _am_tools=none
+ fi],
+
+ [pax],
+ [],
+
+ [m4_fatal([Unknown tar format])])
+
+ AC_MSG_CHECKING([how to create a $1 tar archive])
+
+ # Go ahead even if we have the value already cached. We do so because we
+ # need to set the values for the 'am__tar' and 'am__untar' variables.
+ _am_tools=${am_cv_prog_tar_$1-$_am_tools}
+
+ for _am_tool in $_am_tools; do
+ case $_am_tool in
+ gnutar)
+ for _am_tar in tar gnutar gtar; do
+ AM_RUN_LOG([$_am_tar --version]) && break
+ done
+ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+ am__untar="$_am_tar -xf -"
+ ;;
+ plaintar)
+ # Must skip GNU tar: if it does not support --format= it doesn't create
+ # ustar tarball either.
+ (tar --version) >/dev/null 2>&1 && continue
+ am__tar='tar chf - "$$tardir"'
+ am__tar_='tar chf - "$tardir"'
+ am__untar='tar xf -'
+ ;;
+ pax)
+ am__tar='pax -L -x $1 -w "$$tardir"'
+ am__tar_='pax -L -x $1 -w "$tardir"'
+ am__untar='pax -r'
+ ;;
+ cpio)
+ am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+ am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+ am__untar='cpio -i -H $1 -d'
+ ;;
+ none)
+ am__tar=false
+ am__tar_=false
+ am__untar=false
+ ;;
+ esac
- # tar/untar a dummy directory, and stop if the command works
- rm -rf conftest.dir
- mkdir conftest.dir
- echo GrepMe > conftest.dir/file
- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+ # If the value was cached, stop now. We just wanted to have am__tar
+ # and am__untar set.
+ test -n "${am_cv_prog_tar_$1}" && break
+
+ # tar/untar a dummy directory, and stop if the command works.
+ rm -rf conftest.dir
+ mkdir conftest.dir
+ echo GrepMe > conftest.dir/file
+ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+ rm -rf conftest.dir
+ if test -s conftest.tar; then
+ AM_RUN_LOG([$am__untar <conftest.tar])
+ AM_RUN_LOG([cat conftest.dir/file])
+ grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+ fi
+ done
rm -rf conftest.dir
- if test -s conftest.tar; then
- AM_RUN_LOG([$am__untar <conftest.tar])
- grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
- fi
-done
-rm -rf conftest.dir
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+ AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+ AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+
AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
@@ -1790,3 +1687,4 @@ m4_include([m4/shamrock/expansions.m4])
m4_include([m4/shamrock/i18n.m4])
m4_include([m4/shamrock/mono.m4])
m4_include([m4/shamrock/programs.m4])
+m4_include([m4/intltool.m4])
diff --git a/build.rules.mk b/build.rules.mk
index 436281d..65fef3b 100644
--- a/build.rules.mk
+++ b/build.rules.mk
@@ -7,7 +7,8 @@ TARGET = library
SOURCES_BUILD = $(addprefix $(srcdir)/, $(FILES))
RESOURCES_EXPANDED = $(addprefix $(srcdir)/, $(RESOURCES))
-RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED), \
+GENERATED_RESOURCES_EXPANDED = $(addprefix $(builddir)/, $(GENERATED_RESOURCES))
+RESOURCES_BUILD = $(foreach resource, $(RESOURCES_EXPANDED) $(GENERATED_RESOURCES_EXPANDED), \
-resource:$(resource),$(notdir $(resource)))
BUILD_DIR = $(top_builddir)/build
@@ -25,7 +26,7 @@ endif
# Install plugins as data; there's no need for them to be excutable
plugindir = ${libdir}/gnome-do/plugins
-plugin_DATA = $(OUTPUT_FILES)
+plugin_DATA = $(OUTPUT_FILES) $(DLL_CONFIG_FILES)
# All plugins should be translatable; every plugin will need to link to
# Mono.Addins for this.
@@ -70,7 +71,8 @@ $(ASSEMBLY_FILE): $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(COMPONENT_DEPS)
# Clean and dist targets
#
EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) $(THEME_ICONS_SOURCE) \
- $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in)
+ $(foreach pkgcfg_file, $(PKG_CONFIG_FILES), $(pkgcfg_file).in) \
+ $(DLL_CONFIG_FILES)
CLEANFILES = $(OUTPUT_FILES) $(pkgconfig_DATA)
DISTCLEANFILES = *.pidb
diff --git a/configure b/configure
index b69bebc..575901d 100755
--- a/configure
+++ b/configure
@@ -1,11 +1,9 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for gnome-do-plugins 0.8.4.
+# Generated by GNU Autoconf 2.69 for gnome-do-plugins 0.8.5.
#
#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
#
#
# This configure script is free software; the Free Software Foundation
@@ -134,6 +132,31 @@ export LANGUAGE
# CDPATH.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+# Use a proper internal environment variable to ensure we don't fall
+ # into an infinite loop, continuously re-executing ourselves.
+ if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+ _as_can_reexec=no; export _as_can_reexec;
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+ fi
+ # We don't want this to propagate to other subprocesses.
+ { _as_can_reexec=; unset _as_can_reexec;}
if test "x$CONFIG_SHELL" = x; then
as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
emulate sh
@@ -167,7 +190,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
else
exitcode=1; echo positional parameters were not saved.
fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
@@ -212,21 +236,25 @@ IFS=$as_save_IFS
if test "x$CONFIG_SHELL" != x; then :
- # We cannot yet assume a decent shell, so we have to provide a
- # neutralization value for shells without unset; and this also
- # works around shells that cannot unset nonexistent variables.
- # Preserve -v and -x to the replacement shell.
- BASH_ENV=/dev/null
- ENV=/dev/null
- (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
- export CONFIG_SHELL
- case $- in # ((((
- *v*x* | *x*v* ) as_opts=-vx ;;
- *v* ) as_opts=-v ;;
- *x* ) as_opts=-x ;;
- * ) as_opts= ;;
- esac
- exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
+ export CONFIG_SHELL
+ # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+ *v*x* | *x*v* ) as_opts=-vx ;;
+ *v* ) as_opts=-v ;;
+ *x* ) as_opts=-x ;;
+ * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
fi
if test x$as_have_required = xno; then :
@@ -328,6 +356,14 @@ $as_echo X"$as_dir" |
} # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
# as_fn_append VAR VALUE
# ----------------------
# Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -449,6 +485,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
chmod +x "$as_me.lineno" ||
{ $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+ # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+ # already done that, so ensure we don't try to do so again and fall
+ # in an infinite loop. This has already happened in practice.
+ _as_can_reexec=no; export _as_can_reexec
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
# original and so on. Autoconf is especially sensitive to this).
@@ -483,16 +523,16 @@ if (echo >conf$$.file) 2>/dev/null; then
# ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
+ # In both cases, we have to default to `cp -pR'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -504,28 +544,8 @@ else
as_mkdir_p=false
fi
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
- test -d "$1/.";
- else
- case $1 in #(
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -617,8 +637,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='gnome-do-plugins'
PACKAGE_TARNAME='gnome-do-plugins'
-PACKAGE_VERSION='0.8.4'
-PACKAGE_STRING='gnome-do-plugins 0.8.4'
+PACKAGE_VERSION='0.8.5'
+PACKAGE_STRING='gnome-do-plugins 0.8.5'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -674,10 +694,6 @@ DO_PLATFORM_LIBS
DO_PLATFORM_CFLAGS
NOTIFY_SHARP_LIBS
NOTIFY_SHARP_CFLAGS
-NDESK_DBUS_GLIB_10_LIBS
-NDESK_DBUS_GLIB_10_CFLAGS
-NDESK_DBUS_10_LIBS
-NDESK_DBUS_10_CFLAGS
MONO_ADDINS_SETUP_LIBS
MONO_ADDINS_SETUP_CFLAGS
MONO_ADDINS_GUI_LIBS
@@ -700,6 +716,10 @@ GLADE_SHARP_20_LIBS
GLADE_SHARP_20_CFLAGS
GCONF_SHARP_20_LIBS
GCONF_SHARP_20_CFLAGS
+HAVE_TRANSMISSION_FALSE
+HAVE_TRANSMISSION_TRUE
+NEWTONSOFT_JSON_LIBS
+NEWTONSOFT_JSON_CFLAGS
TELEPATHY_SHARP_LIBS
HAVE_EMPATHY_FALSE
HAVE_EMPATHY_TRUE
@@ -732,19 +752,20 @@ HAVE_BANSHEE_FALSE
HAVE_BANSHEE_TRUE
BANSHEE_INDEXER_LIBS
BANSHEE_INDEXER_CFLAGS
+DBUS_BUILD_DEFINES
DBUS_SHARP_GLIB_LIBS
DBUS_SHARP_GLIB_CFLAGS
DBUS_SHARP_LIBS
DBUS_SHARP_CFLAGS
-BANSHEE_DBUS_SHARP_FALSE
-BANSHEE_DBUS_SHARP_TRUE
-PKG_CONFIG_LIBDIR
-PKG_CONFIG_PATH
expanded_datadir
expanded_bindir
expanded_libdir
MCS
+GMCS
+DMCS
MONO
+PKG_CONFIG_LIBDIR
+PKG_CONFIG_PATH
PKG_CONFIG
ASM_VERSION
CONFIG_STATUS_DEPENDENCIES
@@ -767,6 +788,7 @@ DATADIRNAME
am__fastdepCC_FALSE
am__fastdepCC_TRUE
CCDEPMODE
+am__nodep
AMDEPBACKSLASH
AMDEP_FALSE
AMDEP_TRUE
@@ -805,10 +827,20 @@ INTLTOOL_PROP_RULE
INTLTOOL_KEYS_RULE
INTLTOOL_DIRECTORY_RULE
INTLTOOL_DESKTOP_RULE
+intltool__v_merge_options_0
+intltool__v_merge_options_
+INTLTOOL_V_MERGE_OPTIONS
+INTLTOOL__v_MERGE_0
+INTLTOOL__v_MERGE_
+INTLTOOL_V_MERGE
INTLTOOL_EXTRACT
INTLTOOL_MERGE
INTLTOOL_UPDATE
USE_NLS
+AM_BACKSLASH
+AM_DEFAULT_VERBOSITY
+AM_DEFAULT_V
+AM_V
am__untar
am__tar
AMTAR
@@ -873,6 +905,7 @@ SHELL'
ac_subst_files=''
ac_user_opts='
enable_option_checking
+enable_silent_rules
enable_nls
enable_dependency_tracking
enable_banshee
@@ -883,6 +916,7 @@ enable_gdocs
enable_youtube
enable_wnck
enable_empathy
+enable_transmission
enable_debug
enable_release
'
@@ -916,6 +950,8 @@ GDATA_SHARP_YOUTUBE_CFLAGS
GDATA_SHARP_YOUTUBE_LIBS
WNCK_SHARP_10_CFLAGS
WNCK_SHARP_10_LIBS
+NEWTONSOFT_JSON_CFLAGS
+NEWTONSOFT_JSON_LIBS
GCONF_SHARP_20_CFLAGS
GCONF_SHARP_20_LIBS
GLADE_SHARP_20_CFLAGS
@@ -938,10 +974,6 @@ MONO_ADDINS_GUI_CFLAGS
MONO_ADDINS_GUI_LIBS
MONO_ADDINS_SETUP_CFLAGS
MONO_ADDINS_SETUP_LIBS
-NDESK_DBUS_10_CFLAGS
-NDESK_DBUS_10_LIBS
-NDESK_DBUS_GLIB_10_CFLAGS
-NDESK_DBUS_GLIB_10_LIBS
NOTIFY_SHARP_CFLAGS
NOTIFY_SHARP_LIBS
DO_PLATFORM_CFLAGS
@@ -1405,8 +1437,6 @@ target=$target_alias
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
- $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
- If a cross compiler is detected then cross compile mode will be used" >&2
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
fi
@@ -1492,7 +1522,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures gnome-do-plugins 0.8.4 to adapt to many kinds of systems.
+\`configure' configures gnome-do-plugins 0.8.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1559,7 +1589,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of gnome-do-plugins 0.8.4:";;
+ short | recursive ) echo "Configuration of gnome-do-plugins 0.8.5:";;
esac
cat <<\_ACEOF
@@ -1567,9 +1597,13 @@ Optional Features:
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
+ --enable-silent-rules less verbose build output (undo: "make V=1")
+ --disable-silent-rules verbose build output (undo: "make V=0")
--disable-nls do not use Native Language Support
- --disable-dependency-tracking speeds up one-time build
- --enable-dependency-tracking do not reject slow dependency extractors
+ --enable-dependency-tracking
+ do not reject slow dependency extractors
+ --disable-dependency-tracking
+ speeds up one-time build
--enable-banshee Build plugin to interact with Banshee (default:
auto)
--enable-flickr Build plugin to interact with flickr using flickrnet
@@ -1584,6 +1618,8 @@ Optional Features:
--enable-window-manager Build plugin to control window (default: auto
--enable-empathy Build plugin to Telepathy IM framework (default:
auto
+ --enable-transmission Build plugin for the Transmission bittorrent client
+ (default: auto
--enable-debug Use 'DEBUG' Configuration [default=YES]
--enable-release Use 'RELEASE' Configuration [default=NO]
@@ -1638,6 +1674,10 @@ Some influential environment variables:
C compiler flags for WNCK_SHARP_10, overriding pkg-config
WNCK_SHARP_10_LIBS
linker flags for WNCK_SHARP_10, overriding pkg-config
+ NEWTONSOFT_JSON_CFLAGS
+ C compiler flags for NEWTONSOFT_JSON, overriding pkg-config
+ NEWTONSOFT_JSON_LIBS
+ linker flags for NEWTONSOFT_JSON, overriding pkg-config
GCONF_SHARP_20_CFLAGS
C compiler flags for GCONF_SHARP_20, overriding pkg-config
GCONF_SHARP_20_LIBS
@@ -1683,14 +1723,6 @@ Some influential environment variables:
C compiler flags for MONO_ADDINS_SETUP, overriding pkg-config
MONO_ADDINS_SETUP_LIBS
linker flags for MONO_ADDINS_SETUP, overriding pkg-config
- NDESK_DBUS_10_CFLAGS
- C compiler flags for NDESK_DBUS_10, overriding pkg-config
- NDESK_DBUS_10_LIBS
- linker flags for NDESK_DBUS_10, overriding pkg-config
- NDESK_DBUS_GLIB_10_CFLAGS
- C compiler flags for NDESK_DBUS_GLIB_10, overriding pkg-config
- NDESK_DBUS_GLIB_10_LIBS
- linker flags for NDESK_DBUS_GLIB_10, overriding pkg-config
NOTIFY_SHARP_CFLAGS
C compiler flags for NOTIFY_SHARP, overriding pkg-config
NOTIFY_SHARP_LIBS
@@ -1774,10 +1806,10 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-gnome-do-plugins configure 0.8.4
-generated by GNU Autoconf 2.68
+gnome-do-plugins configure 0.8.5
+generated by GNU Autoconf 2.69
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
@@ -1853,7 +1885,7 @@ $as_echo "$ac_try_echo"; } >&5
test ! -s conftest.err
} && test -s conftest$ac_exeext && {
test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
+ test -x conftest$ac_exeext
}; then :
ac_retval=0
else
@@ -1976,48 +2008,6 @@ fi
} # ac_fn_c_try_cpp
-# ac_fn_c_try_run LINENO
-# ----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-# that executables *can* be run.
-ac_fn_c_try_run ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if { { ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_link") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
- { { case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; }; then :
- ac_retval=0
-else
- $as_echo "$as_me: program exited with status $ac_status" >&5
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_retval=$ac_status
-fi
- rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_run
-
# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
# -------------------------------------------------------
# Tests whether HEADER exists, giving a warning if it cannot be compiled using
@@ -2105,6 +2095,48 @@ fi
} # ac_fn_c_check_header_mongrel
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_c_try_run ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ if { { ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+ { { case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; }; then :
+ ac_retval=0
+else
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=$ac_status
+fi
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+ as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_run
+
# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
# -------------------------------------------------------
# Tests whether HEADER exists and can be compiled using the include files in
@@ -2139,8 +2171,8 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by gnome-do-plugins $as_me 0.8.4, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+It was created by gnome-do-plugins $as_me 0.8.5, which was
+generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2487,7 +2519,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-am__api_version='1.11'
+am__api_version='1.13'
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -2555,7 +2587,7 @@ case $as_dir/ in #((
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
if test $ac_prog = install &&
grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
# AIX install. It has an incompatible calling convention.
@@ -2613,9 +2645,6 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
$as_echo_n "checking whether build environment is sane... " >&6; }
-# Just in case
-sleep 1
-echo timestamp > conftest.file
# Reject unsafe characters in $srcdir or the absolute working directory
# name. Accept space and tab only in the latter.
am_lf='
@@ -2626,32 +2655,40 @@ case `pwd` in
esac
case $srcdir in
*[\\\"\#\$\&\'\`$am_lf\ \ ]*)
- as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+ as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
esac
-# Do `set' in a subshell so we don't clobber the current shell's
+# Do 'set' in a subshell so we don't clobber the current shell's
# arguments. Must try -L first in case configure is actually a
# symlink; some systems play weird games with the mod time of symlinks
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
if (
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
- if test "$*" = "X"; then
- # -L didn't work.
- set X `ls -t "$srcdir/configure" conftest.file`
- fi
- rm -f conftest.file
- if test "$*" != "X $srcdir/configure conftest.file" \
- && test "$*" != "X conftest.file $srcdir/configure"; then
-
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
-alias in your environment" "$LINENO" 5
- fi
-
+ am_has_slept=no
+ for am_try in 1 2; do
+ echo "timestamp, slept: $am_has_slept" > conftest.file
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$*" = "X"; then
+ # -L didn't work.
+ set X `ls -t "$srcdir/configure" conftest.file`
+ fi
+ if test "$*" != "X $srcdir/configure conftest.file" \
+ && test "$*" != "X conftest.file $srcdir/configure"; then
+
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
+ alias in your environment" "$LINENO" 5
+ fi
+ if test "$2" = conftest.file || test $am_try -eq 2; then
+ break
+ fi
+ # Just in case.
+ sleep 1
+ am_has_slept=yes
+ done
test "$2" = conftest.file
)
then
@@ -2663,6 +2700,16 @@ Check your system clock" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+ ( sleep 1 ) &
+ am_sleep_pid=$!
+fi
+
+rm -f conftest.file
+
test "$program_prefix" != NONE &&
program_transform_name="s&^&$program_prefix&;$program_transform_name"
# Use a double $ so make ignores it.
@@ -2685,12 +2732,12 @@ if test x"${MISSING+set}" != xset; then
esac
fi
# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
- am_missing_run="$MISSING --run "
+if eval "$MISSING --is-lightweight"; then
+ am_missing_run="$MISSING "
else
am_missing_run=
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
fi
if test x"${install_sh}" != xset; then
@@ -2702,10 +2749,10 @@ if test x"${install_sh}" != xset; then
esac
fi
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'. However `strip' might not be the right
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip". However 'strip' might not be the right
# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
+# will honor the 'STRIP' environment variable to overrule this program.
if test "$cross_compiling" != no; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
@@ -2724,7 +2771,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2764,7 +2811,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_STRIP="strip"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2815,7 +2862,7 @@ do
test -z "$as_dir" && as_dir=.
for ac_prog in mkdir gmkdir; do
for ac_exec_ext in '' $ac_executable_extensions; do
- { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+ as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
'mkdir (GNU coreutils) '* | \
'mkdir (coreutils) '* | \
@@ -2844,12 +2891,6 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
$as_echo "$MKDIR_P" >&6; }
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
- [\\/$]* | ?:[\\/]*) ;;
- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-
for ac_prog in gawk mawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -2868,7 +2909,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_AWK="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2932,6 +2973,45 @@ else
fi
rmdir .tst 2>/dev/null
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+ enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in # (((
+ yes) AM_DEFAULT_VERBOSITY=0;;
+ no) AM_DEFAULT_VERBOSITY=1;;
+ *) AM_DEFAULT_VERBOSITY=1;;
+esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+ @$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+ am_cv_make_support_nested_variables=yes
+else
+ am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+ AM_V='$(V)'
+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+ AM_V=$AM_DEFAULT_VERBOSITY
+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
+
if test "`cd $srcdir && pwd`" != "`pwd`"; then
# Use -I$(srcdir) only when $(srcdir) != ., so that make's output
# is not polluted with repeated "-I."
@@ -2954,7 +3034,7 @@ fi
# Define the identity of the package.
PACKAGE='gnome-do-plugins'
- VERSION='0.8.4'
+ VERSION='0.8.5'
cat >>confdefs.h <<_ACEOF
@@ -2982,93 +3062,107 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+# For better backward compatibility. To be removed once Automake 1.9.x
+# dies out for good. For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+mkdir_p='$(MKDIR_P)'
+
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
-# Always define AMTAR for backward compatibility.
+# Always define AMTAR for backward compatibility. Yes, it's still used
+# in the wild :-( We should find a proper way to deprecate it ...
+AMTAR='$${TAR-tar}'
+
+
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar pax cpio none'
-AMTAR=${AMTAR-"${am_missing_run}tar"}
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a pax tar archive" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a pax tar archive" >&5
$as_echo_n "checking how to create a pax tar archive... " >&6; }
-# Loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar pax cpio none'
-_am_tools=${am_cv_prog_tar_pax-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
- case $_am_tool in
- gnutar)
- for _am_tar in tar gnutar gtar;
- do
- { echo "$as_me:$LINENO: $_am_tar --version" >&5
+
+ # Go ahead even if we have the value already cached. We do so because we
+ # need to set the values for the 'am__tar' and 'am__untar' variables.
+ _am_tools=${am_cv_prog_tar_pax-$_am_tools}
+
+ for _am_tool in $_am_tools; do
+ case $_am_tool in
+ gnutar)
+ for _am_tar in tar gnutar gtar; do
+ { echo "$as_me:$LINENO: $_am_tar --version" >&5
($_am_tar --version) >&5 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && break
- done
- am__tar="$_am_tar --format=posix -chf - "'"$$tardir"'
- am__tar_="$_am_tar --format=posix -chf - "'"$tardir"'
- am__untar="$_am_tar -xf -"
- ;;
- plaintar)
- # Must skip GNU tar: if it does not support --format= it doesn't create
- # ustar tarball either.
- (tar --version) >/dev/null 2>&1 && continue
- am__tar='tar chf - "$$tardir"'
- am__tar_='tar chf - "$tardir"'
- am__untar='tar xf -'
- ;;
- pax)
- am__tar='pax -L -x pax -w "$$tardir"'
- am__tar_='pax -L -x pax -w "$tardir"'
- am__untar='pax -r'
- ;;
- cpio)
- am__tar='find "$$tardir" -print | cpio -o -H pax -L'
- am__tar_='find "$tardir" -print | cpio -o -H pax -L'
- am__untar='cpio -i -H pax -d'
- ;;
- none)
- am__tar=false
- am__tar_=false
- am__untar=false
- ;;
- esac
+ done
+ am__tar="$_am_tar --format=posix -chf - "'"$$tardir"'
+ am__tar_="$_am_tar --format=posix -chf - "'"$tardir"'
+ am__untar="$_am_tar -xf -"
+ ;;
+ plaintar)
+ # Must skip GNU tar: if it does not support --format= it doesn't create
+ # ustar tarball either.
+ (tar --version) >/dev/null 2>&1 && continue
+ am__tar='tar chf - "$$tardir"'
+ am__tar_='tar chf - "$tardir"'
+ am__untar='tar xf -'
+ ;;
+ pax)
+ am__tar='pax -L -x pax -w "$$tardir"'
+ am__tar_='pax -L -x pax -w "$tardir"'
+ am__untar='pax -r'
+ ;;
+ cpio)
+ am__tar='find "$$tardir" -print | cpio -o -H pax -L'
+ am__tar_='find "$tardir" -print | cpio -o -H pax -L'
+ am__untar='cpio -i -H pax -d'
+ ;;
+ none)
+ am__tar=false
+ am__tar_=false
+ am__untar=false
+ ;;
+ esac
- # If the value was cached, stop now. We just wanted to have am__tar
- # and am__untar set.
- test -n "${am_cv_prog_tar_pax}" && break
+ # If the value was cached, stop now. We just wanted to have am__tar
+ # and am__untar set.
+ test -n "${am_cv_prog_tar_pax}" && break
- # tar/untar a dummy directory, and stop if the command works
- rm -rf conftest.dir
- mkdir conftest.dir
- echo GrepMe > conftest.dir/file
- { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5
+ # tar/untar a dummy directory, and stop if the command works.
+ rm -rf conftest.dir
+ mkdir conftest.dir
+ echo GrepMe > conftest.dir/file
+ { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5
(tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
- rm -rf conftest.dir
- if test -s conftest.tar; then
- { echo "$as_me:$LINENO: $am__untar <conftest.tar" >&5
+ rm -rf conftest.dir
+ if test -s conftest.tar; then
+ { echo "$as_me:$LINENO: $am__untar <conftest.tar" >&5
($am__untar <conftest.tar) >&5 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
- grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
- fi
-done
-rm -rf conftest.dir
+ { echo "$as_me:$LINENO: cat conftest.dir/file" >&5
+ (cat conftest.dir/file) >&5 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }
+ grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+ fi
+ done
+ rm -rf conftest.dir
-if ${am_cv_prog_tar_pax+:} false; then :
+ if ${am_cv_prog_tar_pax+:} false; then :
$as_echo_n "(cached) " >&6
else
am_cv_prog_tar_pax=$_am_tool
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_pax" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_pax" >&5
$as_echo "$am_cv_prog_tar_pax" >&6; }
@@ -3081,6 +3175,7 @@ $as_echo "$am_cv_prog_tar_pax" >&6; }
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
$as_echo_n "checking whether NLS is requested... " >&6; }
# Check whether --enable-nls was given.
@@ -3113,7 +3208,7 @@ am__quote=
_am_result=none
# First try GNU make style include.
echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# Ignore all kinds of additional output from 'make'.
case `$am_make -s -f confmf 2> /dev/null` in #(
*the\ am__doit\ target*)
am__include=include
@@ -3146,6 +3241,7 @@ fi
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
+ am__nodep='_no'
fi
if test "x$enable_dependency_tracking" != xno; then
AMDEP_TRUE=
@@ -3178,7 +3274,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3218,7 +3314,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CC="gcc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3271,7 +3367,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3312,7 +3408,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
@@ -3370,7 +3466,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3414,7 +3510,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_prog_ac_ct_CC="$ac_prog"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -3860,8 +3956,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
struct buf { int x; };
FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -3957,8 +4052,9 @@ else
# We make a subdir and do the tests there. Otherwise we can end up
# making bogus files that we don't know about and never remove. For
# instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
+ # making a dummy file named 'D' -- because '-MD' means "put the output
+ # in D".
+ rm -rf conftest.dir
mkdir conftest.dir
# Copy depcomp to subdir because otherwise we won't find it if we're
# using a relative directory.
@@ -3992,16 +4088,16 @@ else
: > sub/conftest.c
for i in 1 2 3 4 5 6; do
echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
- # Solaris 8's {/usr,}/bin/sh.
- touch sub/conftst$i.h
+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+ # Solaris 10 /bin/sh.
+ echo '/* dummy */' > sub/conftst$i.h
done
echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # We check with '-c' and '-o' for the sake of the "dashmstdout"
# mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this. Also, some Intel
- # versions had trouble with output in subdirs
+ # handle '-M -o', and we need to detect this. Also, some Intel
+ # versions had trouble with output in subdirs.
am__obj=sub/conftest.${OBJEXT-o}
am__minus_obj="-o $am__obj"
case $depmode in
@@ -4010,16 +4106,16 @@ else
test "$am__universal" = false || continue
;;
nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
+ # After this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested.
if test "x$enable_dependency_tracking" = xyes; then
continue
else
break
fi
;;
- msvisualcpp | msvcmsys)
- # This compiler won't grok `-c -o', but also, the minuso test has
+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+ # This compiler won't grok '-c -o', but also, the minuso test has
# not run yet. These depmodes are late enough in the game, and
# so weak that their functioning should not be impacted.
am__obj=conftest.${OBJEXT-o}
@@ -4084,14 +4180,12 @@ case "$am__api_version" in
;;
esac
+INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
+INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
if test -n "0.35.0"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.35.0" >&5
$as_echo_n "checking for intltool >= 0.35.0... " >&6; }
-
- INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
- INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
- INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
$as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
@@ -4116,7 +4210,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4156,7 +4250,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4196,7 +4290,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4222,25 +4316,48 @@ if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT";
as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5
fi
- INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
- INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
- INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
- INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@'
- INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
- INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
- INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
- INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
- INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
- INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@'
- INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
- INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
- INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
- INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
- INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
- INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
- INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+if test -z "$AM_DEFAULT_VERBOSITY"; then
+ AM_DEFAULT_VERBOSITY=1
+fi
+
+
+INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))'
+INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))'
+INTLTOOL__v_MERGE_0='@echo " ITMRG " $@;'
+
+
+
+
+INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))'
+intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))'
+intltool__v_merge_options_0='-q'
+
+
+
+
+ INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+ INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+ INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+ INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< $@'
+ INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+ INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+ INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+ INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+ INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then
+ INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< $@'
+else
+ INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.$$RANDOM && mkdir $$_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u $$_it_tmp_dir $< $@ && rmdir $$_it_tmp_dir'
+fi
+ INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+ INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+ INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+ INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+ INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+ INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
@@ -4357,7 +4474,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4397,7 +4514,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4437,7 +4554,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4477,7 +4594,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4528,7 +4645,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4559,7 +4676,7 @@ $INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
if test $? -ne 0; then
as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5
else
- IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
+ IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
$as_echo "$IT_PERL_VERSION" >&6; }
fi
@@ -4772,7 +4889,7 @@ do
for ac_prog in grep ggrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+ as_fn_executable_p "$ac_path_GREP" || continue
# Check for GNU ac_path_GREP and select it if it is found.
# Check for GNU $ac_path_GREP
case `"$ac_path_GREP" --version 2>&1` in
@@ -4838,7 +4955,7 @@ do
for ac_prog in egrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+ as_fn_executable_p "$ac_path_EGREP" || continue
# Check for GNU ac_path_EGREP and select it if it is found.
# Check for GNU $ac_path_EGREP
case `"$ac_path_EGREP" --version 2>&1` in
@@ -5525,7 +5642,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5612,6 +5729,10 @@ else
fi
;;
+ *-*-openbsd*)
+ CATOBJEXT=.mo
+ DATADIRNAME=share
+ ;;
*)
CATOBJEXT=.mo
DATADIRNAME=lib
@@ -5738,8 +5859,17 @@ $as_echo "$LINGUAS" >&6; }
ASM_VERSION="$VERSION"
-# Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
+
+
+
+
+
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_PKG_CONFIG+:} false; then :
@@ -5756,7 +5886,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -5765,7 +5895,6 @@ done
done
IFS=$as_save_IFS
- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
;;
esac
fi
@@ -5779,26 +5908,19 @@ $as_echo "no" >&6; }
fi
-if test "x$PKG_CONFIG" = "xno"; then
- as_fn_error $? "You need to install pkg-config" "$LINENO" 5
fi
-
-
-
-top_srcdir=$(readlink -f $0 | sed -e s/configure$//)
-
-
-
- # Extract the first word of "mono", so it can be a program name with args.
-set dummy mono; ac_word=$2
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+ ac_pt_PKG_CONFIG=$PKG_CONFIG
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MONO+:} false; then :
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
$as_echo_n "(cached) " >&6
else
- case $MONO in
+ case $ac_pt_PKG_CONFIG in
[\\/]* | ?:[\\/]*)
- ac_cv_path_MONO="$MONO" # Let the user override the test with a path.
+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -5807,8 +5929,8 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_MONO="$as_dir/$ac_word$ac_exec_ext"
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -5816,41 +5938,114 @@ done
done
IFS=$as_save_IFS
- test -z "$ac_cv_path_MONO" && ac_cv_path_MONO="no"
;;
esac
fi
-MONO=$ac_cv_path_MONO
-if test -n "$MONO"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MONO" >&5
-$as_echo "$MONO" >&6; }
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
+ if test "x$ac_pt_PKG_CONFIG" = x; then
+ PKG_CONFIG=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ PKG_CONFIG=$ac_pt_PKG_CONFIG
+ fi
+else
+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
-
-
- if test "xMONO" = "xno"; then
- as_fn_error $? "You need to install 'mono'" "$LINENO" 5
+fi
+if test -n "$PKG_CONFIG"; then
+ _pkg_min_version=0.9.0
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ PKG_CONFIG=""
fi
+fi
+top_srcdir=$(readlink -f $0 | sed -e s/configure$//)
- # Extract the first word of "gmcs", so it can be a program name with args.
-set dummy gmcs; ac_word=$2
+ # Extract the first word of "mono", so it can be a program name with args.
+set dummy mono; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MCS+:} false; then :
+if ${ac_cv_path_MONO+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $MONO in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_MONO="$MONO" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_MONO="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_MONO" && ac_cv_path_MONO="no"
+ ;;
+esac
+fi
+MONO=$ac_cv_path_MONO
+if test -n "$MONO"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MONO" >&5
+$as_echo "$MONO" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+
+ if test "xMONO" = "xno"; then
+ as_fn_error $? "You need to install 'mono'" "$LINENO" 5
+ fi
+
+
+
+
+ # Extract the first word of "dmcs", so it can be a program name with args.
+set dummy dmcs; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_DMCS+:} false; then :
$as_echo_n "(cached) " >&6
else
- case $MCS in
+ case $DMCS in
[\\/]* | ?:[\\/]*)
- ac_cv_path_MCS="$MCS" # Let the user override the test with a path.
+ ac_cv_path_DMCS="$DMCS" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -5859,8 +6054,8 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_MCS="$as_dir/$ac_word$ac_exec_ext"
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_DMCS="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -5868,24 +6063,69 @@ done
done
IFS=$as_save_IFS
- test -z "$ac_cv_path_MCS" && ac_cv_path_MCS="no"
+ test -z "$ac_cv_path_DMCS" && ac_cv_path_DMCS="no"
;;
esac
fi
-MCS=$ac_cv_path_MCS
-if test -n "$MCS"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MCS" >&5
-$as_echo "$MCS" >&6; }
+DMCS=$ac_cv_path_DMCS
+if test -n "$DMCS"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DMCS" >&5
+$as_echo "$DMCS" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
+ if test "x$DMCS" = "xno"; then
+ # Extract the first word of "gmcs", so it can be a program name with args.
+set dummy gmcs; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_GMCS+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $GMCS in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_GMCS="$GMCS" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_GMCS="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_GMCS" && ac_cv_path_GMCS="no"
+ ;;
+esac
+fi
+GMCS=$ac_cv_path_GMCS
+if test -n "$GMCS"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMCS" >&5
+$as_echo "$GMCS" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
- if test "xMCS" = "xno"; then
- as_fn_error $? "You need to install 'gmcs'" "$LINENO" 5
+ if test "x$GMCS" = "xno"; then
+ as_fn_error $? "You need to install a C♯ compiler.'" "$LINENO" 5
+ else
+ MCS=$GMCS
+ fi
+ else
+ MCS=$DMCS
fi
@@ -5955,144 +6195,44 @@ esac
-
-
-
-
-
-
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $PKG_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_path_PKG_CONFIG"; then
- ac_pt_PKG_CONFIG=$PKG_CONFIG
- # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $ac_pt_PKG_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-if test -n "$ac_pt_PKG_CONFIG"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-$as_echo "$ac_pt_PKG_CONFIG" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
- if test "x$ac_pt_PKG_CONFIG" = x; then
- PKG_CONFIG=""
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
- PKG_CONFIG=$ac_pt_PKG_CONFIG
- fi
-else
- PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-fi
-
-fi
-if test -n "$PKG_CONFIG"; then
- _pkg_min_version=0.9.0
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- PKG_CONFIG=""
- fi
-fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Banshee.CollectionIndexer package" >&5
+$as_echo_n "checking Banshee.CollectionIndexer package... " >&6; }
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"banshee-collection-indexer >= 2.1\""; } >&5
- ($PKG_CONFIG --exists --print-errors "banshee-collection-indexer >= 2.1") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"banshee-collection-indexer\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "banshee-collection-indexer") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- BANSHEE_USE_DBUS_SHARP=yes
+ BANSHEE_COLLECTION_INDEXER=banshee-collection-indexer
else
- BANSHEE_USE_DBUS_SHARP=no
+ BANSHEE_COLLECTION_INDEXER=no
fi
- if test "x$BANSHEE_USE_DBUS_SHARP" = "xyes"; then
- BANSHEE_DBUS_SHARP_TRUE=
- BANSHEE_DBUS_SHARP_FALSE='#'
+if test "x$BANSHEE_COLLECTION_INDEXER" = "xno" ; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"banshee-collection-indexer-1\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "banshee-collection-indexer-1") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ BANSHEE_COLLECTION_INDEXER=banshee-collection-indexer-1
else
- BANSHEE_DBUS_SHARP_TRUE='#'
- BANSHEE_DBUS_SHARP_FALSE=
+ BANSHEE_COLLECTION_INDEXER=not found
fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $BANSHEE_COLLECTION_INDEXER" >&5
+$as_echo "$BANSHEE_COLLECTION_INDEXER" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which DBus implementation Banshee.CollectionIndexer requires" >&5
+$as_echo_n "checking which DBus implementation Banshee.CollectionIndexer requires... " >&6; }
+if $PKG_CONFIG --print-requires $BANSHEE_COLLECTION_INDEXER 2>&1 | grep dbus-sharp-1.0 > /dev/null ; then
+ BANSHEE_USE_DBUS_SHARP=yes
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: dbus-sharp" >&5
+$as_echo "dbus-sharp" >&6; }
+else
+ BANSHEE_USE_DBUS_SHARP=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ndesk-dbus" >&5
+$as_echo "ndesk-dbus" >&6; }
+fi
pkg_failed=no
@@ -6237,30 +6377,115 @@ $as_echo "yes" >&6; }
HAVE_DBUS_SHARP_GLIB=yes
fi
-# Check whether --enable-banshee was given.
-if test "${enable_banshee+set}" = set; then :
- enableval=$enable_banshee; enable_banshee=$enableval
+if test "x$HAVE_DBUS_SHARP" = "xyes" ; then
+ DBUS_BUILD_DEFINES=-define:USE_DBUS_SHARP
else
- enable_banshee=auto
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS_SHARP" >&5
+$as_echo_n "checking for DBUS_SHARP... " >&6; }
+
+if test -n "$DBUS_SHARP_CFLAGS"; then
+ pkg_cv_DBUS_SHARP_CFLAGS="$DBUS_SHARP_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ndesk-dbus-1.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "ndesk-dbus-1.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_DBUS_SHARP_CFLAGS=`$PKG_CONFIG --cflags "ndesk-dbus-1.0" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$DBUS_SHARP_LIBS"; then
+ pkg_cv_DBUS_SHARP_LIBS="$DBUS_SHARP_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ndesk-dbus-1.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "ndesk-dbus-1.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_DBUS_SHARP_LIBS=`$PKG_CONFIG --libs "ndesk-dbus-1.0" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
fi
-if test "x$enable_banshee" != "xno"; then
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ DBUS_SHARP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ndesk-dbus-1.0" 2>&1`
+ else
+ DBUS_SHARP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ndesk-dbus-1.0" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$DBUS_SHARP_PKG_ERRORS" >&5
+
+ as_fn_error $? "Package requirements (ndesk-dbus-1.0) were not met:
+
+$DBUS_SHARP_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables DBUS_SHARP_CFLAGS
+and DBUS_SHARP_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables DBUS_SHARP_CFLAGS
+and DBUS_SHARP_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+else
+ DBUS_SHARP_CFLAGS=$pkg_cv_DBUS_SHARP_CFLAGS
+ DBUS_SHARP_LIBS=$pkg_cv_DBUS_SHARP_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BANSHEE_INDEXER" >&5
-$as_echo_n "checking for BANSHEE_INDEXER... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS_SHARP_GLIB" >&5
+$as_echo_n "checking for DBUS_SHARP_GLIB... " >&6; }
-if test -n "$BANSHEE_INDEXER_CFLAGS"; then
- pkg_cv_BANSHEE_INDEXER_CFLAGS="$BANSHEE_INDEXER_CFLAGS"
+if test -n "$DBUS_SHARP_GLIB_CFLAGS"; then
+ pkg_cv_DBUS_SHARP_GLIB_CFLAGS="$DBUS_SHARP_GLIB_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"banshee-1-collection-indexer >= 1.4.2\""; } >&5
- ($PKG_CONFIG --exists --print-errors "banshee-1-collection-indexer >= 1.4.2") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ndesk-dbus-glib-1.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "ndesk-dbus-glib-1.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_BANSHEE_INDEXER_CFLAGS=`$PKG_CONFIG --cflags "banshee-1-collection-indexer >= 1.4.2" 2>/dev/null`
+ pkg_cv_DBUS_SHARP_GLIB_CFLAGS=`$PKG_CONFIG --cflags "ndesk-dbus-glib-1.0" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -6268,16 +6493,16 @@ fi
else
pkg_failed=untried
fi
-if test -n "$BANSHEE_INDEXER_LIBS"; then
- pkg_cv_BANSHEE_INDEXER_LIBS="$BANSHEE_INDEXER_LIBS"
+if test -n "$DBUS_SHARP_GLIB_LIBS"; then
+ pkg_cv_DBUS_SHARP_GLIB_LIBS="$DBUS_SHARP_GLIB_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"banshee-1-collection-indexer >= 1.4.2\""; } >&5
- ($PKG_CONFIG --exists --print-errors "banshee-1-collection-indexer >= 1.4.2") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ndesk-dbus-glib-1.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "ndesk-dbus-glib-1.0") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_BANSHEE_INDEXER_LIBS=`$PKG_CONFIG --libs "banshee-1-collection-indexer >= 1.4.2" 2>/dev/null`
+ pkg_cv_DBUS_SHARP_GLIB_LIBS=`$PKG_CONFIG --libs "ndesk-dbus-glib-1.0" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -6298,29 +6523,60 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- BANSHEE_INDEXER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "banshee-1-collection-indexer >= 1.4.2" 2>&1`
+ DBUS_SHARP_GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ndesk-dbus-glib-1.0" 2>&1`
else
- BANSHEE_INDEXER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "banshee-1-collection-indexer >= 1.4.2" 2>&1`
+ DBUS_SHARP_GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ndesk-dbus-glib-1.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
- echo "$BANSHEE_INDEXER_PKG_ERRORS" >&5
+ echo "$DBUS_SHARP_GLIB_PKG_ERRORS" >&5
- HAVE_BANSHEE=no
+ as_fn_error $? "Package requirements (ndesk-dbus-glib-1.0) were not met:
+
+$DBUS_SHARP_GLIB_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables DBUS_SHARP_GLIB_CFLAGS
+and DBUS_SHARP_GLIB_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- HAVE_BANSHEE=no
-else
- BANSHEE_INDEXER_CFLAGS=$pkg_cv_BANSHEE_INDEXER_CFLAGS
- BANSHEE_INDEXER_LIBS=$pkg_cv_BANSHEE_INDEXER_LIBS
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables DBUS_SHARP_GLIB_CFLAGS
+and DBUS_SHARP_GLIB_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+else
+ DBUS_SHARP_GLIB_CFLAGS=$pkg_cv_DBUS_SHARP_GLIB_CFLAGS
+ DBUS_SHARP_GLIB_LIBS=$pkg_cv_DBUS_SHARP_GLIB_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- HAVE_BANSHEE=yes
+
fi
- if test "x$HAVE_BANSHEE" = "xyes" ; then
- BANSHEE_INDEXER_DLL=$($PKG_CONFIG --variable=Libraries banshee-1-collection-indexer)
- else
- # Banshee renamed this lib after 2.0.
+fi
+
+
+
+
+
+# Check whether --enable-banshee was given.
+if test "${enable_banshee+set}" = set; then :
+ enableval=$enable_banshee; enable_banshee=$enableval
+else
+ enable_banshee=auto
+fi
+
+
+if test "x$enable_banshee" != "xno"; then
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BANSHEE_INDEXER" >&5
@@ -6330,12 +6586,12 @@ if test -n "$BANSHEE_INDEXER_CFLAGS"; then
pkg_cv_BANSHEE_INDEXER_CFLAGS="$BANSHEE_INDEXER_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"banshee-collection-indexer\""; } >&5
- ($PKG_CONFIG --exists --print-errors "banshee-collection-indexer") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$BANSHEE_COLLECTION_INDEXER >= 1.4.2\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "$BANSHEE_COLLECTION_INDEXER >= 1.4.2") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_BANSHEE_INDEXER_CFLAGS=`$PKG_CONFIG --cflags "banshee-collection-indexer" 2>/dev/null`
+ pkg_cv_BANSHEE_INDEXER_CFLAGS=`$PKG_CONFIG --cflags "$BANSHEE_COLLECTION_INDEXER >= 1.4.2" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -6347,12 +6603,12 @@ if test -n "$BANSHEE_INDEXER_LIBS"; then
pkg_cv_BANSHEE_INDEXER_LIBS="$BANSHEE_INDEXER_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"banshee-collection-indexer\""; } >&5
- ($PKG_CONFIG --exists --print-errors "banshee-collection-indexer") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$BANSHEE_COLLECTION_INDEXER >= 1.4.2\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "$BANSHEE_COLLECTION_INDEXER >= 1.4.2") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_BANSHEE_INDEXER_LIBS=`$PKG_CONFIG --libs "banshee-collection-indexer" 2>/dev/null`
+ pkg_cv_BANSHEE_INDEXER_LIBS=`$PKG_CONFIG --libs "$BANSHEE_COLLECTION_INDEXER >= 1.4.2" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -6373,9 +6629,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- BANSHEE_INDEXER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "banshee-collection-indexer" 2>&1`
+ BANSHEE_INDEXER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$BANSHEE_COLLECTION_INDEXER >= 1.4.2" 2>&1`
else
- BANSHEE_INDEXER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "banshee-collection-indexer" 2>&1`
+ BANSHEE_INDEXER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$BANSHEE_COLLECTION_INDEXER >= 1.4.2" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$BANSHEE_INDEXER_PKG_ERRORS" >&5
@@ -6392,8 +6648,7 @@ else
$as_echo "yes" >&6; }
HAVE_BANSHEE=yes
fi
- BANSHEE_INDEXER_DLL=$($PKG_CONFIG --variable=Libraries banshee-collection-indexer)
- fi
+ BANSHEE_INDEXER_DLL=$($PKG_CONFIG --variable=Libraries $BANSHEE_COLLECTION_INDEXER)
if test "x$enable_banshee" = "xyes" -a "x$HAVE_BANSHEE" = "xno" ; then
as_fn_error $? "Banshee support explicitly requested but dependencies not found." "$LINENO" 5
@@ -6996,8 +7251,6 @@ fi
-# Temporarily check for dbus-sharp only in Empathy build
-# The DBus-Sharp fork is relatively new, and probably not ubiquitous yet.
# Check whether --enable-empathy was given.
if test "${enable_empathy+set}" = set; then :
enableval=$enable_empathy; enable_empathy=$enableval
@@ -7019,8 +7272,6 @@ else
HAVE_EMPATHY=no
fi
-
-
if test "x$HAVE_EMPATHY" = "xyes"; then
HAVE_EMPATHY_TRUE=
HAVE_EMPATHY_FALSE='#'
@@ -7034,6 +7285,109 @@ fi
TELEPATHY_SHARP_LIBS=-r:$(pwd)/build/telepathy-sharp.dll
+# Check whether --enable-transmission was given.
+if test "${enable_transmission+set}" = set; then :
+ enableval=$enable_transmission; enable_transmission=$enableval
+else
+ enable_transmission=auto
+fi
+
+
+if test "x$enable_transmission" != "xno"; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NEWTONSOFT_JSON" >&5
+$as_echo_n "checking for NEWTONSOFT_JSON... " >&6; }
+
+if test -n "$NEWTONSOFT_JSON_CFLAGS"; then
+ pkg_cv_NEWTONSOFT_JSON_CFLAGS="$NEWTONSOFT_JSON_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"newtonsoft-json\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "newtonsoft-json") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_NEWTONSOFT_JSON_CFLAGS=`$PKG_CONFIG --cflags "newtonsoft-json" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$NEWTONSOFT_JSON_LIBS"; then
+ pkg_cv_NEWTONSOFT_JSON_LIBS="$NEWTONSOFT_JSON_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"newtonsoft-json\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "newtonsoft-json") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_NEWTONSOFT_JSON_LIBS=`$PKG_CONFIG --libs "newtonsoft-json" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ NEWTONSOFT_JSON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "newtonsoft-json" 2>&1`
+ else
+ NEWTONSOFT_JSON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "newtonsoft-json" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$NEWTONSOFT_JSON_PKG_ERRORS" >&5
+
+ HAVE_JSON=no
+elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ HAVE_JSON=no
+else
+ NEWTONSOFT_JSON_CFLAGS=$pkg_cv_NEWTONSOFT_JSON_CFLAGS
+ NEWTONSOFT_JSON_LIBS=$pkg_cv_NEWTONSOFT_JSON_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ HAVE_JSON=yes
+fi
+
+ if test "x$HAVE_JSON" = "xno" ; then
+ if test "x$enable_transmission" = "xyes" ; then
+ as_fn_error $? "Transmission plugin explicitly requested but newtonsoft-json dependencies not found" "$LINENO" 5
+ fi
+ HAVE_TRANSMISSION=no
+ else
+ HAVE_TRANSMISSION=yes
+ fi
+else
+ HAVE_TRANSMISSION=no
+fi
+
+ if test "x$HAVE_TRANSMISSION" = "xyes"; then
+ HAVE_TRANSMISSION_TRUE=
+ HAVE_TRANSMISSION_FALSE='#'
+else
+ HAVE_TRANSMISSION_TRUE='#'
+ HAVE_TRANSMISSION_FALSE=
+fi
+
+
+
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCONF_SHARP_20" >&5
@@ -8037,188 +8391,6 @@ $as_echo "yes" >&6; }
fi
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NDESK_DBUS_10" >&5
-$as_echo_n "checking for NDESK_DBUS_10... " >&6; }
-
-if test -n "$NDESK_DBUS_10_CFLAGS"; then
- pkg_cv_NDESK_DBUS_10_CFLAGS="$NDESK_DBUS_10_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ndesk-dbus-1.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "ndesk-dbus-1.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_NDESK_DBUS_10_CFLAGS=`$PKG_CONFIG --cflags "ndesk-dbus-1.0" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-if test -n "$NDESK_DBUS_10_LIBS"; then
- pkg_cv_NDESK_DBUS_10_LIBS="$NDESK_DBUS_10_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ndesk-dbus-1.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "ndesk-dbus-1.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_NDESK_DBUS_10_LIBS=`$PKG_CONFIG --libs "ndesk-dbus-1.0" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
- NDESK_DBUS_10_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ndesk-dbus-1.0" 2>&1`
- else
- NDESK_DBUS_10_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ndesk-dbus-1.0" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$NDESK_DBUS_10_PKG_ERRORS" >&5
-
- as_fn_error $? "Package requirements (ndesk-dbus-1.0) were not met:
-
-$NDESK_DBUS_10_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables NDESK_DBUS_10_CFLAGS
-and NDESK_DBUS_10_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
-elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables NDESK_DBUS_10_CFLAGS
-and NDESK_DBUS_10_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-else
- NDESK_DBUS_10_CFLAGS=$pkg_cv_NDESK_DBUS_10_CFLAGS
- NDESK_DBUS_10_LIBS=$pkg_cv_NDESK_DBUS_10_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NDESK_DBUS_GLIB_10" >&5
-$as_echo_n "checking for NDESK_DBUS_GLIB_10... " >&6; }
-
-if test -n "$NDESK_DBUS_GLIB_10_CFLAGS"; then
- pkg_cv_NDESK_DBUS_GLIB_10_CFLAGS="$NDESK_DBUS_GLIB_10_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ndesk-dbus-glib-1.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "ndesk-dbus-glib-1.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_NDESK_DBUS_GLIB_10_CFLAGS=`$PKG_CONFIG --cflags "ndesk-dbus-glib-1.0" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-if test -n "$NDESK_DBUS_GLIB_10_LIBS"; then
- pkg_cv_NDESK_DBUS_GLIB_10_LIBS="$NDESK_DBUS_GLIB_10_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ndesk-dbus-glib-1.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "ndesk-dbus-glib-1.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_NDESK_DBUS_GLIB_10_LIBS=`$PKG_CONFIG --libs "ndesk-dbus-glib-1.0" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
- NDESK_DBUS_GLIB_10_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ndesk-dbus-glib-1.0" 2>&1`
- else
- NDESK_DBUS_GLIB_10_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ndesk-dbus-glib-1.0" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$NDESK_DBUS_GLIB_10_PKG_ERRORS" >&5
-
- as_fn_error $? "Package requirements (ndesk-dbus-glib-1.0) were not met:
-
-$NDESK_DBUS_GLIB_10_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables NDESK_DBUS_GLIB_10_CFLAGS
-and NDESK_DBUS_GLIB_10_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
-elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables NDESK_DBUS_GLIB_10_CFLAGS
-and NDESK_DBUS_GLIB_10_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-else
- NDESK_DBUS_GLIB_10_CFLAGS=$pkg_cv_NDESK_DBUS_GLIB_10_CFLAGS
- NDESK_DBUS_GLIB_10_LIBS=$pkg_cv_NDESK_DBUS_GLIB_10_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-
-pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NOTIFY_SHARP" >&5
$as_echo_n "checking for NOTIFY_SHARP... " >&6; }
@@ -8324,8 +8496,6 @@ fi
-
-
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DO_PLATFORM" >&5
$as_echo_n "checking for DO_PLATFORM... " >&6; }
@@ -8651,7 +8821,7 @@ fi
enable_debug=yes
fi
-ac_config_files="$ac_config_files Alias/Makefile Alias/Resources/Alias.addin.xml AptURL/Makefile AptURL/Resources/AptURL.addin.xml Archive/Makefile Archive/Resources/Archive.addin.xml Baconator/Makefile Baconator/Resources/Baconator.addin.xml Banshee/Makefile Banshee/Resources/Banshee.addin.xml Bibtex/Makefile Bibtex/Resources/Bibtex.addin.xml Chromium/Makefile Chromium/Resources/Chromium.addin.xml Cl.ickable/Makefile Cl.ickable/Resources/Cl.ickable.addin.xml ClawsMail/Makefile ClawsMail [...]
+ac_config_files="$ac_config_files Alias/Makefile Alias/Resources/Alias.addin.xml AptURL/Makefile AptURL/Resources/AptURL.addin.xml Archive/Makefile Archive/Resources/Archive.addin.xml Baconator/Makefile Baconator/Resources/Baconator.addin.xml Banshee/Makefile Banshee/Resources/Banshee.addin.xml Bibtex/Makefile Bibtex/Resources/Bibtex.addin.xml Chromium/Makefile Chromium/Resources/Chromium.addin.xml Cl.ickable/Makefile Cl.ickable/Resources/Cl.ickable.addin.xml ClawsMail/Makefile ClawsMail [...]
cat >confcache <<\_ACEOF
@@ -8799,6 +8969,14 @@ LIBOBJS=$ac_libobjs
LTLIBOBJS=$ac_ltlibobjs
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+$as_echo_n "checking that generated files are newer than configure... " >&6; }
+ if test -n "$am_sleep_pid"; then
+ # Hide warnings about reused PIDs.
+ wait $am_sleep_pid 2>/dev/null
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+$as_echo "done" >&6; }
if test -n "$EXEEXT"; then
am__EXEEXT_TRUE=
am__EXEEXT_FALSE='#'
@@ -8819,10 +8997,6 @@ fi
ac_config_commands="$ac_config_commands po/stamp-it"
-if test -z "${BANSHEE_DBUS_SHARP_TRUE}" && test -z "${BANSHEE_DBUS_SHARP_FALSE}"; then
- as_fn_error $? "conditional \"BANSHEE_DBUS_SHARP\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
if test -z "${HAVE_BANSHEE_TRUE}" && test -z "${HAVE_BANSHEE_FALSE}"; then
as_fn_error $? "conditional \"HAVE_BANSHEE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -8855,6 +9029,10 @@ if test -z "${HAVE_EMPATHY_TRUE}" && test -z "${HAVE_EMPATHY_FALSE}"; then
as_fn_error $? "conditional \"HAVE_EMPATHY\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${HAVE_TRANSMISSION_TRUE}" && test -z "${HAVE_TRANSMISSION_FALSE}"; then
+ as_fn_error $? "conditional \"HAVE_TRANSMISSION\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${ENABLE_DEBUG_TRUE}" && test -z "${ENABLE_DEBUG_FALSE}"; then
as_fn_error $? "conditional \"ENABLE_DEBUG\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -9165,16 +9343,16 @@ if (echo >conf$$.file) 2>/dev/null; then
# ... but there are two gotchas:
# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
+ # In both cases, we have to default to `cp -pR'.
ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
elif ln conf$$.file conf$$ 2>/dev/null; then
as_ln_s=ln
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
else
- as_ln_s='cp -p'
+ as_ln_s='cp -pR'
fi
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -9234,28 +9412,16 @@ else
as_mkdir_p=false
fi
-if test -x / >/dev/null 2>&1; then
- as_test_x='test -x'
-else
- if ls -dL / >/dev/null 2>&1; then
- as_ls_L_option=L
- else
- as_ls_L_option=
- fi
- as_test_x='
- eval sh -c '\''
- if test -d "$1"; then
- test -d "$1/.";
- else
- case $1 in #(
- -*)set "./$1";;
- esac;
- case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
- ???[sx]*):;;*)false;;esac;fi
- '\'' sh
- '
-fi
-as_executable_p=$as_test_x
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -9276,8 +9442,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by gnome-do-plugins $as_me 0.8.4, which was
-generated by GNU Autoconf 2.68. Invocation command line was
+This file was extended by gnome-do-plugins $as_me 0.8.5, which was
+generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -9333,11 +9499,11 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-gnome-do-plugins config.status 0.8.4
-configured by $0, generated by GNU Autoconf 2.68,
+gnome-do-plugins config.status 0.8.5
+configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
@@ -9417,7 +9583,7 @@ fi
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
if \$ac_cs_recheck; then
- set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
shift
\$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
CONFIG_SHELL='$SHELL'
@@ -9588,6 +9754,8 @@ do
"Tracker/Resources/TrackerSearch.addin.xml") CONFIG_FILES="$CONFIG_FILES Tracker/Resources/TrackerSearch.addin.xml" ;;
"Translate/Makefile") CONFIG_FILES="$CONFIG_FILES Translate/Makefile" ;;
"Translate/Resources/Translate.addin.xml") CONFIG_FILES="$CONFIG_FILES Translate/Resources/Translate.addin.xml" ;;
+ "Transmission/Makefile") CONFIG_FILES="$CONFIG_FILES Transmission/Makefile" ;;
+ "Transmission/Resources/Transmission.addin.xml") CONFIG_FILES="$CONFIG_FILES Transmission/Resources/Transmission.addin.xml" ;;
"Tomboy/Makefile") CONFIG_FILES="$CONFIG_FILES Tomboy/Makefile" ;;
"Tomboy/Resources/Tomboy.addin.xml") CONFIG_FILES="$CONFIG_FILES Tomboy/Resources/Tomboy.addin.xml" ;;
"Vinagre/Makefile") CONFIG_FILES="$CONFIG_FILES Vinagre/Makefile" ;;
@@ -10045,7 +10213,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
case $ac_file$ac_mode in
"depfiles":C) test x"$AMDEP_TRUE" != x"" || {
- # Autoconf 2.62 quotes --file arguments for eval, but not when files
+ # Older Autoconf quotes --file arguments for eval, but not when files
# are listed without --file. Let's play safe and only enable the eval
# if we detect the quoting.
case $CONFIG_FILES in
@@ -10058,7 +10226,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
# Strip MF so we end up with the name of the file.
mf=`echo "$mf" | sed -e 's/:.*$//'`
# Check whether this is an Automake generated Makefile or not.
- # We used to match only the files named `Makefile.in', but
+ # We used to match only the files named 'Makefile.in', but
# some people rename them; so instead we look at the file content.
# Grep'ing the first line is not enough: some people post-process
# each Makefile.in and add a new line on top of each file to say so.
@@ -10092,21 +10260,19 @@ $as_echo X"$mf" |
continue
fi
# Extract the definition of DEPDIR, am__include, and am__quote
- # from the Makefile without running `make'.
+ # from the Makefile without running 'make'.
DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
test -z "$DEPDIR" && continue
am__include=`sed -n 's/^am__include = //p' < "$mf"`
- test -z "am__include" && continue
+ test -z "$am__include" && continue
am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
- # When using ansi2knr, U may be empty or an underscore; expand it
- U=`sed -n 's/^U = //p' < "$mf"`
# Find all dependency output files, they are included files with
# $(DEPDIR) in their names. We invoke sed twice because it is the
# simplest approach to changing $(DEPDIR) to its actual value in the
# expansion.
for file in `sed -n "
s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
fdir=`$as_dirname -- "$file" ||
@@ -10219,6 +10385,7 @@ ${PACKAGE}-${VERSION}
Google Calendar: ${HAVE_GCAL}
Google Contacts: ${HAVE_GMAIL}
Google Docs: ${HAVE_GDOCS}
+ Transmission: ${HAVE_TRANSMISSION}
Window Manager: ${HAVE_WNCK}
YouTube: ${HAVE_YOUTUBE}
diff --git a/configure.ac b/configure.ac
index eea1cc7..166dfd4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl vim: set sw=4 sts=4 ts=4 noet ft=config foldmethod=marker foldmarker={{{,}}}
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ([2.54])
-AC_INIT([gnome-do-plugins], [0.8.4])
+AC_INIT([gnome-do-plugins], [0.8.5])
AM_INIT_AUTOMAKE([foreign tar-pax])
@@ -17,10 +17,7 @@ ASM_VERSION="$VERSION"
AC_SUBST(ASM_VERSION)
dnl pkg-config
-AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-if test "x$PKG_CONFIG" = "xno"; then
- AC_MSG_ERROR([You need to install pkg-config])
-fi
+PKG_PROG_PKG_CONFIG
AC_PROG_INSTALL
@@ -35,13 +32,41 @@ SHAMROCK_EXPAND_DATADIR
dnl -- Banshee.CollectionIndexer.dll links to DBus# after 2.1, so the Banshee
dnl -- plugin must follow suit.
-PKG_CHECK_EXISTS([banshee-collection-indexer >= 2.1], BANSHEE_USE_DBUS_SHARP=yes, BANSHEE_USE_DBUS_SHARP=no)
-AM_CONDITIONAL(BANSHEE_DBUS_SHARP, test "x$BANSHEE_USE_DBUS_SHARP" = "xyes")
+AC_MSG_CHECKING([Banshee.CollectionIndexer package])
+PKG_CHECK_EXISTS([banshee-collection-indexer],
+ [BANSHEE_COLLECTION_INDEXER=banshee-collection-indexer],
+ [BANSHEE_COLLECTION_INDEXER=no])
+if test "x$BANSHEE_COLLECTION_INDEXER" = "xno" ; then
+ PKG_CHECK_EXISTS([banshee-collection-indexer-1],
+ [BANSHEE_COLLECTION_INDEXER=banshee-collection-indexer-1],
+ [BANSHEE_COLLECTION_INDEXER=not found])
+fi
+AC_MSG_RESULT([$BANSHEE_COLLECTION_INDEXER])
+
+AC_MSG_CHECKING([which DBus implementation Banshee.CollectionIndexer requires])
+if $PKG_CONFIG --print-requires $BANSHEE_COLLECTION_INDEXER 2>&1 | grep dbus-sharp-1.0 > /dev/null ; then
+ BANSHEE_USE_DBUS_SHARP=yes
+ AC_MSG_RESULT([dbus-sharp])
+else
+ BANSHEE_USE_DBUS_SHARP=no
+ AC_MSG_RESULT([ndesk-dbus])
+fi
dnl -- DBus# required for Banshee and Telepathy support
PKG_CHECK_MODULES([DBUS_SHARP], [dbus-sharp-1.0], HAVE_DBUS_SHARP=yes, HAVE_DBUS_SHARP=no)
PKG_CHECK_MODULES([DBUS_SHARP_GLIB], [dbus-sharp-glib-1.0], HAVE_DBUS_SHARP_GLIB=yes, HAVE_DBUS_SNARP_GLIB=no)
+if test "x$HAVE_DBUS_SHARP" = "xyes" ; then
+ DBUS_BUILD_DEFINES=-define:USE_DBUS_SHARP
+else
+ PKG_CHECK_MODULES([DBUS_SHARP], [ndesk-dbus-1.0])
+ PKG_CHECK_MODULES([DBUS_SHARP_GLIB], [ndesk-dbus-glib-1.0])
+fi
+
+AC_SUBST([DBUS_BUILD_DEFINES])
+AC_SUBST([DBUS_SHARP_LIBS])
+AC_SUBST([DBUS_SHARP_GLIB_LIBS])
+
dnl {{{ check for Banshee
AC_ARG_ENABLE(banshee,
AC_HELP_STRING([--enable-banshee], [Build plugin to interact with Banshee (default: auto)]),
@@ -49,15 +74,9 @@ AC_ARG_ENABLE(banshee,
enable_banshee=auto)
if test "x$enable_banshee" != "xno"; then
- PKG_CHECK_MODULES([BANSHEE_INDEXER], [banshee-1-collection-indexer >= 1.4.2], HAVE_BANSHEE=yes, HAVE_BANSHEE=no)
- if test "x$HAVE_BANSHEE" = "xyes" ; then
- dnl We need to copy Banshee.CollectionIndexer.dll; it's not in the GAC
- BANSHEE_INDEXER_DLL=$($PKG_CONFIG --variable=Libraries banshee-1-collection-indexer)
- else
- # Banshee renamed this lib after 2.0.
- PKG_CHECK_MODULES([BANSHEE_INDEXER], [banshee-collection-indexer], HAVE_BANSHEE=yes, HAVE_BANSHEE=no)
- BANSHEE_INDEXER_DLL=$($PKG_CONFIG --variable=Libraries banshee-collection-indexer)
- fi
+ PKG_CHECK_MODULES([BANSHEE_INDEXER], [$BANSHEE_COLLECTION_INDEXER >= 1.4.2], HAVE_BANSHEE=yes, HAVE_BANSHEE=no)
+ dnl We need to copy Banshee.CollectionIndexer.dll; it's not in the GAC
+ BANSHEE_INDEXER_DLL=$($PKG_CONFIG --variable=Libraries $BANSHEE_COLLECTION_INDEXER)
if test "x$enable_banshee" = "xyes" -a "x$HAVE_BANSHEE" = "xno" ; then
AC_MSG_ERROR([Banshee support explicitly requested but dependencies not found.])
@@ -187,8 +206,6 @@ AC_SUBST([WNCK_SHARP_10_LIBS])
dnl}}}
dnl {{{
-# Temporarily check for dbus-sharp only in Empathy build
-# The DBus-Sharp fork is relatively new, and probably not ubiquitous yet.
AC_ARG_ENABLE(empathy,
AC_HELP_STRING([--enable-empathy], [Build plugin to Telepathy IM framework (default: auto]),
enable_empathy=$enableval,
@@ -206,8 +223,6 @@ if test "x$enable_empathy" != "xno"; then
else
HAVE_EMPATHY=no
fi
-AC_SUBST([DBUS_SHARP_LIBS])
-AC_SUBST([DBUS_SHARP_GLIB_LIBS])
AM_CONDITIONAL(HAVE_EMPATHY, test "x$HAVE_EMPATHY" = "xyes")
@@ -216,6 +231,31 @@ TELEPATHY_SHARP_LIBS=-r:$(pwd)/build/telepathy-sharp.dll
AC_SUBST([TELEPATHY_SHARP_LIBS])
dnl }}}
+dnl {{{
+AC_ARG_ENABLE(transmission,
+ AC_HELP_STRING([--enable-transmission], [Build plugin for the Transmission bittorrent client (default: auto]),
+ enable_transmission=$enableval,
+ enable_transmission=auto)
+
+if test "x$enable_transmission" != "xno"; then
+ PKG_CHECK_MODULES([NEWTONSOFT_JSON], [newtonsoft-json], HAVE_JSON=yes, HAVE_JSON=no)
+
+ if test "x$HAVE_JSON" = "xno" ; then
+ if test "x$enable_transmission" = "xyes" ; then
+ AC_MSG_ERROR([Transmission plugin explicitly requested but newtonsoft-json dependencies not found])
+ fi
+ HAVE_TRANSMISSION=no
+ else
+ HAVE_TRANSMISSION=yes
+ fi
+else
+ HAVE_TRANSMISSION=no
+fi
+
+AM_CONDITIONAL(HAVE_TRANSMISSION, test "x$HAVE_TRANSMISSION" = "xyes")
+dnl }}}
+
+
PKG_CHECK_MODULES([GCONF_SHARP_20], [gconf-sharp-2.0])
PKG_CHECK_MODULES([GLADE_SHARP_20], [glade-sharp-2.0])
PKG_CHECK_MODULES([GLIB_SHARP_20], [glib-sharp-2.0])
@@ -227,8 +267,6 @@ PKG_CHECK_MODULES([GTK_SHARP_20], [gtk-sharp-2.0])
PKG_CHECK_MODULES([MONO_ADDINS], [mono-addins])
PKG_CHECK_MODULES([MONO_ADDINS_GUI], [mono-addins-gui])
PKG_CHECK_MODULES([MONO_ADDINS_SETUP], [mono-addins-setup])
-PKG_CHECK_MODULES([NDESK_DBUS_10], [ndesk-dbus-1.0])
-PKG_CHECK_MODULES([NDESK_DBUS_GLIB_10], [ndesk-dbus-glib-1.0])
PKG_CHECK_MODULES([NOTIFY_SHARP], [notify-sharp])
@@ -243,8 +281,6 @@ AC_SUBST([GTK_SHARP_20_LIBS])
AC_SUBST([MONO_ADDINS_LIBS])
AC_SUBST([MONO_ADDINS_GUI_LIBS])
AC_SUBST([MONO_ADDINS_SETUP_LIBS])
-AC_SUBST([NDESK_DBUS_10_LIBS])
-AC_SUBST([NDESK_DBUS_GLIB_10_LIBS])
AC_SUBST([NOTIFY_SHARP_LIBS])
dnl Do core references
@@ -412,6 +448,8 @@ Tracker/Makefile
Tracker/Resources/TrackerSearch.addin.xml
Translate/Makefile
Translate/Resources/Translate.addin.xml
+Transmission/Makefile
+Transmission/Resources/Transmission.addin.xml
Tomboy/Makefile
Tomboy/Resources/Tomboy.addin.xml
Vinagre/Makefile
@@ -460,6 +498,7 @@ ${PACKAGE}-${VERSION}
Google Calendar: ${HAVE_GCAL}
Google Contacts: ${HAVE_GMAIL}
Google Docs: ${HAVE_GDOCS}
+ Transmission: ${HAVE_TRANSMISSION}
Window Manager: ${HAVE_WNCK}
YouTube: ${HAVE_YOUTUBE}
diff --git a/install-sh b/install-sh
index 6781b98..377bb86 100755
--- a/install-sh
+++ b/install-sh
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2011-11-20.07; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -35,7 +35,7 @@ scriptversion=2009-04-28.21; # UTC
# FSF changes to this file are in the public domain.
#
# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
+# 'make' implicit rules from creating a file called install from it
# when there is no Makefile.
#
# This script is compatible with the BSD install script, but was written
@@ -156,6 +156,10 @@ while test $# -ne 0; do
-s) stripcmd=$stripprog;;
-t) dst_arg=$2
+ # Protect names problematic for 'test' and other utilities.
+ case $dst_arg in
+ -* | [=\(\)!]) dst_arg=./$dst_arg;;
+ esac
shift;;
-T) no_target_directory=true;;
@@ -186,6 +190,10 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
fi
shift # arg
dst_arg=$arg
+ # Protect names problematic for 'test' and other utilities.
+ case $dst_arg in
+ -* | [=\(\)!]) dst_arg=./$dst_arg;;
+ esac
done
fi
@@ -194,13 +202,17 @@ if test $# -eq 0; then
echo "$0: no input file specified." >&2
exit 1
fi
- # It's OK to call `install-sh -d' without argument.
+ # It's OK to call 'install-sh -d' without argument.
# This can happen when creating conditional directories.
exit 0
fi
if test -z "$dir_arg"; then
- trap '(exit $?); exit' 1 2 13 15
+ do_exit='(exit $ret); exit $ret'
+ trap "ret=129; $do_exit" 1
+ trap "ret=130; $do_exit" 2
+ trap "ret=141; $do_exit" 13
+ trap "ret=143; $do_exit" 15
# Set umask so as not to create temps with too-generous modes.
# However, 'strip' requires both read and write access to temps.
@@ -228,9 +240,9 @@ fi
for src
do
- # Protect names starting with `-'.
+ # Protect names problematic for 'test' and other utilities.
case $src in
- -*) src=./$src;;
+ -* | [=\(\)!]) src=./$src;;
esac
if test -n "$dir_arg"; then
@@ -252,12 +264,7 @@ do
echo "$0: no destination specified." >&2
exit 1
fi
-
dst=$dst_arg
- # Protect names starting with `-'.
- case $dst in
- -*) dst=./$dst;;
- esac
# If destination is a directory, append the input filename; won't work
# if double slashes aren't ignored.
@@ -347,7 +354,7 @@ do
if test -z "$dir_arg" || {
# Check for POSIX incompatibilities with -m.
# HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
- # other-writeable bit of parent directory when it shouldn't.
+ # other-writable bit of parent directory when it shouldn't.
# FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
ls_ld_tmpdir=`ls -ld "$tmpdir"`
case $ls_ld_tmpdir in
@@ -385,7 +392,7 @@ do
case $dstdir in
/*) prefix='/';;
- -*) prefix='./';;
+ [-=\(\)!]*) prefix='./';;
*) prefix='';;
esac
@@ -403,7 +410,7 @@ do
for d
do
- test -z "$d" && continue
+ test X"$d" = X && continue
prefix=$prefix$d
if test -d "$prefix"; then
diff --git a/m4/intltool.m4 b/m4/intltool.m4
new file mode 100644
index 0000000..33353ed
--- /dev/null
+++ b/m4/intltool.m4
@@ -0,0 +1,237 @@
+## intltool.m4 - Configure intltool for the target system. -*-Shell-script-*-
+## Copyright (C) 2001 Eazel, Inc.
+## Author: Maciej Stachowiak <mjs at noisehavoc.org>
+## Kenneth Christiansen <kenneth at gnu.org>
+##
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+## General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+##
+## As a special exception to the GNU General Public License, if you
+## distribute this file as part of a program that contains a
+## configuration script generated by Autoconf, you may include it under
+## the same distribution terms that you use for the rest of that program.
+
+dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
+# serial 42 IT_PROG_INTLTOOL
+AC_DEFUN([IT_PROG_INTLTOOL], [
+AC_PREREQ([2.50])dnl
+AC_REQUIRE([AM_NLS])dnl
+
+case "$am__api_version" in
+ 1.[01234])
+ AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
+ ;;
+ *)
+ ;;
+esac
+
+INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
+INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+if test -n "$1"; then
+ AC_MSG_CHECKING([for intltool >= $1])
+ AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
+ test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
+ AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.])
+fi
+
+AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update])
+AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge])
+AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract])
+if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
+ AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])
+fi
+
+if test -z "$AM_DEFAULT_VERBOSITY"; then
+ AM_DEFAULT_VERBOSITY=1
+fi
+AC_SUBST([AM_DEFAULT_VERBOSITY])
+
+INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))'
+INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))'
+INTLTOOL__v_MERGE_0='@echo " ITMRG " [$]@;'
+AC_SUBST(INTLTOOL_V_MERGE)
+AC_SUBST(INTLTOOL__v_MERGE_)
+AC_SUBST(INTLTOOL__v_MERGE_0)
+
+INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))'
+intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))'
+intltool__v_merge_options_0='-q'
+AC_SUBST(INTLTOOL_V_MERGE_OPTIONS)
+AC_SUBST(intltool__v_merge_options_)
+AC_SUBST(intltool__v_merge_options_0)
+
+ INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< [$]@'
+ INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then
+ INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< [$]@'
+else
+ INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.[$][$]RANDOM && mkdir [$][$]_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u [$][$]_it_tmp_dir $< [$]@ && rmdir [$][$]_it_tmp_dir'
+fi
+ INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+
+_IT_SUBST(INTLTOOL_DESKTOP_RULE)
+_IT_SUBST(INTLTOOL_DIRECTORY_RULE)
+_IT_SUBST(INTLTOOL_KEYS_RULE)
+_IT_SUBST(INTLTOOL_PROP_RULE)
+_IT_SUBST(INTLTOOL_OAF_RULE)
+_IT_SUBST(INTLTOOL_PONG_RULE)
+_IT_SUBST(INTLTOOL_SERVER_RULE)
+_IT_SUBST(INTLTOOL_SHEET_RULE)
+_IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
+_IT_SUBST(INTLTOOL_UI_RULE)
+_IT_SUBST(INTLTOOL_XAM_RULE)
+_IT_SUBST(INTLTOOL_KBD_RULE)
+_IT_SUBST(INTLTOOL_XML_RULE)
+_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
+_IT_SUBST(INTLTOOL_CAVES_RULE)
+_IT_SUBST(INTLTOOL_SCHEMAS_RULE)
+_IT_SUBST(INTLTOOL_THEME_RULE)
+_IT_SUBST(INTLTOOL_SERVICE_RULE)
+_IT_SUBST(INTLTOOL_POLICY_RULE)
+
+# Check the gettext tools to make sure they are GNU
+AC_PATH_PROG(XGETTEXT, xgettext)
+AC_PATH_PROG(MSGMERGE, msgmerge)
+AC_PATH_PROG(MSGFMT, msgfmt)
+AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
+ AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
+fi
+xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
+mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
+mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
+if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
+ AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
+fi
+
+AC_PATH_PROG(INTLTOOL_PERL, perl)
+if test -z "$INTLTOOL_PERL"; then
+ AC_MSG_ERROR([perl not found])
+fi
+AC_MSG_CHECKING([for perl >= 5.8.1])
+$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
+if test $? -ne 0; then
+ AC_MSG_ERROR([perl 5.8.1 is required for intltool])
+else
+ IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
+ AC_MSG_RESULT([$IT_PERL_VERSION])
+fi
+if test "x$2" != "xno-xml"; then
+ AC_MSG_CHECKING([for XML::Parser])
+ if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
+ AC_MSG_RESULT([ok])
+ else
+ AC_MSG_ERROR([XML::Parser perl module is required for intltool])
+ fi
+fi
+
+# Substitute ALL_LINGUAS so we can use it in po/Makefile
+AC_SUBST(ALL_LINGUAS)
+
+# Set DATADIRNAME correctly if it is not set yet
+# (copied from glib-gettext.m4)
+if test -z "$DATADIRNAME"; then
+ AC_LINK_IFELSE(
+ [AC_LANG_PROGRAM([[]],
+ [[extern int _nl_msg_cat_cntr;
+ return _nl_msg_cat_cntr]])],
+ [DATADIRNAME=share],
+ [case $host in
+ *-*-solaris*)
+ dnl On Solaris, if bind_textdomain_codeset is in libc,
+ dnl GNU format message catalog is always supported,
+ dnl since both are added to the libc all together.
+ dnl Hence, we'd like to go with DATADIRNAME=share
+ dnl in this case.
+ AC_CHECK_FUNC(bind_textdomain_codeset,
+ [DATADIRNAME=share], [DATADIRNAME=lib])
+ ;;
+ *)
+ [DATADIRNAME=lib]
+ ;;
+ esac])
+fi
+AC_SUBST(DATADIRNAME)
+
+IT_PO_SUBDIR([po])
+
+])
+
+
+# IT_PO_SUBDIR(DIRNAME)
+# ---------------------
+# All po subdirs have to be declared with this macro; the subdir "po" is
+# declared by IT_PROG_INTLTOOL.
+#
+AC_DEFUN([IT_PO_SUBDIR],
+[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
+dnl
+dnl The following CONFIG_COMMANDS should be executed at the very end
+dnl of config.status.
+AC_CONFIG_COMMANDS_PRE([
+ AC_CONFIG_COMMANDS([$1/stamp-it], [
+ if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
+ AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
+ fi
+ rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
+ >"$1/stamp-it.tmp"
+ [sed '/^#/d
+ s/^[[].*] *//
+ /^[ ]*$/d
+ '"s|^| $ac_top_srcdir/|" \
+ "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
+ ]
+ [sed '/^POTFILES =/,/[^\\]$/ {
+ /^POTFILES =/!d
+ r $1/POTFILES
+ }
+ ' "$1/Makefile.in" >"$1/Makefile"]
+ rm -f "$1/Makefile.tmp"
+ mv "$1/stamp-it.tmp" "$1/stamp-it"
+ ])
+])dnl
+])
+
+# _IT_SUBST(VARIABLE)
+# -------------------
+# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
+#
+AC_DEFUN([_IT_SUBST],
+[
+AC_SUBST([$1])
+m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
+]
+)
+
+# deprecated macros
+AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
+# A hint is needed for aclocal from Automake <= 1.9.4:
+# AC_DEFUN([AC_PROG_INTLTOOL], ...)
+
diff --git a/m4/shamrock/mono.m4 b/m4/shamrock/mono.m4
index 47a0629..a549894 100644
--- a/m4/shamrock/mono.m4
+++ b/m4/shamrock/mono.m4
@@ -11,7 +11,18 @@ AC_DEFUN([SHAMROCK_FIND_MONO_2_0_COMPILER],
AC_DEFUN([SHAMROCK_FIND_C_SHARP_3_0_COMPILER],
[
AC_REQUIRE([SHAMROCK_FIND_MONO_RUNTIME])
- SHAMROCK_FIND_PROGRAM_OR_BAIL(MCS, gmcs)
+ AC_PATH_PROG(DMCS, dmcs, no)
+ if test "x$DMCS" = "xno"; then
+ AC_PATH_PROG(GMCS, gmcs, no)
+ if test "x$GMCS" = "xno"; then
+ AC_MSG_ERROR([You need to install a C♯ compiler.'])
+ else
+ MCS=$GMCS
+ fi
+ else
+ MCS=$DMCS
+ fi
+ AC_SUBST(MCS)
changequote(<<, >>)
MCS_VERSION=$($MCS --version | egrep -o "([[:digit:]]\.)+[[:digit:]]+")
changequote([, ])
diff --git a/missing b/missing
index 28055d2..cdea514 100755
--- a/missing
+++ b/missing
@@ -1,11 +1,10 @@
#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
+# Common wrapper for a few potentially missing GNU programs.
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2012-06-26.16; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009 Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Originally written by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -26,69 +25,40 @@ scriptversion=2009-04-28.21; # UTC
# the same distribution terms that you use for the rest of that program.
if test $# -eq 0; then
- echo 1>&2 "Try \`$0 --help' for more information"
+ echo 1>&2 "Try '$0 --help' for more information"
exit 1
fi
-run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
- configure_ac=configure.ac
-else
- configure_ac=configure.in
-fi
+case $1 in
-msg="missing on your system"
+ --is-lightweight)
+ # Used by our autoconf macros to check whether the available missing
+ # script is modern enough.
+ exit 0
+ ;;
-case $1 in
---run)
- # Try to run requested program, and just exit if it succeeds.
- run=
- shift
- "$@" && exit 0
- # Exit code 63 means version mismatch. This often happens
- # when the user try to use an ancient version of a tool on
- # a file that requires a minimum version. In this case we
- # we should proceed has if the program had been absent, or
- # if --run hadn't been passed.
- if test $? = 63; then
- run=:
- msg="probably too old"
- fi
- ;;
+ --run)
+ # Back-compat with the calling convention used by older automake.
+ shift
+ ;;
-h|--h|--he|--hel|--help)
echo "\
$0 [OPTION]... PROGRAM [ARGUMENT]...
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
+Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+to PROGRAM being missing or too old.
Options:
-h, --help display this help and exit
-v, --version output version information and exit
- --run try to run the given command, and emulate it if it fails
Supported PROGRAM values:
- aclocal touch file \`aclocal.m4'
- autoconf touch file \`configure'
- autoheader touch file \`config.h.in'
- autom4te touch the output file, or create a stub one
- automake touch all \`Makefile.in' files
- bison create \`y.tab.[ch]', if possible, from existing .[ch]
- flex create \`lex.yy.c', if possible, from existing .c
- help2man touch the output file
- lex create \`lex.yy.c', if possible, from existing .c
- makeinfo touch the output file
- tar try tar, gnutar, gtar, then tar without non-portable flags
- yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+ aclocal autoconf autoheader autom4te automake makeinfo
+ bison yacc flex lex help2man
-Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
-\`g' are ignored when checking the name.
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
Send bug reports to <bug-automake at gnu.org>."
exit $?
@@ -100,272 +70,141 @@ Send bug reports to <bug-automake at gnu.org>."
;;
-*)
- echo 1>&2 "$0: Unknown \`$1' option"
- echo 1>&2 "Try \`$0 --help' for more information"
+ echo 1>&2 "$0: unknown '$1' option"
+ echo 1>&2 "Try '$0 --help' for more information"
exit 1
;;
esac
-# normalize program name to check for.
-program=`echo "$1" | sed '
- s/^gnu-//; t
- s/^gnu//; t
- s/^g//; t'`
-
-# Now exit if we have it, but it failed. Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program). This is about non-GNU programs, so use $1 not
-# $program.
-case $1 in
- lex*|yacc*)
- # Not GNU programs, they don't have --version.
- ;;
-
- tar*)
- if test -n "$run"; then
- echo 1>&2 "ERROR: \`tar' requires --run"
- exit 1
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
- exit 1
- fi
- ;;
-
- *)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
- # Could not run --version or --help. This is probably someone
- # running `$TOOL --version' or `$TOOL --help' to check whether
- # $TOOL exists and not knowing $TOOL uses missing.
- exit 1
- fi
- ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $program in
- aclocal*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`acinclude.m4' or \`${configure_ac}'. You might want
- to install the \`Automake' and \`Perl' packages. Grab them from
- any GNU archive site."
- touch aclocal.m4
- ;;
-
- autoconf*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`${configure_ac}'. You might want to install the
- \`Autoconf' and \`GNU m4' packages. Grab them from any GNU
- archive site."
- touch configure
- ;;
-
- autoheader*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`acconfig.h' or \`${configure_ac}'. You might want
- to install the \`Autoconf' and \`GNU m4' packages. Grab them
- from any GNU archive site."
- files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
- test -z "$files" && files="config.h"
- touch_files=
- for f in $files; do
- case $f in
- *:*) touch_files="$touch_files "`echo "$f" |
- sed -e 's/^[^:]*://' -e 's/:.*//'`;;
- *) touch_files="$touch_files $f.in";;
- esac
- done
- touch $touch_files
- ;;
-
- automake*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
- You might want to install the \`Automake' and \`Perl' packages.
- Grab them from any GNU archive site."
- find . -type f -name Makefile.am -print |
- sed 's/\.am$/.in/' |
- while read f; do touch "$f"; done
- ;;
-
- autom4te*)
- echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
- You might have modified some files without having the
- proper tools for further handling them.
- You can get \`$1' as part of \`Autoconf' from any GNU
- archive site."
-
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
- touch $file
- else
- test -z "$file" || exec >$file
- echo "#! /bin/sh"
- echo "# Created by GNU Automake missing as a replacement of"
- echo "# $ $@"
- echo "exit 0"
- chmod +x $file
- exit 1
- fi
- ;;
-
- bison*|yacc*)
- echo 1>&2 "\
-WARNING: \`$1' $msg. You should only need it if
- you modified a \`.y' file. You may need the \`Bison' package
- in order for those modifications to take effect. You can get
- \`Bison' from any GNU archive site."
- rm -f y.tab.c y.tab.h
- if test $# -ne 1; then
- eval LASTARG="\${$#}"
- case $LASTARG in
- *.y)
- SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if test -f "$SRCFILE"; then
- cp "$SRCFILE" y.tab.c
- fi
- SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if test -f "$SRCFILE"; then
- cp "$SRCFILE" y.tab.h
- fi
- ;;
- esac
- fi
- if test ! -f y.tab.h; then
- echo >y.tab.h
- fi
- if test ! -f y.tab.c; then
- echo 'main() { return 0; }' >y.tab.c
- fi
- ;;
-
- lex*|flex*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.l' file. You may need the \`Flex' package
- in order for those modifications to take effect. You can get
- \`Flex' from any GNU archive site."
- rm -f lex.yy.c
- if test $# -ne 1; then
- eval LASTARG="\${$#}"
- case $LASTARG in
- *.l)
- SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if test -f "$SRCFILE"; then
- cp "$SRCFILE" lex.yy.c
- fi
- ;;
- esac
- fi
- if test ! -f lex.yy.c; then
- echo 'main() { return 0; }' >lex.yy.c
- fi
- ;;
-
- help2man*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a dependency of a manual page. You may need the
- \`Help2man' package in order for those modifications to take
- effect. You can get \`Help2man' from any GNU archive site."
-
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
- touch $file
- else
- test -z "$file" || exec >$file
- echo ".ab help2man is required to generate this page"
- exit $?
- fi
- ;;
-
- makeinfo*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.texi' or \`.texinfo' file, or any other file
- indirectly affecting the aspect of the manual. The spurious
- call might also be the consequence of using a buggy \`make' (AIX,
- DU, IRIX). You might want to install the \`Texinfo' package or
- the \`GNU make' package. Grab either from any GNU archive site."
- # The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -z "$file"; then
- # ... or it is the one specified with @setfilename ...
- infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '
- /^@setfilename/{
- s/.* \([^ ]*\) *$/\1/
- p
- q
- }' $infile`
- # ... or it is derived from the source name (dir/f.texi becomes f.info)
- test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
- fi
- # If the file does not exist, the user really needs makeinfo;
- # let's fail without touching anything.
- test -f $file || exit 1
- touch $file
- ;;
-
- tar*)
- shift
-
- # We have already tried tar in the generic part.
- # Look for gnutar/gtar before invocation to avoid ugly error
- # messages.
- if (gnutar --version > /dev/null 2>&1); then
- gnutar "$@" && exit 0
- fi
- if (gtar --version > /dev/null 2>&1); then
- gtar "$@" && exit 0
- fi
- firstarg="$1"
- if shift; then
- case $firstarg in
- *o*)
- firstarg=`echo "$firstarg" | sed s/o//`
- tar "$firstarg" "$@" && exit 0
- ;;
- esac
- case $firstarg in
- *h*)
- firstarg=`echo "$firstarg" | sed s/h//`
- tar "$firstarg" "$@" && exit 0
- ;;
- esac
- fi
-
- echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
- You may want to install GNU tar or Free paxutils, or check the
- command line arguments."
- exit 1
- ;;
-
- *)
- echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
- You might have modified some files without having the
- proper tools for further handling them. Check the \`README' file,
- it often tells you about the needed prerequisites for installing
- this package. You may also peek at any GNU archive site, in case
- some other package would contain this missing \`$1' program."
- exit 1
- ;;
-esac
+# Run the given program, remember its exit status.
+"$@"; st=$?
+
+# If it succeeded, we are done.
+test $st -eq 0 && exit 0
+
+# Also exit now if we it failed (or wasn't found), and '--version' was
+# passed; such an option is passed most likely to detect whether the
+# program is present and works.
+case $2 in --version|--help) exit $st;; esac
+
+# Exit code 63 means version mismatch. This often happens when the user
+# tries to use an ancient version of a tool on a file that requires a
+# minimum version.
+if test $st -eq 63; then
+ msg="probably too old"
+elif test $st -eq 127; then
+ # Program was missing.
+ msg="missing on your system"
+else
+ # Program was found and executed, but failed. Give up.
+ exit $st
+fi
-exit 0
+perl_URL=http://www.perl.org/
+flex_URL=http://flex.sourceforge.net/
+gnu_software_URL=http://www.gnu.org/software
+
+program_details ()
+{
+ case $1 in
+ aclocal|automake)
+ echo "The '$1' program is part of the GNU Automake package:"
+ echo "<$gnu_software_URL/automake>"
+ echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
+ echo "<$gnu_software_URL/autoconf>"
+ echo "<$gnu_software_URL/m4/>"
+ echo "<$perl_URL>"
+ ;;
+ autoconf|autom4te|autoheader)
+ echo "The '$1' program is part of the GNU Autoconf package:"
+ echo "<$gnu_software_URL/autoconf/>"
+ echo "It also requires GNU m4 and Perl in order to run:"
+ echo "<$gnu_software_URL/m4/>"
+ echo "<$perl_URL>"
+ ;;
+ esac
+}
+
+give_advice ()
+{
+ # Normalize program name to check for.
+ normalized_program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
+ printf '%s\n' "'$1' is $msg."
+
+ configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+ case $normalized_program in
+ autoconf*)
+ echo "You should only need it if you modified 'configure.ac',"
+ echo "or m4 files included by it."
+ program_details 'autoconf'
+ ;;
+ autoheader*)
+ echo "You should only need it if you modified 'acconfig.h' or"
+ echo "$configure_deps."
+ program_details 'autoheader'
+ ;;
+ automake*)
+ echo "You should only need it if you modified 'Makefile.am' or"
+ echo "$configure_deps."
+ program_details 'automake'
+ ;;
+ aclocal*)
+ echo "You should only need it if you modified 'acinclude.m4' or"
+ echo "$configure_deps."
+ program_details 'aclocal'
+ ;;
+ autom4te*)
+ echo "You might have modified some maintainer files that require"
+ echo "the 'automa4te' program to be rebuilt."
+ program_details 'autom4te'
+ ;;
+ bison*|yacc*)
+ echo "You should only need it if you modified a '.y' file."
+ echo "You may want to install the GNU Bison package:"
+ echo "<$gnu_software_URL/bison/>"
+ ;;
+ lex*|flex*)
+ echo "You should only need it if you modified a '.l' file."
+ echo "You may want to install the Fast Lexical Analyzer package:"
+ echo "<$flex_URL>"
+ ;;
+ help2man*)
+ echo "You should only need it if you modified a dependency" \
+ "of a man page."
+ echo "You may want to install the GNU Help2man package:"
+ echo "<$gnu_software_URL/help2man/>"
+ ;;
+ makeinfo*)
+ echo "You should only need it if you modified a '.texi' file, or"
+ echo "any other file indirectly affecting the aspect of the manual."
+ echo "You might want to install the Texinfo package:"
+ echo "<$gnu_software_URL/texinfo/>"
+ echo "The spurious makeinfo call might also be the consequence of"
+ echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
+ echo "want to install GNU make:"
+ echo "<$gnu_software_URL/make/>"
+ ;;
+ *)
+ echo "You might have modified some files without having the proper"
+ echo "tools for further handling them. Check the 'README' file, it"
+ echo "often tells you about the needed prerequisites for installing"
+ echo "this package. You may also peek at any GNU archive site, in"
+ echo "case some other package contains this missing '$1' program."
+ ;;
+ esac
+}
+
+give_advice "$1" | sed -e '1s/^/WARNING: /' \
+ -e '2,$s/^/ /' >&2
+
+# Propagate the correct exit status (expected to be 127 for a program
+# not found, 63 for a program that failed due to version mismatch).
+exit $st
# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index cc8a222..06a8cfe 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -49,8 +49,8 @@ MSGFMT = @MSGFMT@
XGETTEXT = @XGETTEXT@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
-GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
+MSGMERGE = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
+GENPOT = INTLTOOL_EXTRACT="$(INTLTOOL_EXTRACT)" XGETTEXT="$(XGETTEXT)" srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
ALL_LINGUAS = @ALL_LINGUAS@
@@ -73,15 +73,20 @@ CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$l
.SUFFIXES:
.SUFFIXES: .po .pox .gmo .mo .msg .cat
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+INTLTOOL_V_MSGFMT = $(INTLTOOL__v_MSGFMT_$(V))
+INTLTOOL__v_MSGFMT_= $(INTLTOOL__v_MSGFMT_$(AM_DEFAULT_VERBOSITY))
+INTLTOOL__v_MSGFMT_0 = @echo " MSGFMT" $@;
+
.po.pox:
$(MAKE) $(GETTEXT_PACKAGE).pot
$(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox
.po.mo:
- $(MSGFMT) -o $@ $<
+ $(INTLTOOL_V_MSGFMT)$(MSGFMT) -o $@ $<
.po.gmo:
- file=`echo $* | sed 's,.*/,,'`.gmo \
+ $(INTLTOOL_V_MSGFMT)file=`echo $* | sed 's,.*/,,'`.gmo \
&& rm -f $$file && $(GMSGFMT) -o $$file $<
.po.cat:
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3af192f..e1905d4 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -33,6 +33,7 @@ DiskMounter/src/OpenVolumeAction.cs
DiskMounter/src/UnmountAction.cs
Dropbox/gtk-gui/Dropbox.DropboxConfig.cs
Dropbox/src/Config/DropboxConfig.cs
+Dropbox/src/Dropbox.cs
Dropbox/src/DropboxAbstractAction.cs
Dropbox/src/DropboxLinkAction.cs
Dropbox/src/DropboxPuburlAction.cs
@@ -247,6 +248,16 @@ Tomboy/src/NotesItemSource.cs
Tomboy/src/SearchNotesAction.cs
Tomboy/src/TomboyBrowseNotesItem.cs
Tomboy/src/TomboyItem.cs
+Transmission/gtk-gui/Transmission.TransmissionConfig.cs
+Transmission/src/TorrentFileSetPriorityAction.cs
+Transmission/src/TorrentLimitDownloadSpeedAction.cs
+Transmission/src/TorrentLimitUploadSpeedAction.cs
+Transmission/src/TorrentMarkForDownloadAction.cs
+Transmission/src/TorrentOperateAction.cs
+Transmission/src/TorrentStartAction.cs
+Transmission/src/TorrentStopAction.cs
+Transmission/src/TorrentUnmarkForDownloadAction.cs
+Transmission/src/TorrentVerifyAction.cs
Tracker/src/TrackerSearchAction.cs
Translate/gtk-gui/Translate.ConfigUI.cs
Translate/src/Provider/Google.cs
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/gnome-do-plugins.git
More information about the Pkg-cli-apps-commits
mailing list