diff options
| author | Markus Korn <thekorn@gmx.de> | 2010-11-08 23:20:21 +0100 |
|---|---|---|
| committer | Markus Korn <thekorn@gmx.de> | 2010-11-08 23:20:21 +0100 |
| commit | 30a61b25bb0cad45fcaef7d4a7a1a43cad564e9d (patch) | |
| tree | ef49aac95483185f5898d3cf102366909a71f818 | |
| parent | affc359a9b11090aa3bbf39f4db39101ce723973 (diff) | |
some build env fixes for tomboy addin
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | tomboy/Makefile.am | 12 |
2 files changed, 11 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index c988a8c..c59d0b0 100644 --- a/configure.ac +++ b/configure.ac @@ -171,7 +171,10 @@ for plugin in ${used_plugins}; do plugin_error_or_ignore "you need mono(gmcs) installed to use the ${plugin} plugin" continue fi - PKG_CHECK_MODULES(ZEITGEIST_SHARP, zeitgeist-sharp , ENABLE_ZEITGEIST_SHARP=yes, ENABLE_ZEITGEIST_SHARP=no) + PKG_CHECK_MODULES(ZEITGEIST_SHARP, zeitgeist-sharp, + ENABLE_ZEITGEIST_SHARP=yes, ENABLE_ZEITGEIST_SHARP=no) + PKG_CHECK_MODULES(TOMBOY_ADDINS, tomboy-addins) + PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0) if test "${ENABLE_ZEITGEIST_SHARP}" != "yes" ; then plugin_error_or_ignore "zeitgeist-sharp package not found" continue @@ -186,7 +189,7 @@ for plugin in ${used_plugins}; do if test "x$XBUILD" = "xno"; then AC_MSG_ERROR([You need to install xbuild]) fi - AC_SUBST(ZEITGEISTDP_LIBS) + AC_SUBST(ZEITGEIST_SHARP_LIBS) ;; totem*) if test "${with_vala}" != "yes" ; then diff --git a/tomboy/Makefile.am b/tomboy/Makefile.am index adae693..74025bc 100644 --- a/tomboy/Makefile.am +++ b/tomboy/Makefile.am @@ -4,14 +4,14 @@ CSFLAGS = \ -target:library ASSEMBLIES = \ - $(LINK_TOMBOY_EXE) \ - $(GTKSHARP_LIBS) \ - $(LINK_MONO_ADDINS) \ - $(ZEITGEISTDP_LIBS) \ + $(TOMBOY_ADDINS_LIBS) \ + $(GTK_SHARP_LIBS) \ + $(ZEITGEIST_SHARP_LIBS) \ -r:Mono.Posix ADDIN_NAME = ZeitgeistDataprovider -TARGET = $(top_builddir)/bin/addins/$(ADDIN_NAME).dll +TARGET_DIR = $(top_builddir)/bin/addins +TARGET = $(TARGET_DIR)/$(ADDIN_NAME).dll CSFILES = \ $(srcdir)/Zeitgeist.cs \ $(srcdir)/ZeitgeistAddin.cs \ @@ -23,7 +23,7 @@ RESOURCES = \ $(TARGET).mdb: $(TARGET) $(TARGET): $(CSFILES) $(TOMBOY_EXE_PATH) - mkdir -p `dirname $(TARGET)` && $(CSC) -out:$@ $(CSFLAGS) $(ASSEMBLIES) $(CSFILES) $(RESOURCES) + mkdir -p $(TARGET_DIR) && $(GMCS) -out:$@ $(CSFLAGS) $(ASSEMBLIES) $(CSFILES) $(RESOURCES) addinsdir = $(pkglibdir)/addins |