* atk/Makefile.am:

* glib/Makefile.am:
* Makefile.include: (Revert revision 131780) Track r131942.

svn path=/trunk/gtk-sharp/; revision=131943
This commit is contained in:
Andrés G. Aragoneses 2009-04-16 22:00:07 +00:00
parent 8fda284c32
commit a63841988e
3 changed files with 2 additions and 34 deletions

View File

@ -61,11 +61,9 @@ else
GAPI_CDECL_INSERT=
endif
BUILD_PARAMS=$(CSFLAGS) -nowarn:0169,0612,0618 -unsafe -target:library $(GENERATED_SOURCES) $(build_sources)
$(ASSEMBLY): generated-stamp $(SNK) $(build_sources) $(references)
@rm -f $(ASSEMBLY).mdb
$(CSC) $(build_references) $(BUILD_PARAMS) -out:$(ASSEMBLY)
$(CSC) $(CSFLAGS) -nowarn:0169,0612,0618 -unsafe -out:$(ASSEMBLY) -target:library $(build_references) $(GENERATED_SOURCES) $(build_sources)
$(GAPI_CDECL_INSERT)
install-data-local:

View File

@ -21,20 +21,4 @@ customs = \
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))
moonlight: $(MOON_ASSEMBLY)
$(MOON_ASSEMBLY): $(references_moon) $(ASSEMBLY)
smcs -define:NET_2_1 $(build_references_moon) $(BUILD_PARAMS) -out:$(MOON_PRE_ASSEMBLY)
mv $(MOON_PRE_ASSEMBLY) $@
$(GAPI_CDECL_INSERT)
include ../Makefile.include

View File

@ -97,23 +97,9 @@ else
GAPI_CDECL_INSERT=
endif
BUILD_PARAMS=$(CSFLAGS) -unsafe -nowarn:0169,0612,0618 -target:library $(references) $(build_sources)
$(ASSEMBLY): $(build_sources) gtk-sharp.snk AssemblyInfo.cs
@rm -f $(ASSEMBLY).mdb
$(CSC) $(BUILD_PARAMS) -out:$(ASSEMBLY)
$(GAPI_CDECL_INSERT)
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:$(MOON_PRE_ASSEMBLY)
mv $(MOON_PRE_ASSEMBLY) $@
$(CSC) $(CSFLAGS) -unsafe -nowarn:0169,0612,0618 -out:$(ASSEMBLY) -target:library $(references) $(build_sources)
$(GAPI_CDECL_INSERT)
policy.%.config: $(top_builddir)/policy.config