From 005731b75cf75d47e9a75566fbe014c36bbc3e23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20G=2E=20Aragoneses?= Date: Wed, 15 Apr 2009 22:33:26 +0000 Subject: [PATCH] =?UTF-8?q?2009-04-15=20=20Andr=C3=A9s=20G.=20Aragoneses?= =?UTF-8?q?=20=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * atk/Makefile.am * glib/Makefile.am: take advantage of the same InternalsVisibleTo because the moon assemblies will be monomerged. svn path=/trunk/gtk-sharp/; revision=131835 --- ChangeLog | 6 ++++++ atk/Makefile.am | 4 +++- glib/Makefile.am | 4 +++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 014210e89..5d6067c79 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-04-15 Andrés G. Aragoneses + + * atk/Makefile.am + * glib/Makefile.am: take advantage of the same InternalsVisibleTo + because the moon assemblies will be monomerged. + 2009-04-15 Andrés G. Aragoneses * atk/Makefile.am diff --git a/atk/Makefile.am b/atk/Makefile.am index 6adfcc057..3567b507b 100644 --- a/atk/Makefile.am +++ b/atk/Makefile.am @@ -23,6 +23,7 @@ add_dist = MOON_DIR=$(top_builddir)/moonbin/ MOON_ASSEMBLY=$(MOON_DIR)$(ASSEMBLY) +MOON_PRE_ASSEMBLY=$(MOON_DIR)MoonAtkBridge.dll references_moon = $(MOON_DIR)glib-sharp.dll build_references_moon = $(addprefix /r:, $(references_moon)) @@ -30,7 +31,8 @@ build_references_moon = $(addprefix /r:, $(references_moon)) moonlight: $(MOON_ASSEMBLY) $(MOON_ASSEMBLY): $(references_moon) $(ASSEMBLY) - smcs -define:NET_2_1 $(build_references_moon) $(BUILD_PARAMS) -out:$@ + smcs -define:NET_2_1 $(build_references_moon) $(BUILD_PARAMS) -out:$(MOON_PRE_ASSEMBLY) + mv $(MOON_PRE_ASSEMBLY) $@ $(GAPI_CDECL_INSERT) include ../Makefile.include diff --git a/glib/Makefile.am b/glib/Makefile.am index 373fd53bb..374789010 100644 --- a/glib/Makefile.am +++ b/glib/Makefile.am @@ -106,12 +106,14 @@ $(ASSEMBLY): $(build_sources) gtk-sharp.snk AssemblyInfo.cs MOON_DIR=$(top_builddir)/moonbin/ MOON_ASSEMBLY=$(MOON_DIR)$(ASSEMBLY) +MOON_PRE_ASSEMBLY=$(MOON_DIR)MoonAtkBridge.dll moonlight: $(MOON_ASSEMBLY) $(MOON_ASSEMBLY): $(ASSEMBLY) mkdir -p $(MOON_DIR) - smcs -define:NET_2_1 $(BUILD_PARAMS) -out:$@ + smcs -define:NET_2_1 $(BUILD_PARAMS) -out:$(MOON_PRE_ASSEMBLY) + mv $(MOON_PRE_ASSEMBLY) $@ $(GAPI_CDECL_INSERT) policy.%.config: $(top_builddir)/policy.config