diff options
| author | Ted Gould <ted@gould.cx> | 2009-12-17 14:40:34 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2009-12-17 14:40:34 -0600 |
| commit | f789e13ed4d6a16deea2f07255ca21fbd7887679 (patch) | |
| tree | 6f3a8457a062d94114b4a3b89f817442868553e9 | |
| parent | 6d8c3127941de75b8e1cd4f52e68e522405dd392 (diff) | |
| parent | 52c77ebbd512a3f5601daddda903ebdac890d3e9 (diff) | |
| download | ayatana-indicator-application-f789e13ed4d6a16deea2f07255ca21fbd7887679.tar.gz ayatana-indicator-application-f789e13ed4d6a16deea2f07255ca21fbd7887679.tar.bz2 ayatana-indicator-application-f789e13ed4d6a16deea2f07255ca21fbd7887679.zip | |
Using a constant snk file instead of generating it each time.
| -rw-r--r-- | bindings/mono/Makefile.am | 6 | ||||
| -rw-r--r-- | bindings/mono/appindicator-sharp.snk | bin | 0 -> 596 bytes | |||
| -rw-r--r-- | configure.ac | 6 |
3 files changed, 3 insertions, 9 deletions
diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am index fe56158..dedbeb7 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,8 +51,7 @@ 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) + $(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"; \ diff --git a/bindings/mono/appindicator-sharp.snk b/bindings/mono/appindicator-sharp.snk Binary files differnew file mode 100644 index 0000000..efb62d0 --- /dev/null +++ b/bindings/mono/appindicator-sharp.snk diff --git a/configure.ac b/configure.ac index 2992df2..30e4ba4 100644 --- a/configure.ac +++ b/configure.ac @@ -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) |