From af814231cc7fbab3fd6653ae499f8c6929d3144c Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 17 Dec 2009 15:01:24 -0500 Subject: Don't create the signature during build --- bindings/mono/Makefile.am | 4 ++-- bindings/mono/appindicator-sharp.snk | Bin 0 -> 596 bytes configure.ac | 10 ++-------- 3 files changed, 4 insertions(+), 10 deletions(-) create mode 100644 bindings/mono/appindicator-sharp.snk diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am index fe56158..662c3dc 100644 --- a/bindings/mono/Makefile.am +++ b/bindings/mono/Makefile.am @@ -13,7 +13,7 @@ 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 $(ASSEMBLY_NAME).snk $(API) $(RAW_API) $(TEST) +CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb generated-stamp generated/*.cs $(API) $(RAW_API) $(TEST) DISTCLEANFILES = $(ASSEMBLY).config TEST_SOURCES = TestIndicator.cs EXTRA_DIST = \ @@ -22,6 +22,7 @@ EXTRA_DIST = \ appindicator-sharp-0.1.pc.in \ appindicator-sharp.dll.config.in \ app-indicator.sources.xml \ + $(ASSEMBLY_NAME).snk \ $(TEST_SOURCES) GACUTIL_FLAGS="-package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib" @@ -50,7 +51,6 @@ generated-stamp: $(API) $(ASSEMBLY): generated-stamp @rm -f $(ASSEMBLY).mdb - $(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: diff --git a/bindings/mono/appindicator-sharp.snk b/bindings/mono/appindicator-sharp.snk new file mode 100644 index 0000000..efb62d0 Binary files /dev/null and b/bindings/mono/appindicator-sharp.snk differ diff --git a/configure.ac b/configure.ac index 114b42b..559c2b4 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.6, 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.6) AM_MAINTAINER_MODE @@ -81,15 +81,9 @@ 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) -- cgit v1.2.3 From 52c77ebbd512a3f5601daddda903ebdac890d3e9 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Thu, 17 Dec 2009 15:29:51 -0500 Subject: use srcdir for the path to appindicator-sharp.snk --- bindings/mono/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am index 662c3dc..dedbeb7 100644 --- a/bindings/mono/Makefile.am +++ b/bindings/mono/Makefile.am @@ -51,7 +51,7 @@ generated-stamp: $(API) $(ASSEMBLY): generated-stamp @rm -f $(ASSEMBLY).mdb - $(CSC) $(CSFLAGS) -keyfile:$(ASSEMBLY_NAME).snk -nowarn:0169,0612,0618 -unsafe -out:$(ASSEMBLY) -target:library $(references) $(builddir)/$(GENERATED_SOURCES) + $(CSC) $(CSFLAGS) -keyfile:$(srcdir)/$(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"; \ -- cgit v1.2.3