Author: mkestner
Date: 2005-12-13 10:34:49 -0500 (Tue, 13 Dec 2005)
New Revision: 54299
Modified:
trunk/gtk-sharp/ChangeLog
trunk/gtk-sharp/gconf/GConf.PropertyEditors/Makefile.am
trunk/gtk-sharp/gconf/GConf/Makefile.am
Log:
2005-12-13 Mike Kestner <[EMAIL PROTECTED]>
* gconf/GConf/Makefile.am : add GAPI_CDECL_INSERT step.
* gconf/GConf.PropertyEditors/Makefile.am : add GAPI_CDECL_INSERT step.
Modified: trunk/gtk-sharp/ChangeLog
===================================================================
--- trunk/gtk-sharp/ChangeLog 2005-12-13 15:33:28 UTC (rev 54298)
+++ trunk/gtk-sharp/ChangeLog 2005-12-13 15:34:49 UTC (rev 54299)
@@ -1,5 +1,10 @@
2005-12-13 Mike Kestner <[EMAIL PROTECTED]>
+ * gconf/GConf/Makefile.am : add GAPI_CDECL_INSERT step.
+ * gconf/GConf.PropertyEditors/Makefile.am : add GAPI_CDECL_INSERT step.
+
+2005-12-13 Mike Kestner <[EMAIL PROTECTED]>
+
* configure.in.in : check for mono-cairo.pc.
* Makefile.include : use AC_SUBST for cairo ref.
* gdk/Gdk.metadata : s/Cairo.Graphics/Cairo.Context.
Modified: trunk/gtk-sharp/gconf/GConf/Makefile.am
===================================================================
--- trunk/gtk-sharp/gconf/GConf/Makefile.am 2005-12-13 15:33:28 UTC (rev
54298)
+++ trunk/gtk-sharp/gconf/GConf/Makefile.am 2005-12-13 15:34:49 UTC (rev
54299)
@@ -37,12 +37,19 @@
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 \
Modified: trunk/gtk-sharp/gconf/GConf.PropertyEditors/Makefile.am
===================================================================
--- trunk/gtk-sharp/gconf/GConf.PropertyEditors/Makefile.am 2005-12-13
15:33:28 UTC (rev 54298)
+++ trunk/gtk-sharp/gconf/GConf.PropertyEditors/Makefile.am 2005-12-13
15:34:49 UTC (rev 54299)
@@ -36,9 +36,16 @@
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 \
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches