aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-05-20 22:03:10 -0500
committerTed Gould <ted@gould.cx>2010-05-20 22:03:10 -0500
commitf7fd52b7477bfbef0762e8e608f3a9b095133fd1 (patch)
tree09e93f97425f7935cf9770dcb60201bfe6e54b3f
parent8f8efd3b3472e7f795d30eb0c3d91c153f10f5a1 (diff)
parent6fcbfe59a0efa0275afb1ff3830eec3ed03a2518 (diff)
downloadayatana-indicator-application-f7fd52b7477bfbef0762e8e608f3a9b095133fd1.tar.gz
ayatana-indicator-application-f7fd52b7477bfbef0762e8e608f3a9b095133fd1.tar.bz2
ayatana-indicator-application-f7fd52b7477bfbef0762e8e608f3a9b095133fd1.zip
Merging in updates from the 0.1 series branch
-rw-r--r--bindings/mono/Makefile.am5
-rw-r--r--configure.ac4
2 files changed, 5 insertions, 4 deletions
diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am
index e573c9b..7e2b0d2 100644
--- a/bindings/mono/Makefile.am
+++ b/bindings/mono/Makefile.am
@@ -19,6 +19,7 @@ DISTCLEANFILES = $(ASSEMBLY).config
TEST_SOURCES = TestIndicator.cs
customs = ApplicationIndicator.custom
EXTRA_DIST = \
+ AssemblyInfo.cs \
$(RAW_API) \
$(METADATA) \
appindicator-sharp-0.1.pc.in \
@@ -74,9 +75,9 @@ generated-stamp: $(API) $(build_customs)
--outdir=generated --assembly-name=$(ASSEMBLY_NAME) \
&& touch generated-stamp
-$(ASSEMBLY): generated-stamp
+$(ASSEMBLY): generated-stamp $(srcdir)/AssemblyInfo.cs
@rm -f $(ASSEMBLY).mdb
- $(CSC) $(CSFLAGS) -keyfile:$(srcdir)/$(ASSEMBLY_NAME).snk -nowarn:0169,0612,0618 -unsafe -out:$(ASSEMBLY) -target:library $(references) $(builddir)/$(GENERATED_SOURCES) AssemblyInfo.cs
+ $(CSC) $(CSFLAGS) -keyfile:$(srcdir)/$(ASSEMBLY_NAME).snk -nowarn:0169,0612,0618 -unsafe -out:$(ASSEMBLY) -target:library $(references) $(builddir)/$(GENERATED_SOURCES) $(srcdir)/AssemblyInfo.cs
install-data-local:
echo "$(GACUTIL) -i $(ASSEMBLY_NAME).dll -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib"; \
diff --git a/configure.ac b/configure.ac
index eab3411..b750c83 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
-AC_INIT(indicator-application, 0.0.19, ted@canonical.com)
+AC_INIT(indicator-application, 0.0.21, ted@canonical.com)
AC_COPYRIGHT([Copyright 2009, 2010 Canonical])
AC_PREREQ(2.53)
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-application, 0.0.19)
+AM_INIT_AUTOMAKE(indicator-application, 0.0.21)
AM_MAINTAINER_MODE