diff options
-rw-r--r-- | .bzrignore | 17 | ||||
-rw-r--r-- | configure.ac | 18 | ||||
-rw-r--r-- | monodevelop/Makefile.am | 35 | ||||
-rw-r--r-- | tomboy/Makefile.am | 2 |
4 files changed, 63 insertions, 9 deletions
@@ -7,3 +7,20 @@ Makefile.in .libs *.la *.lo +aclocal.m4 +autom4te.cache/ +config.guess +config.log +config.status +config.sub +configure +depcomp +elisp-comp +install-sh +libtool +ltmain.sh +missing +*.dll +*.mdb +emacs/elc-stamp + diff --git a/configure.ac b/configure.ac index e92d792..e03ce5d 100644 --- a/configure.ac +++ b/configure.ac @@ -86,8 +86,7 @@ else error_on_bad_plugin="0" fi -AC_PATH_PROG(GMCS, gmcs, no) -AC_PATH_PROG(XBUILD, xbuild, no) +AC_PATH_PROG(DMCS, dmcs, no) # Check for plugin-specific requirements and error if necessary for plugin in ${used_plugins}; do @@ -174,6 +173,8 @@ for plugin in ${used_plugins}; do ENABLE_ZEITGEIST_SHARP=yes, ENABLE_ZEITGEIST_SHARP=no) PKG_CHECK_MODULES(MONODEVELOP, monodevelop, HAS_MONODEVELOP=yes, HAS_MONODEVELOP=no) + PKG_CHECK_MODULES(MONO_ADDINS, mono-addins, + HAS_MONO_ADDINS=yes, HAS_MONO_ADDINS=no) if test "${ENABLE_ZEITGEIST_SHARP}" = "no" ; then plugin_error_or_ignore "zeitgeist-sharp package not found" @@ -183,7 +184,12 @@ for plugin in ${used_plugins}; do plugin_error_or_ignore "You need to install monodevelop" continue fi + if test "x$HAS_MONO_ADDINS" = "xno"; then + plugin_error_or_ignore "You need to install mono-addins" + continue + fi AC_SUBST(MONODEVELOP_LIBS) + AC_SUBST(MONO_ADDINS_LIBS) ;; npapi-plugin) if test "${HAVE_LIBZG}" != "yes" ; then @@ -212,12 +218,8 @@ for plugin in ${used_plugins}; do plugin_error_or_ignore "You need to install tomboy" continue fi - if test "x$GMCS" = "xno"; then - plugin_error_or_ignore "You need to install gmcs" - continue - fi - if test "x$XBUILD" = "xno"; then - plugin_error_or_ignore "You need to install xbuild for tomboy" + if test "x$DMCS" = "xno"; then + plugin_error_or_ignore "You need to install dmcs" continue fi if test "x$HAS_GTK_SHARP" = "xno"; then diff --git a/monodevelop/Makefile.am b/monodevelop/Makefile.am new file mode 100644 index 0000000..50ce6a7 --- /dev/null +++ b/monodevelop/Makefile.am @@ -0,0 +1,35 @@ +CSFLAGS = \ + -debug \ + -define:DEBUG \ + -target:library + +ASSEMBLIES = \ + $(MONODEVELOP_LIBS) \ + $(ZEITGEIST_SHARP_LIBS) \ + $(MONO_ADDINS_LIBS) \ + -r:Mono.Posix + +ADDIN_NAME = ZeitgeistDataprovider +TARGET = $(ADDIN_NAME).dll +CSFILES = \ + $(srcdir)/StartupHandler.cs \ + $(srcdir)/TrackedDocument.cs \ + $(srcdir)/ZeitgeistClient.cs \ + $(srcdir)/AssemblyInfo.cs +RESOURCES = \ + -resource:$(srcdir)/MonoDevelop.Zeitgeist.addin.xml + +$(TARGET): $(CSFILES) + $(DMCS) -out:$@ $(CSFLAGS) $(ASSEMBLIES) $(CSFILES) $(RESOURCES) + + +addinsdir = $(libdir)/monodevelop/Addins +addins_DATA = $(TARGET) + +EXTRA_DIST = \ + $(CSFILES) \ + $(srcdir)/$(ADDIN_NAME).addin.xml + +DISTCLEANFILES = \ + $(TARGET) \ + $(TARGET).mdb diff --git a/tomboy/Makefile.am b/tomboy/Makefile.am index 26f7878..49add3b 100644 --- a/tomboy/Makefile.am +++ b/tomboy/Makefile.am @@ -20,7 +20,7 @@ RESOURCES = \ -resource:$(srcdir)/$(ADDIN_NAME).addin.xml $(TARGET): $(CSFILES) - $(GMCS) -out:$@ $(CSFLAGS) $(ASSEMBLIES) $(CSFILES) $(RESOURCES) + $(DMCS) -out:$@ $(CSFLAGS) $(ASSEMBLIES) $(CSFILES) $(RESOURCES) addinsdir = $(libdir)/tomboy/addins |