Author: mkestner
Date: 2007-12-07 09:27:29 -0500 (Fri, 07 Dec 2007)
New Revision: 90932
Modified:
trunk/gnome-sharp/ChangeLog
trunk/gnome-sharp/gconf/GConf.PropertyEditors/Makefile.am
trunk/gnome-sharp/gconf/GConf/Makefile.am
Log:
2007-12-07 Mike Kestner <[EMAIL PROTECTED]>
* gconf/GConf/Makefile.am:
* gconf/GConf.PropertyEditors/Makefile.am:
use top_builddir instead of .. to avoid win32 build issues.
Modified: trunk/gnome-sharp/ChangeLog
===================================================================
--- trunk/gnome-sharp/ChangeLog 2007-12-07 14:06:34 UTC (rev 90931)
+++ trunk/gnome-sharp/ChangeLog 2007-12-07 14:27:29 UTC (rev 90932)
@@ -1,3 +1,9 @@
+2007-12-07 Mike Kestner <[EMAIL PROTECTED]>
+
+ * gconf/GConf/Makefile.am:
+ * gconf/GConf.PropertyEditors/Makefile.am:
+ use top_builddir instead of .. to avoid win32 build issues.
+
2007-12-04 Mike Kestner <[EMAIL PROTECTED]>
* gconf/GConf/Makefile.am: remove GNOME condition. It's only needed
Modified: trunk/gnome-sharp/gconf/GConf/Makefile.am
===================================================================
--- trunk/gnome-sharp/gconf/GConf/Makefile.am 2007-12-07 14:06:34 UTC (rev
90931)
+++ trunk/gnome-sharp/gconf/GConf/Makefile.am 2007-12-07 14:27:29 UTC (rev
90932)
@@ -30,7 +30,7 @@
NotifyWrapper.cs \
Value.cs
-build_sources = $(addprefix $(srcdir)/, $(sources)) ../../AssemblyInfo.cs
+build_sources = $(addprefix $(srcdir)/, $(sources))
$(top_builddir)/AssemblyInfo.cs
if PLATFORM_WIN32
GAPI_CDECL_INSERT=$(top_srcdir)/gapi-cdecl-insert --keyfile=gtk-sharp.snk
$(ASSEMBLY)
Modified: trunk/gnome-sharp/gconf/GConf.PropertyEditors/Makefile.am
===================================================================
--- trunk/gnome-sharp/gconf/GConf.PropertyEditors/Makefile.am 2007-12-07
14:06:34 UTC (rev 90931)
+++ trunk/gnome-sharp/gconf/GConf.PropertyEditors/Makefile.am 2007-12-07
14:27:29 UTC (rev 90932)
@@ -19,7 +19,7 @@
references = \
$(GTKSHARP_LIBS) \
$(GLADESHARP_LIBS) \
- /r:../../art/art-sharp.dll /r:../../gnome/gnome-sharp.dll
/r:../GConf/gconf-sharp.dll
+ /r:$(top_builddir)/art/art-sharp.dll
/r:$(top_builddir)/gnome/gnome-sharp.dll
/r:$(top_builddir)/gconf/GConf/gconf-sharp.dll
sources = \
PropertyEditor.cs \
@@ -33,7 +33,7 @@
PropertyEditorToggleButton.cs \
EditorShell.cs
-build_sources = $(addprefix $(srcdir)/, $(sources)) ../../AssemblyInfo.cs
+build_sources = $(addprefix $(srcdir)/, $(sources))
$(top_builddir)/AssemblyInfo.cs
gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk
cp $(top_srcdir)/gtk-sharp.snk .
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
