From 5194c79c070c407912c7648d628bd44fbdd228c1 Mon Sep 17 00:00:00 2001 From: Mike Kestner Date: Tue, 13 Dec 2005 15:34:49 +0000 Subject: [PATCH] 2005-12-13 Mike Kestner * gconf/GConf/Makefile.am : add GAPI_CDECL_INSERT step. * gconf/GConf.PropertyEditors/Makefile.am : add GAPI_CDECL_INSERT step. svn path=/trunk/gtk-sharp/; revision=54299 --- ChangeLog | 5 +++++ gconf/GConf.PropertyEditors/Makefile.am | 7 +++++++ gconf/GConf/Makefile.am | 7 +++++++ 3 files changed, 19 insertions(+) diff --git a/ChangeLog b/ChangeLog index e496e17f1..d06a2b3e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-12-13 Mike Kestner + + * gconf/GConf/Makefile.am : add GAPI_CDECL_INSERT step. + * gconf/GConf.PropertyEditors/Makefile.am : add GAPI_CDECL_INSERT step. + 2005-12-13 Mike Kestner * configure.in.in : check for mono-cairo.pc. diff --git a/gconf/GConf.PropertyEditors/Makefile.am b/gconf/GConf.PropertyEditors/Makefile.am index 439ec13ee..a3498691b 100644 --- a/gconf/GConf.PropertyEditors/Makefile.am +++ b/gconf/GConf.PropertyEditors/Makefile.am @@ -36,9 +36,16 @@ build_sources = $(addprefix $(srcdir)/, $(sources)) ../../AssemblyInfo.cs gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk cp $(top_srcdir)/gtk-sharp.snk . +if PLATFORM_WIN32 +GAPI_CDECL_INSERT=$(top_srcdir)/gapi-cdecl-insert --keyfile=gtk-sharp.snk $(ASSEMBLY) +else +GAPI_CDECL_INSERT= +endif + $(ASSEMBLY): $(build_sources) gtk-sharp.snk @rm -f $(ASSEMBLY).mdb $(CSC) $(CSFLAGS) /out:$(ASSEMBLY) /target:library $(references) $(build_sources) + $(GAPI_CDECL_INSERT) $(POLICY_ASSEMBLIES): $(top_builddir)/policy.config gtk-sharp.snk @for i in $(POLICY_VERSIONS); do \ diff --git a/gconf/GConf/Makefile.am b/gconf/GConf/Makefile.am index b33a243aa..f4f77f750 100644 --- a/gconf/GConf/Makefile.am +++ b/gconf/GConf/Makefile.am @@ -37,12 +37,19 @@ sources = \ build_sources = $(addprefix $(srcdir)/, $(sources)) ../../AssemblyInfo.cs +if PLATFORM_WIN32 +GAPI_CDECL_INSERT=$(top_srcdir)/gapi-cdecl-insert --keyfile=gtk-sharp.snk $(ASSEMBLY) +else +GAPI_CDECL_INSERT= +endif + gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk cp $(top_srcdir)/gtk-sharp.snk . $(ASSEMBLY): $(build_sources) gtk-sharp.snk @rm -f $(ASSEMBLY).mdb $(CSC) $(CSFLAGS) /out:$(ASSEMBLY) /target:library $(references) $(build_sources) + $(GAPI_CDECL_INSERT) $(POLICY_ASSEMBLIES): $(top_builddir)/policy.config gtk-sharp.snk @for i in $(POLICY_VERSIONS); do \