2008-10-09 Mike Kestner <mkestner@novell.com>

* cairo/*.cs: flatten source hierarchy to simplify win32 build.
	* sample/Makefile.am: fix a ref issue with local cairo.

svn path=/trunk/gtk-sharp/; revision=115401

ChangeLog

@@ -1,3 +1,8 @@
+2008-10-09  Mike Kestner  <mkestner@novell.com>
+
+	* cairo/*.cs: flatten source hierarchy to simplify win32 build.
+	* sample/Makefile.am: fix a ref issue with local cairo.
+
 2008-10-09  Mike Kestner  <mkestner@novell.com>
 
 	* configure.in.in: magic for local Mono.Cairo build.

cairo/Cairo.cs

@@ -36,7 +36,10 @@ using System.Runtime.InteropServices;
 
 namespace Cairo
 {
-	public static class CairoAPI {
+	public class CairoAPI {
+
+		private CairoAPI () {}
+
 		static public int Version {
 			get {
 				return Cairo.NativeMethods.cairo_version ();

cairo/Makefile.am

@@ -12,53 +12,53 @@ noinst_DATA = $(TARGET)
 CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb gtk-sharp.snk AssemblyInfo.cs
 
 sources = \
-	Mono.Cairo/Antialias.cs \
+	Antialias.cs \
-	Mono.Cairo/Cairo.cs \
+	Cairo.cs \
-	Mono.Cairo/Content.cs \
+	Content.cs \
-	Mono.Cairo/Context.cs \
+	Context.cs \
-	Mono.Cairo/DirectFBSurface.cs \
+	DirectFBSurface.cs \
-	Mono.Cairo/Extend.cs \
+	Extend.cs \
-	Mono.Cairo/FillRule.cs \
+	FillRule.cs \
-	Mono.Cairo/Filter.cs \
+	Filter.cs \
-	Mono.Cairo/FontExtents.cs \
+	FontExtents.cs \
-	Mono.Cairo/FontFace.cs \
+	FontFace.cs \
-	Mono.Cairo/FontOptions.cs \
+	FontOptions.cs \
-	Mono.Cairo/FontSlant.cs \
+	FontSlant.cs \
-	Mono.Cairo/FontType.cs \
+	FontType.cs \
-	Mono.Cairo/FontWeight.cs \
+	FontWeight.cs \
-	Mono.Cairo/Format.cs \
+	Format.cs \
-	Mono.Cairo/GlitzSurface.cs \
+	GlitzSurface.cs \
-	Mono.Cairo/Glyph.cs \
+	Glyph.cs \
-	Mono.Cairo/Gradient.cs \
+	Gradient.cs \
-	Mono.Cairo/HintMetrics.cs \
+	HintMetrics.cs \
-	Mono.Cairo/HintStyle.cs \
+	HintStyle.cs \
-	Mono.Cairo/ImageSurface.cs \
+	ImageSurface.cs \
-	Mono.Cairo/LinearGradient.cs \
+	LinearGradient.cs \
-	Mono.Cairo/LineCap.cs \
+	LineCap.cs \
-	Mono.Cairo/LineJoin.cs \
+	LineJoin.cs \
-	Mono.Cairo/Matrix.cs \
+	Matrix.cs \
-	Mono.Cairo/NativeMethods.cs \
+	NativeMethods.cs \
-	Mono.Cairo/Operator.cs \
+	Operator.cs \
-	Mono.Cairo/Path.cs \
+	Path.cs \
-	Mono.Cairo/Pattern.cs \
+	Pattern.cs \
-	Mono.Cairo/PatternType.cs \
+	PatternType.cs \
-	Mono.Cairo/PdfSurface.cs \
+	PdfSurface.cs \
-	Mono.Cairo/PSSurface.cs \
+	PSSurface.cs \
-	Mono.Cairo/RadialGradient.cs \
+	RadialGradient.cs \
-	Mono.Cairo/Rectangle.cs \
+	Rectangle.cs \
-	Mono.Cairo/ScaledFont.cs \
+	ScaledFont.cs \
-	Mono.Cairo/SolidPattern.cs \
+	SolidPattern.cs \
-	Mono.Cairo/Status.cs \
+	Status.cs \
-	Mono.Cairo/SubpixelOrder.cs \
+	SubpixelOrder.cs \
-	Mono.Cairo/Surface.cs \
+	Surface.cs \
-	Mono.Cairo/SurfacePattern.cs \
+	SurfacePattern.cs \
-	Mono.Cairo/SurfaceType.cs \
+	SurfaceType.cs \
-	Mono.Cairo/SvgSurface.cs \
+	SvgSurface.cs \
-	Mono.Cairo/SvgVersion.cs \
+	SvgVersion.cs \
-	Mono.Cairo/TextExtents.cs \
+	TextExtents.cs \
-	Mono.Cairo/Win32Surface.cs \
+	Win32Surface.cs \
-	Mono.Cairo/XcbSurface.cs \
+	XcbSurface.cs \
-	Mono.Cairo/XlibSurface.cs \
+	XlibSurface.cs \
 	#
 
 build_sources = $(addprefix $(srcdir)/, $(sources)) AssemblyInfo.cs

cairo/NativeMethods.cs

@@ -39,8 +39,11 @@ namespace Cairo
 	// sort these so it is easier to find what is missing
 	// http://www.cairographics.org/manual/ix01.html
 
-	public static class NativeMethods
+	public class NativeMethods
 	{
+
+		private NativeMethods () {}
+
 		const string cairo = "libcairo-2.dll";
 		
 		//[DllImport (cairo)]

sample/Makefile.am

@@ -1,5 +1,11 @@
 SUBDIRS = test GtkDemo pixmaps valtest opaquetest
 
+if ENABLE_MONO_CAIRO
+cairo_ref=-r:$(top_builddir)/cairo/Mono.Cairo.dll
+else
+cairo_ref=$(MONO_CAIRO_LIBS)
+endif
+
 if ENABLE_GLADE
 GLADE_TARGETS=glade-viewer.exe glade-test.exe
 GLADE_ASSEMBLY=../glade/glade-sharp.dll
@@ -69,7 +75,7 @@ glade-test.exe: $(srcdir)/GladeTest.cs $(srcdir)/test.glade $(assemblies)
 	$(CSC)  /resource:$(srcdir)/test.glade,test.glade /out:glade-test.exe $(references) $(srcdir)/GladeTest.cs
 
 cairo-sample.exe: $(srcdir)/CairoSample.cs $(assemblies)
-	$(CSC) /out:cairo-sample.exe $(references) /r:Mono.Cairo $(srcdir)/CairoSample.cs
+	$(CSC) /out:cairo-sample.exe $(references) $(cairo_ref) $(srcdir)/CairoSample.cs
 
 testdnd.exe: $(srcdir)/TestDnd.cs $(assemblies)
 	$(CSC) /debug /unsafe /out:testdnd.exe $(references) $(srcdir)/TestDnd.cs