From f399d897c0367ebde3acbe2da2b819116f4a739f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 18 Jun 2010 10:33:02 -0500 Subject: Generating a policy dll --- bindings/mono/Makefile.am | 8 +++++++- bindings/mono/policy.2.0.appindicator-sharp.config | 10 ++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 bindings/mono/policy.2.0.appindicator-sharp.config (limited to 'bindings/mono') diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am index 4d2d8b4..cd2d229 100644 --- a/bindings/mono/Makefile.am +++ b/bindings/mono/Makefile.am @@ -11,7 +11,8 @@ RAW_API = libappindicator-api.raw METADATA = libappindicator-api.metadata ASSEMBLY_NAME = appindicator-sharp ASSEMBLY = appindicator-sharp.dll -TARGET = $(ASSEMBLY) $(ASSEMBLY).config +DLLPOLICY = policy.$(ASSEMBLY) +TARGET = $(ASSEMBLY) $(ASSEMBLY).config $(DLLPOLICY) assemblydir = $(libdir)/cli/appindicator-sharp-0.1 assembly_DATA = $(TARGET) CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb generated-stamp generated/*.cs $(API) $(MIDDLE_API) $(RAW_API) $(TEST) @@ -26,6 +27,7 @@ EXTRA_DIST = \ appindicator-sharp.dll.config.in \ app-indicator.sources.xml \ $(ASSEMBLY_NAME).snk \ + policy.2.0.$(ASSMEBLY_NAME).config \ $(customs) \ $(TEST_SOURCES) @@ -83,3 +85,7 @@ $(TEST): $(ASSEMBLY) $(TEST_SOURCES) $(CSC) -out:$(TEST) -target:library $(test_references) $(srcdir)/$(TEST_SOURCES) all: $(TEST) + +$(DLLPOLICY): policy.2.0.$(ASSEMBLY_NAME).config $(ASSEMBLY_NAME).snk + $(AL) -link:policy.2.0.$(ASSEMBLY_NAME).config -out:$(DLLPOLICY) -keyfile:$(ASSEMBLY_NAME).snk + diff --git a/bindings/mono/policy.2.0.appindicator-sharp.config b/bindings/mono/policy.2.0.appindicator-sharp.config new file mode 100644 index 0000000..dd9e6e9 --- /dev/null +++ b/bindings/mono/policy.2.0.appindicator-sharp.config @@ -0,0 +1,10 @@ + + + + + + + + + + -- cgit v1.2.3 From 814bed13f090ffd76c493b708b68e3eb9b4851a3 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 18 Jun 2010 10:35:27 -0500 Subject: Typo --- bindings/mono/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bindings/mono') diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am index cd2d229..85249ff 100644 --- a/bindings/mono/Makefile.am +++ b/bindings/mono/Makefile.am @@ -27,7 +27,7 @@ EXTRA_DIST = \ appindicator-sharp.dll.config.in \ app-indicator.sources.xml \ $(ASSEMBLY_NAME).snk \ - policy.2.0.$(ASSMEBLY_NAME).config \ + policy.2.0.$(ASSEMBLY_NAME).config \ $(customs) \ $(TEST_SOURCES) -- cgit v1.2.3 From 5ea2df7ffe6c3f84353a696caa3e34e9ad97c09f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 18 Jun 2010 10:52:53 -0500 Subject: Fixing directories --- bindings/mono/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bindings/mono') diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am index 85249ff..97b4f26 100644 --- a/bindings/mono/Makefile.am +++ b/bindings/mono/Makefile.am @@ -86,6 +86,6 @@ $(TEST): $(ASSEMBLY) $(TEST_SOURCES) all: $(TEST) -$(DLLPOLICY): policy.2.0.$(ASSEMBLY_NAME).config $(ASSEMBLY_NAME).snk - $(AL) -link:policy.2.0.$(ASSEMBLY_NAME).config -out:$(DLLPOLICY) -keyfile:$(ASSEMBLY_NAME).snk +$(DLLPOLICY): policy.2.0.$(ASSEMBLY_NAME).config $(ASSEMBLY_NAME).snk Makefile + (cd $(srcdir) ; $(AL) -link:policy.2.0.$(ASSEMBLY_NAME).config -out:$(abs_builddir)/$(DLLPOLICY) -keyfile:$(ASSEMBLY_NAME).snk) -- cgit v1.2.3 From c0f64171958d491764b961278e0947b7a19d570c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 18 Jun 2010 10:57:02 -0500 Subject: Readjusting so that the policy file is in the same directory as the DLL --- bindings/mono/Makefile.am | 7 +++++-- bindings/mono/policy.2.0.appindicator-sharp.config | 10 ---------- bindings/mono/policy.2.0.appindicator-sharp.config.in | 10 ++++++++++ 3 files changed, 15 insertions(+), 12 deletions(-) delete mode 100644 bindings/mono/policy.2.0.appindicator-sharp.config create mode 100644 bindings/mono/policy.2.0.appindicator-sharp.config.in (limited to 'bindings/mono') diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am index 97b4f26..41eea3f 100644 --- a/bindings/mono/Makefile.am +++ b/bindings/mono/Makefile.am @@ -27,7 +27,7 @@ EXTRA_DIST = \ appindicator-sharp.dll.config.in \ app-indicator.sources.xml \ $(ASSEMBLY_NAME).snk \ - policy.2.0.$(ASSEMBLY_NAME).config \ + policy.2.0.$(ASSEMBLY_NAME).config.in \ $(customs) \ $(TEST_SOURCES) @@ -86,6 +86,9 @@ $(TEST): $(ASSEMBLY) $(TEST_SOURCES) all: $(TEST) +policy.2.0.$(ASSEMBLY_NAME).config: policy.2.0.$(ASSEMBLY_NAME).config.in Makefile + cp $< $@ + $(DLLPOLICY): policy.2.0.$(ASSEMBLY_NAME).config $(ASSEMBLY_NAME).snk Makefile - (cd $(srcdir) ; $(AL) -link:policy.2.0.$(ASSEMBLY_NAME).config -out:$(abs_builddir)/$(DLLPOLICY) -keyfile:$(ASSEMBLY_NAME).snk) + $(AL) -link:policy.2.0.$(ASSEMBLY_NAME).config -out:$(DLLPOLICY) -keyfile:$(srcdir)/$(ASSEMBLY_NAME).snk diff --git a/bindings/mono/policy.2.0.appindicator-sharp.config b/bindings/mono/policy.2.0.appindicator-sharp.config deleted file mode 100644 index dd9e6e9..0000000 --- a/bindings/mono/policy.2.0.appindicator-sharp.config +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/bindings/mono/policy.2.0.appindicator-sharp.config.in b/bindings/mono/policy.2.0.appindicator-sharp.config.in new file mode 100644 index 0000000..dd9e6e9 --- /dev/null +++ b/bindings/mono/policy.2.0.appindicator-sharp.config.in @@ -0,0 +1,10 @@ + + + + + + + + + + -- cgit v1.2.3 From e434b937dac91258f080bcb3832ee9fe6fe8814e Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 18 Jun 2010 11:01:26 -0500 Subject: Fixing the distcheck by cleaning up --- bindings/mono/Makefile.am | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'bindings/mono') diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am index 41eea3f..607325f 100644 --- a/bindings/mono/Makefile.am +++ b/bindings/mono/Makefile.am @@ -15,7 +15,19 @@ DLLPOLICY = policy.$(ASSEMBLY) TARGET = $(ASSEMBLY) $(ASSEMBLY).config $(DLLPOLICY) assemblydir = $(libdir)/cli/appindicator-sharp-0.1 assembly_DATA = $(TARGET) -CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb generated-stamp generated/*.cs $(API) $(MIDDLE_API) $(RAW_API) $(TEST) + +CLEANFILES = \ + $(ASSEMBLY) \ + $(ASSEMBLY).mdb \ + generated-stamp \ + generated/*.cs \ + $(API) \ + $(MIDDLE_API) \ + $(RAW_API) \ + $(TEST) \ + $(DLLPOLICY) \ + policy.2.0.$(ASSEMBLY_NAME).config + DISTCLEANFILES = $(ASSEMBLY).config TEST_SOURCES = TestIndicator.cs customs = ApplicationIndicator.custom -- cgit v1.2.3 From 35915da208febe200fe3b29acdea9c329e70b163 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 18 Jun 2010 11:55:22 -0500 Subject: Replacing the macros with the proper data --- bindings/mono/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'bindings/mono') diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am index 607325f..b366b6f 100644 --- a/bindings/mono/Makefile.am +++ b/bindings/mono/Makefile.am @@ -99,7 +99,9 @@ $(TEST): $(ASSEMBLY) $(TEST_SOURCES) all: $(TEST) policy.2.0.$(ASSEMBLY_NAME).config: policy.2.0.$(ASSEMBLY_NAME).config.in Makefile - cp $< $@ + sed -e "s|@ASSEMBLY_NAME@|$(ASSEMBLY_NAME)|" \ + -e "s|@ASSEMBLY_VERSION@|0.1|g" \ + $< > $@ $(DLLPOLICY): policy.2.0.$(ASSEMBLY_NAME).config $(ASSEMBLY_NAME).snk Makefile $(AL) -link:policy.2.0.$(ASSEMBLY_NAME).config -out:$(DLLPOLICY) -keyfile:$(srcdir)/$(ASSEMBLY_NAME).snk -- cgit v1.2.3 From f8f18e9f7a1c1ca281fab5c87c2379f8ab59b721 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 18 Jun 2010 12:16:47 -0500 Subject: Fixing policy name --- bindings/mono/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bindings/mono') diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am index b366b6f..b052d86 100644 --- a/bindings/mono/Makefile.am +++ b/bindings/mono/Makefile.am @@ -11,7 +11,7 @@ RAW_API = libappindicator-api.raw METADATA = libappindicator-api.metadata ASSEMBLY_NAME = appindicator-sharp ASSEMBLY = appindicator-sharp.dll -DLLPOLICY = policy.$(ASSEMBLY) +DLLPOLICY = policy.2.0.$(ASSEMBLY) TARGET = $(ASSEMBLY) $(ASSEMBLY).config $(DLLPOLICY) assemblydir = $(libdir)/cli/appindicator-sharp-0.1 assembly_DATA = $(TARGET) -- cgit v1.2.3 From c012b2a943a86ab70b961a69672c61f4ac6ef3e1 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 18 Jun 2010 13:01:53 -0500 Subject: Fixup the gacutil stuff. Still doesn't ununinstall. --- bindings/mono/Makefile.am | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'bindings/mono') diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am index b052d86..3fb724f 100644 --- a/bindings/mono/Makefile.am +++ b/bindings/mono/Makefile.am @@ -43,7 +43,7 @@ EXTRA_DIST = \ $(customs) \ $(TEST_SOURCES) -GACUTIL_FLAGS="-package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib" +GACUTIL_FLAGS=-package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib references = $(GTK_SHARP_LIBS) test_references = $(GTK_SHARP_LIBS) $(NUNIT_LIBS) -r:$(ASSEMBLY) @@ -86,12 +86,16 @@ $(ASSEMBLY): generated-stamp $(srcdir)/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"; \ - $(GACUTIL) -i $(ASSEMBLY_NAME).dll -package $(ASSEMBLY_NAME) -root $(DESTDIR)$(prefix)/lib || exit 1; + echo "$(GACUTIL) -i $(ASSEMBLY_NAME).dll $(GACUTIL_FLAGS)"; \ + $(GACUTIL) -i $(ASSEMBLY_NAME).dll $(GACUTIL_FLAGS) || exit 1; + echo "$(GACUTIL) -i $(DLLPOLICY) $(GACUTIL_FLAGS)"; \ + $(GACUTIL) -i $(DLLPOLICY) $(GACUTIL_FLAGS) || 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; + echo "$(GACUTIL) -u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS)"; \ + $(GACUTIL) -u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; + echo "$(GACUTIL) -u $(DLLPOLICY) $(GACUTIL_FLAGS)"; \ + $(GACUTIL) -u $(DLLPOLICY),version=0.0.0.0,Culture=en,PublicKeyToken=bcae265d1c7ab4c2 $(GACUTIL_FLAGS) || exit 1; $(TEST): $(ASSEMBLY) $(TEST_SOURCES) $(CSC) -out:$(TEST) -target:library $(test_references) $(srcdir)/$(TEST_SOURCES) -- cgit v1.2.3 From 64a712f53a2395d216763bb85d89647e993a3c2d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 18 Jun 2010 14:16:21 -0500 Subject: Swithcing the version to be the assembly version. --- bindings/mono/Makefile.am | 17 +++++++++-------- bindings/mono/policy.0.1.appindicator-sharp.config.in | 10 ++++++++++ bindings/mono/policy.2.0.appindicator-sharp.config.in | 10 ---------- 3 files changed, 19 insertions(+), 18 deletions(-) create mode 100644 bindings/mono/policy.0.1.appindicator-sharp.config.in delete mode 100644 bindings/mono/policy.2.0.appindicator-sharp.config.in (limited to 'bindings/mono') diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am index 3fb724f..cb494dd 100644 --- a/bindings/mono/Makefile.am +++ b/bindings/mono/Makefile.am @@ -10,8 +10,9 @@ MIDDLE_API = libappindicator-api.middle RAW_API = libappindicator-api.raw METADATA = libappindicator-api.metadata ASSEMBLY_NAME = appindicator-sharp +ASSEMBLY_VERSION = 0.1 ASSEMBLY = appindicator-sharp.dll -DLLPOLICY = policy.2.0.$(ASSEMBLY) +DLLPOLICY = policy.$(ASSEMBLY_VERSION).$(ASSEMBLY) TARGET = $(ASSEMBLY) $(ASSEMBLY).config $(DLLPOLICY) assemblydir = $(libdir)/cli/appindicator-sharp-0.1 assembly_DATA = $(TARGET) @@ -26,7 +27,7 @@ CLEANFILES = \ $(RAW_API) \ $(TEST) \ $(DLLPOLICY) \ - policy.2.0.$(ASSEMBLY_NAME).config + policy.$(ASSEMBLY_VERSION).$(ASSEMBLY_NAME).config DISTCLEANFILES = $(ASSEMBLY).config TEST_SOURCES = TestIndicator.cs @@ -39,7 +40,7 @@ EXTRA_DIST = \ appindicator-sharp.dll.config.in \ app-indicator.sources.xml \ $(ASSEMBLY_NAME).snk \ - policy.2.0.$(ASSEMBLY_NAME).config.in \ + policy.$(ASSEMBLY_VERSION).$(ASSEMBLY_NAME).config.in \ $(customs) \ $(TEST_SOURCES) @@ -95,18 +96,18 @@ uninstall-local: echo "$(GACUTIL) -u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS)"; \ $(GACUTIL) -u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; echo "$(GACUTIL) -u $(DLLPOLICY) $(GACUTIL_FLAGS)"; \ - $(GACUTIL) -u $(DLLPOLICY),version=0.0.0.0,Culture=en,PublicKeyToken=bcae265d1c7ab4c2 $(GACUTIL_FLAGS) || exit 1; + $(GACUTIL) -u $(ASSEMBLY_NAME),version=0.0.0.0,Culture=en,PublicKeyToken=bcae265d1c7ab4c2 $(GACUTIL_FLAGS) || exit 1; $(TEST): $(ASSEMBLY) $(TEST_SOURCES) $(CSC) -out:$(TEST) -target:library $(test_references) $(srcdir)/$(TEST_SOURCES) all: $(TEST) -policy.2.0.$(ASSEMBLY_NAME).config: policy.2.0.$(ASSEMBLY_NAME).config.in Makefile +policy.$(ASSEMBLY_VERSION).$(ASSEMBLY_NAME).config: policy.$(ASSEMBLY_VERSION).$(ASSEMBLY_NAME).config.in Makefile sed -e "s|@ASSEMBLY_NAME@|$(ASSEMBLY_NAME)|" \ - -e "s|@ASSEMBLY_VERSION@|0.1|g" \ + -e "s|@ASSEMBLY_VERSION@|$(ASSEMBLY_VERSION)|g" \ $< > $@ -$(DLLPOLICY): policy.2.0.$(ASSEMBLY_NAME).config $(ASSEMBLY_NAME).snk Makefile - $(AL) -link:policy.2.0.$(ASSEMBLY_NAME).config -out:$(DLLPOLICY) -keyfile:$(srcdir)/$(ASSEMBLY_NAME).snk +$(DLLPOLICY): policy.$(ASSEMBLY_VERSION).$(ASSEMBLY_NAME).config $(ASSEMBLY_NAME).snk Makefile + $(AL) -link:policy.$(ASSEMBLY_VERSION).$(ASSEMBLY_NAME).config -out:$(DLLPOLICY) -keyfile:$(srcdir)/$(ASSEMBLY_NAME).snk diff --git a/bindings/mono/policy.0.1.appindicator-sharp.config.in b/bindings/mono/policy.0.1.appindicator-sharp.config.in new file mode 100644 index 0000000..dd9e6e9 --- /dev/null +++ b/bindings/mono/policy.0.1.appindicator-sharp.config.in @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/bindings/mono/policy.2.0.appindicator-sharp.config.in b/bindings/mono/policy.2.0.appindicator-sharp.config.in deleted file mode 100644 index dd9e6e9..0000000 --- a/bindings/mono/policy.2.0.appindicator-sharp.config.in +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - -- cgit v1.2.3 From c5c267021dc458fd67059250e26e07523179cdff Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 18 Jun 2010 14:19:59 -0500 Subject: Switching to the policy name. --- bindings/mono/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bindings/mono') diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am index cb494dd..a7fb526 100644 --- a/bindings/mono/Makefile.am +++ b/bindings/mono/Makefile.am @@ -96,7 +96,7 @@ uninstall-local: echo "$(GACUTIL) -u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS)"; \ $(GACUTIL) -u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; echo "$(GACUTIL) -u $(DLLPOLICY) $(GACUTIL_FLAGS)"; \ - $(GACUTIL) -u $(ASSEMBLY_NAME),version=0.0.0.0,Culture=en,PublicKeyToken=bcae265d1c7ab4c2 $(GACUTIL_FLAGS) || exit 1; + $(GACUTIL) -u policy.$(ASSEMBLY_VERSION).$(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; $(TEST): $(ASSEMBLY) $(TEST_SOURCES) $(CSC) -out:$(TEST) -target:library $(test_references) $(srcdir)/$(TEST_SOURCES) -- cgit v1.2.3 From f23786efebe604d7fee644db58a62f348974e593 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 18 Jun 2010 14:40:12 -0500 Subject: Adding the policy config to the installed files. --- bindings/mono/Makefile.am | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'bindings/mono') diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am index a7fb526..3bd29d4 100644 --- a/bindings/mono/Makefile.am +++ b/bindings/mono/Makefile.am @@ -13,7 +13,13 @@ ASSEMBLY_NAME = appindicator-sharp ASSEMBLY_VERSION = 0.1 ASSEMBLY = appindicator-sharp.dll DLLPOLICY = policy.$(ASSEMBLY_VERSION).$(ASSEMBLY) -TARGET = $(ASSEMBLY) $(ASSEMBLY).config $(DLLPOLICY) + +TARGET = \ + $(ASSEMBLY) \ + $(ASSEMBLY).config \ + $(DLLPOLICY) \ + policy.$(ASSEMBLY_VERSION).$(ASSEMBLY_NAME).config + assemblydir = $(libdir)/cli/appindicator-sharp-0.1 assembly_DATA = $(TARGET) -- cgit v1.2.3 From 787b92013713b9294750e6a8d7e36b63bcfddba9 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 18 Jun 2010 14:45:16 -0500 Subject: Cleaning up file name definitions --- bindings/mono/Makefile.am | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'bindings/mono') diff --git a/bindings/mono/Makefile.am b/bindings/mono/Makefile.am index 3bd29d4..2cd4486 100644 --- a/bindings/mono/Makefile.am +++ b/bindings/mono/Makefile.am @@ -11,14 +11,15 @@ RAW_API = libappindicator-api.raw METADATA = libappindicator-api.metadata ASSEMBLY_NAME = appindicator-sharp ASSEMBLY_VERSION = 0.1 -ASSEMBLY = appindicator-sharp.dll -DLLPOLICY = policy.$(ASSEMBLY_VERSION).$(ASSEMBLY) +ASSEMBLY = $(ASSEMBLY_NAME).dll +POLICY = policy.$(ASSEMBLY_VERSION).$(ASSEMBLY_NAME) +DLLPOLICY = $(POLICY).dll TARGET = \ $(ASSEMBLY) \ $(ASSEMBLY).config \ $(DLLPOLICY) \ - policy.$(ASSEMBLY_VERSION).$(ASSEMBLY_NAME).config + $(POLICY).config assemblydir = $(libdir)/cli/appindicator-sharp-0.1 assembly_DATA = $(TARGET) @@ -33,7 +34,7 @@ CLEANFILES = \ $(RAW_API) \ $(TEST) \ $(DLLPOLICY) \ - policy.$(ASSEMBLY_VERSION).$(ASSEMBLY_NAME).config + $(POLICY).config DISTCLEANFILES = $(ASSEMBLY).config TEST_SOURCES = TestIndicator.cs @@ -46,7 +47,7 @@ EXTRA_DIST = \ appindicator-sharp.dll.config.in \ app-indicator.sources.xml \ $(ASSEMBLY_NAME).snk \ - policy.$(ASSEMBLY_VERSION).$(ASSEMBLY_NAME).config.in \ + $(POLICY).config.in \ $(customs) \ $(TEST_SOURCES) @@ -102,18 +103,18 @@ uninstall-local: echo "$(GACUTIL) -u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS)"; \ $(GACUTIL) -u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; echo "$(GACUTIL) -u $(DLLPOLICY) $(GACUTIL_FLAGS)"; \ - $(GACUTIL) -u policy.$(ASSEMBLY_VERSION).$(ASSEMBLY_NAME) $(GACUTIL_FLAGS) || exit 1; + $(GACUTIL) -u $(POLICY) $(GACUTIL_FLAGS) || exit 1; $(TEST): $(ASSEMBLY) $(TEST_SOURCES) $(CSC) -out:$(TEST) -target:library $(test_references) $(srcdir)/$(TEST_SOURCES) all: $(TEST) -policy.$(ASSEMBLY_VERSION).$(ASSEMBLY_NAME).config: policy.$(ASSEMBLY_VERSION).$(ASSEMBLY_NAME).config.in Makefile +$(POLICY).config: $(POLICY).config.in Makefile sed -e "s|@ASSEMBLY_NAME@|$(ASSEMBLY_NAME)|" \ -e "s|@ASSEMBLY_VERSION@|$(ASSEMBLY_VERSION)|g" \ $< > $@ -$(DLLPOLICY): policy.$(ASSEMBLY_VERSION).$(ASSEMBLY_NAME).config $(ASSEMBLY_NAME).snk Makefile - $(AL) -link:policy.$(ASSEMBLY_VERSION).$(ASSEMBLY_NAME).config -out:$(DLLPOLICY) -keyfile:$(srcdir)/$(ASSEMBLY_NAME).snk +$(DLLPOLICY): $(POLICY).config $(ASSEMBLY_NAME).snk Makefile + $(AL) -link:$(POLICY).config -out:$(DLLPOLICY) -keyfile:$(srcdir)/$(ASSEMBLY_NAME).snk -- cgit v1.2.3