aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen VanDine <ken.vandine@canonical.com>2009-12-17 01:27:31 -0500
committerKen VanDine <ken.vandine@canonical.com>2009-12-17 01:27:31 -0500
commit33beea53f6fa683cdabf7f15ee79aed27d2d2627 (patch)
tree9dafcf4a5b91e07972305e7e3df8429537a170e7
parent7ebdc977187c54ea6a6f9aa66ea0cb3b9f2d67c5 (diff)
parent6af5c9970afd9ea2d9e1192d67fd92438dda8a8c (diff)
downloadayatana-indicator-application-33beea53f6fa683cdabf7f15ee79aed27d2d2627.tar.gz
ayatana-indicator-application-33beea53f6fa683cdabf7f15ee79aed27d2d2627.tar.bz2
ayatana-indicator-application-33beea53f6fa683cdabf7f15ee79aed27d2d2627.zip
merged from trunk
-rw-r--r--bindings/mono/Makefile.am16
-rw-r--r--configure.ac16
2 files changed, 27 insertions, 5 deletions
diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am
index 87f1e5a..fe56158 100644
--- a/bindings/mono/Makefile.am
+++ b/bindings/mono/Makefile.am
@@ -13,8 +13,9 @@ ASSEMBLY = appindicator-sharp.dll
TARGET = $(ASSEMBLY) $(ASSEMBLY).config
assemblydir = $(libdir)/appindicator-sharp-0.1
assembly_DATA = $(TARGET)
-CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb generated-stamp generated/*.cs $(API) $(RAW_API) $(TEST)
+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb generated-stamp generated/*.cs $(ASSEMBLY_NAME).snk $(API) $(RAW_API) $(TEST)
DISTCLEANFILES = $(ASSEMBLY).config
+TEST_SOURCES = TestIndicator.cs
EXTRA_DIST = \
$(RAW_API) \
$(METADATA) \
@@ -23,7 +24,7 @@ EXTRA_DIST = \
app-indicator.sources.xml \
$(TEST_SOURCES)
-TEST_SOURCES = TestIndicator.cs
+GACUTIL_FLAGS="-package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib"
references = $(GTK_SHARP_LIBS)
test_references = $(GTK_SHARP_LIBS) $(NUNIT_LIBS) -r:$(ASSEMBLY)
@@ -49,7 +50,16 @@ generated-stamp: $(API)
$(ASSEMBLY): generated-stamp
@rm -f $(ASSEMBLY).mdb
- $(CSC) $(CSFLAGS) -nowarn:0169,0612,0618 -unsafe -out:$(ASSEMBLY) -target:library $(references) $(builddir)/$(GENERATED_SOURCES)
+ $(SN) -k $(ASSEMBLY_NAME).snk
+ $(CSC) $(CSFLAGS) -keyfile:$(ASSEMBLY_NAME).snk -nowarn:0169,0612,0618 -unsafe -out:$(ASSEMBLY) -target:library $(references) $(builddir)/$(GENERATED_SOURCES)
+
+install-data-local:
+ echo "$(GACUTIL) -i $(ASSEMBLY_NAME).dll -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib"; \
+ $(GACUTIL) -i $(ASSEMBLY_NAME).dll -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib || exit 1;
+
+uninstall-local:
+ echo "$(GACUTIL) -u $(ASSEMBLY_NAME) -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib"; \
+ $(GACUTIL) -u $(ASSEMBLY_NAME) -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib || exit 1;
$(TEST): $(ASSEMBLY) $(TEST_SOURCES)
$(CSC) -out:$(TEST) -target:library $(test_references) $(srcdir)/$(TEST_SOURCES)
diff --git a/configure.ac b/configure.ac
index 1ff33d8..2992df2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
-AC_INIT(indicator-application, 0.0.4, ted@canonical.com)
+AC_INIT(indicator-application, 0.0.5, ted@canonical.com)
AC_COPYRIGHT([Copyright 2009 Canonical])
AC_PREREQ(2.53)
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-application, 0.0.4)
+AM_INIT_AUTOMAKE(indicator-application, 0.0.5)
AM_MAINTAINER_MODE
@@ -76,8 +76,20 @@ if test "x$CSC" = "xno" ; then
AC_MSG_ERROR([No Mono compiler found.])
fi
+AC_PATH_PROG(GACUTIL, gacutil, no)
+if test "x$GACUTIL" = "xno" ; then
+ AC_MSG_ERROR([No gacutil tool found])
+fi
+
+AC_PATH_PROG(SN, sn, no)
+if test "x$SN" = "xno" ; then
+ AC_MSG_ERROR([No sn tool found])
+fi
+
AC_SUBST(RUNTIME)
AC_SUBST(CSC)
+AC_SUBST(GACUTIL)
+AC_SUBST(SN)
AC_SUBST(LIB_PREFIX)
AC_SUBST(LIB_SUFFIX)
AC_SUBST(GENERATED_SOURCES)