2009-04-15 Andrés G. Aragoneses <aaragoneses@novell.com>
* 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
This commit is contained in:
parent
722954e799
commit
005731b75c
3 changed files with 12 additions and 2 deletions
|
@ -1,3 +1,9 @@
|
||||||
|
2009-04-15 Andrés G. Aragoneses <aaragoneses@novell.com>
|
||||||
|
|
||||||
|
* 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 <aaragoneses@novell.com>
|
2009-04-15 Andrés G. Aragoneses <aaragoneses@novell.com>
|
||||||
|
|
||||||
* atk/Makefile.am
|
* atk/Makefile.am
|
||||||
|
|
|
@ -23,6 +23,7 @@ add_dist =
|
||||||
|
|
||||||
MOON_DIR=$(top_builddir)/moonbin/
|
MOON_DIR=$(top_builddir)/moonbin/
|
||||||
MOON_ASSEMBLY=$(MOON_DIR)$(ASSEMBLY)
|
MOON_ASSEMBLY=$(MOON_DIR)$(ASSEMBLY)
|
||||||
|
MOON_PRE_ASSEMBLY=$(MOON_DIR)MoonAtkBridge.dll
|
||||||
|
|
||||||
references_moon = $(MOON_DIR)glib-sharp.dll
|
references_moon = $(MOON_DIR)glib-sharp.dll
|
||||||
build_references_moon = $(addprefix /r:, $(references_moon))
|
build_references_moon = $(addprefix /r:, $(references_moon))
|
||||||
|
@ -30,7 +31,8 @@ build_references_moon = $(addprefix /r:, $(references_moon))
|
||||||
moonlight: $(MOON_ASSEMBLY)
|
moonlight: $(MOON_ASSEMBLY)
|
||||||
|
|
||||||
$(MOON_ASSEMBLY): $(references_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)
|
$(GAPI_CDECL_INSERT)
|
||||||
|
|
||||||
include ../Makefile.include
|
include ../Makefile.include
|
||||||
|
|
|
@ -106,12 +106,14 @@ $(ASSEMBLY): $(build_sources) gtk-sharp.snk AssemblyInfo.cs
|
||||||
|
|
||||||
MOON_DIR=$(top_builddir)/moonbin/
|
MOON_DIR=$(top_builddir)/moonbin/
|
||||||
MOON_ASSEMBLY=$(MOON_DIR)$(ASSEMBLY)
|
MOON_ASSEMBLY=$(MOON_DIR)$(ASSEMBLY)
|
||||||
|
MOON_PRE_ASSEMBLY=$(MOON_DIR)MoonAtkBridge.dll
|
||||||
|
|
||||||
moonlight: $(MOON_ASSEMBLY)
|
moonlight: $(MOON_ASSEMBLY)
|
||||||
|
|
||||||
$(MOON_ASSEMBLY): $(ASSEMBLY)
|
$(MOON_ASSEMBLY): $(ASSEMBLY)
|
||||||
mkdir -p $(MOON_DIR)
|
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)
|
$(GAPI_CDECL_INSERT)
|
||||||
|
|
||||||
policy.%.config: $(top_builddir)/policy.config
|
policy.%.config: $(top_builddir)/policy.config
|
||||||
|
|
Loading…
Reference in a new issue