Author: wade
Date: 2007-12-07 13:17:47 -0500 (Fri, 07 Dec 2007)
New Revision: 90954
Modified:
branches/gtk-sharp-2-468-branch/gtk-sharp/ChangeLog
branches/gtk-sharp-2-468-branch/gtk-sharp/gconf/GConf/Makefile.am
Log:
2007-12-07 Wade Berrier <[EMAIL PROTECTED]>
* gconf/GConf/Makefile.am: Copy AssemblyInfo.cs to the current
dir so
that csc can find it. (csc doesn't understand ../..)
Modified: branches/gtk-sharp-2-468-branch/gtk-sharp/ChangeLog
===================================================================
--- branches/gtk-sharp-2-468-branch/gtk-sharp/ChangeLog 2007-12-07 18:05:58 UTC
(rev 90953)
+++ branches/gtk-sharp-2-468-branch/gtk-sharp/ChangeLog 2007-12-07 18:17:47 UTC
(rev 90954)
@@ -1,3 +1,8 @@
+2007-12-07 Wade Berrier <[EMAIL PROTECTED]>
+
+ * gconf/GConf/Makefile.am: Copy AssemblyInfo.cs to the current dir so
+ that csc can find it. (csc doesn't understand ../..)
+
2007-12-04 Mike Kestner <[EMAIL PROTECTED]>
* gconf/GConf/Makefile.am: remove GNOME condition. It's
Modified: branches/gtk-sharp-2-468-branch/gtk-sharp/gconf/GConf/Makefile.am
===================================================================
--- branches/gtk-sharp-2-468-branch/gtk-sharp/gconf/GConf/Makefile.am
2007-12-07 18:05:58 UTC (rev 90953)
+++ branches/gtk-sharp-2-468-branch/gtk-sharp/gconf/GConf/Makefile.am
2007-12-07 18:17:47 UTC (rev 90954)
@@ -31,7 +31,7 @@
NotifyWrapper.cs \
Value.cs
-build_sources = $(addprefix $(srcdir)/, $(sources)) ../../AssemblyInfo.cs
+build_sources = $(addprefix $(srcdir)/, $(sources))
if PLATFORM_WIN32
GAPI_CDECL_INSERT=$(top_srcdir)/gapi-cdecl-insert --keyfile=gtk-sharp.snk
$(ASSEMBLY)
@@ -42,9 +42,12 @@
gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk
cp $(top_srcdir)/gtk-sharp.snk .
-$(ASSEMBLY): $(build_sources) gtk-sharp.snk
+AssemblyInfo.cs: $(top_builddir)/AssemblyInfo.cs
+ cp $(top_builddir)/AssemblyInfo.cs .
+
+$(ASSEMBLY): $(build_sources) gtk-sharp.snk AssemblyInfo.cs
@rm -f $(ASSEMBLY).mdb
- $(CSC) $(CSFLAGS) /out:$(ASSEMBLY) /target:library $(references)
$(build_sources)
+ $(CSC) $(CSFLAGS) /out:$(ASSEMBLY) /target:library $(references)
$(build_sources) AssemblyInfo.cs
$(GAPI_CDECL_INSERT)
$(POLICY_ASSEMBLIES): $(top_builddir)/policy.config gtk-sharp.snk
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
