diff --git a/Makefile.include b/Makefile.include
index c43dbe12e..2ca7942a3 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -13,7 +13,7 @@ noinst_DATA = $(TARGET)
TARGET_API = $(pkg:=-api.xml)
gapidir = $(datadir)/gapi-3.0
gapi_DATA = $(TARGET_API) $(GAPI_XSD)
-CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb $(POLICY_ASSEMBLIES) generated-stamp generated/*.cs $(API) glue/generated.c $(POLICY_CONFIGS)
+CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb $(POLICY_ASSEMBLIES) generated-stamp generated/*/*.cs $(API) glue/generated.c $(POLICY_CONFIGS)
DISTCLEANFILES = $(ASSEMBLY).config
POLICY_ASSEMBLIES = $(addsuffix .$(ASSEMBLY), $(addprefix policy., $(POLICY_VERSIONS)))
@@ -34,7 +34,7 @@ $(API): $(METADATA) $(RAW_API) $(SYMBOLS) $(top_builddir)/generator/gapi-fixup.e
api_includes = $(addprefix -I:, $(INCLUDE_API))
generated-stamp: $(API) $(INCLUDE_API) $(top_builddir)/generator/gapi_codegen.exe $(GAPI_XSD)
- rm -f generated/* && \
+ rm -rf generated/* && \
$(RUNTIME) $(top_builddir)/generator/gapi_codegen.exe --generate $(API) \
$(api_includes) \
--outdir=generated --assembly-name=$(ASSEMBLY_NAME) \
diff --git a/atk/atk.csproj b/atk/atk.csproj
index cac79a612..4df1f8d91 100644
--- a/atk/atk.csproj
+++ b/atk/atk.csproj
@@ -41,92 +41,92 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -134,4 +134,7 @@
glib
+
+
+
\ No newline at end of file
diff --git a/configure.ac b/configure.ac
index 5f6963ebe..792a7627f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -110,7 +110,7 @@ fi
if test "x$has_mono" = "xtrue"; then
GACUTIL_FLAGS='/package $(PACKAGE_VERSION) /gacdir $(DESTDIR)$(prefix)/lib'
-GENERATED_SOURCES=generated/*.cs
+GENERATED_SOURCES=generated/*/*.cs
ASSEMBLYINFO=/AssemblyInfo.cs
AC_PATH_PROG(RUNTIME, mono, no)
@@ -143,7 +143,7 @@ dnl Check for .NET Framework
AC_PATH_PROG(CSC, csc.exe, no)
CSFLAGS="-nologo -platform:x86"
GACUTIL_FLAGS=
-GENERATED_SOURCES=generated\\\\*.cs
+GENERATED_SOURCES="-recurse:generated\\\\*.cs"
ASSEMBLYINFO=\\\\AssemblyInfo.cs
AM_CONDITIONAL(ENABLE_THREADCHECK, false)
enable_dotnet=yes
diff --git a/gdk/gdk.csproj b/gdk/gdk.csproj
index b6692a91d..975fa9962 100644
--- a/gdk/gdk.csproj
+++ b/gdk/gdk.csproj
@@ -75,154 +75,154 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -242,4 +242,9 @@
pango
+
+
+
+
+
\ No newline at end of file
diff --git a/generator/BoxedGen.cs b/generator/BoxedGen.cs
index ef79b1c5b..05af43132 100644
--- a/generator/BoxedGen.cs
+++ b/generator/BoxedGen.cs
@@ -38,7 +38,7 @@ namespace GtkSharp.Generation {
gen_info.CurrentType = QualifiedName;
- StreamWriter sw = gen_info.Writer = gen_info.OpenStream (Name);
+ StreamWriter sw = gen_info.Writer = gen_info.OpenStream (Name, NS);
base.Generate (gen_info);
sw.WriteLine ("\t\tpublic static explicit operator GLib.Value (" + QualifiedName + " boxed)");
sw.WriteLine ("\t\t{");
diff --git a/generator/CallbackGen.cs b/generator/CallbackGen.cs
index 319fe5be1..f8c562bc5 100644
--- a/generator/CallbackGen.cs
+++ b/generator/CallbackGen.cs
@@ -199,7 +199,7 @@ namespace GtkSharp.Generation {
body = new MethodBody (parms);
StreamWriter save_sw = gen_info.Writer;
- StreamWriter sw = gen_info.Writer = gen_info.OpenStream (qualname);
+ StreamWriter sw = gen_info.Writer = gen_info.OpenStream (qualname, NS);
sw.WriteLine ("namespace " + NS + "Sharp {");
sw.WriteLine ();
@@ -294,7 +294,7 @@ namespace GtkSharp.Generation {
sig = new Signature (parms);
- StreamWriter sw = gen_info.OpenStream (Name);
+ StreamWriter sw = gen_info.OpenStream (Name, NS);
sw.WriteLine ("namespace " + NS + " {");
sw.WriteLine ();
diff --git a/generator/ClassGen.cs b/generator/ClassGen.cs
index f6ef5b958..886c70a06 100644
--- a/generator/ClassGen.cs
+++ b/generator/ClassGen.cs
@@ -62,7 +62,7 @@ namespace GtkSharp.Generation {
{
gen_info.CurrentType = QualifiedName;
- StreamWriter sw = gen_info.Writer = gen_info.OpenStream(Name);
+ StreamWriter sw = gen_info.Writer = gen_info.OpenStream(Name, NS);
sw.WriteLine ("namespace " + NS + " {");
sw.WriteLine ();
diff --git a/generator/EnumGen.cs b/generator/EnumGen.cs
index 94e97c770..f7e1dc737 100644
--- a/generator/EnumGen.cs
+++ b/generator/EnumGen.cs
@@ -85,7 +85,7 @@ namespace GtkSharp.Generation {
public override void Generate (GenerationInfo gen_info)
{
- StreamWriter sw = gen_info.OpenStream (Name);
+ StreamWriter sw = gen_info.OpenStream (Name, NS);
sw.WriteLine ("namespace " + NS + " {");
sw.WriteLine ();
diff --git a/generator/GenerationInfo.cs b/generator/GenerationInfo.cs
index d01f50873..07ec9477b 100644
--- a/generator/GenerationInfo.cs
+++ b/generator/GenerationInfo.cs
@@ -146,12 +146,12 @@ namespace GtkSharp.Generation {
}
}
- public StreamWriter OpenStream (string name)
+ public StreamWriter OpenStream (string name, string namespce)
{
- char sep = Path.DirectorySeparatorChar;
- if (!Directory.Exists(dir))
- Directory.CreateDirectory(dir);
- string filename = dir + sep + name + ".cs";
+ string gen_dir = Path.Combine (dir, namespce);
+ Directory.CreateDirectory (gen_dir);
+
+ string filename = Path.Combine (gen_dir, name + ".cs");
FileStream stream = new FileStream (filename, FileMode.Create, FileAccess.Write);
StreamWriter sw = new StreamWriter (stream);
diff --git a/generator/InterfaceGen.cs b/generator/InterfaceGen.cs
index 7b66cc837..e29c3c407 100644
--- a/generator/InterfaceGen.cs
+++ b/generator/InterfaceGen.cs
@@ -268,7 +268,7 @@ namespace GtkSharp.Generation {
void GenerateAdapter (GenerationInfo gen_info)
{
- StreamWriter sw = gen_info.Writer = gen_info.OpenStream (AdapterName);
+ StreamWriter sw = gen_info.Writer = gen_info.OpenStream (AdapterName, NS);
sw.WriteLine ("namespace " + NS + " {");
sw.WriteLine ();
@@ -361,7 +361,7 @@ namespace GtkSharp.Generation {
public override void Generate (GenerationInfo gen_info)
{
GenerateAdapter (gen_info);
- StreamWriter sw = gen_info.Writer = gen_info.OpenStream (Name);
+ StreamWriter sw = gen_info.Writer = gen_info.OpenStream (Name, NS);
sw.WriteLine ("namespace " + NS + " {");
sw.WriteLine ();
diff --git a/generator/NativeStructGen.cs b/generator/NativeStructGen.cs
index 6a6aa4900..36c8878cd 100644
--- a/generator/NativeStructGen.cs
+++ b/generator/NativeStructGen.cs
@@ -79,7 +79,7 @@ namespace GtkSharp.Generation
{
bool need_close = false;
if (gen_info.Writer == null) {
- gen_info.Writer = gen_info.OpenStream (Name);
+ gen_info.Writer = gen_info.OpenStream (Name, NS);
need_close = true;
}
diff --git a/generator/ObjectGen.cs b/generator/ObjectGen.cs
index d514353e4..d5812073b 100644
--- a/generator/ObjectGen.cs
+++ b/generator/ObjectGen.cs
@@ -139,7 +139,7 @@ namespace GtkSharp.Generation {
string asm_name = gen_info.AssemblyName.Length == 0 ? NS.ToLower () + "-sharp" : gen_info.AssemblyName;
DirectoryInfo di = GetDirectoryInfo (gen_info.Dir, asm_name);
- StreamWriter sw = gen_info.Writer = gen_info.OpenStream (Name);
+ StreamWriter sw = gen_info.Writer = gen_info.OpenStream (Name, NS);
sw.WriteLine ("namespace " + NS + " {");
sw.WriteLine ();
@@ -398,7 +398,7 @@ namespace GtkSharp.Generation {
private static void GenerateMapper (DirectoryInfo dir_info, GenerationInfo gen_info)
{
- StreamWriter sw = gen_info.OpenStream ("ObjectManager");
+ StreamWriter sw = gen_info.OpenStream ("ObjectManager", "GtkSharp");
sw.WriteLine ("namespace GtkSharp." + Studlify (dir_info.assembly_name) + " {");
sw.WriteLine ();
diff --git a/generator/OpaqueGen.cs b/generator/OpaqueGen.cs
index 7cef60587..45be933ea 100644
--- a/generator/OpaqueGen.cs
+++ b/generator/OpaqueGen.cs
@@ -45,7 +45,7 @@ namespace GtkSharp.Generation {
{
gen_info.CurrentType = QualifiedName;
- StreamWriter sw = gen_info.Writer = gen_info.OpenStream (Name);
+ StreamWriter sw = gen_info.Writer = gen_info.OpenStream (Name, NS);
sw.WriteLine ("namespace " + NS + " {");
sw.WriteLine ();
diff --git a/generator/Signal.cs b/generator/Signal.cs
index dfd18a217..e9c01b193 100644
--- a/generator/Signal.cs
+++ b/generator/Signal.cs
@@ -279,7 +279,7 @@ namespace GtkSharp.Generation {
string ns = container_type.NS;
- StreamWriter sw = gen_info.OpenStream (EventHandlerName);
+ StreamWriter sw = gen_info.OpenStream (EventHandlerName, container_type.NS);
sw.WriteLine ("namespace " + ns + " {");
sw.WriteLine ();
diff --git a/generator/StructBase.cs b/generator/StructBase.cs
index 2953d4709..e5ed8fc69 100644
--- a/generator/StructBase.cs
+++ b/generator/StructBase.cs
@@ -214,7 +214,7 @@ namespace GtkSharp.Generation {
{
bool need_close = false;
if (gen_info.Writer == null) {
- gen_info.Writer = gen_info.OpenStream (Name);
+ gen_info.Writer = gen_info.OpenStream (Name, NS);
need_close = true;
}
diff --git a/generator/StructGen.cs b/generator/StructGen.cs
index 5276b26ed..84c71006b 100644
--- a/generator/StructGen.cs
+++ b/generator/StructGen.cs
@@ -33,7 +33,7 @@ namespace GtkSharp.Generation {
{
gen_info.CurrentType = QualifiedName;
- StreamWriter sw = gen_info.Writer = gen_info.OpenStream (Name);
+ StreamWriter sw = gen_info.Writer = gen_info.OpenStream (Name, NS);
base.Generate (gen_info);
if (GetMethod ("GetType") == null && GetMethod ("GetGType") == null) {
sw.WriteLine ("\t\tprivate static GLib.GType GType {");
diff --git a/gio/gio.csproj b/gio/gio.csproj
index 2dac0df3f..4aae075b9 100644
--- a/gio/gio.csproj
+++ b/gio/gio.csproj
@@ -41,333 +41,333 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -378,4 +378,8 @@
+
+
+
+
\ No newline at end of file
diff --git a/gtk/gtk.csproj b/gtk/gtk.csproj
index fcd201d19..923a6cc3e 100644
--- a/gtk/gtk.csproj
+++ b/gtk/gtk.csproj
@@ -139,803 +139,803 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -966,4 +966,8 @@
pango
+
+
+
+
diff --git a/pango/pango.csproj b/pango/pango.csproj
index bf3294d56..bdca5a0a0 100644
--- a/pango/pango.csproj
+++ b/pango/pango.csproj
@@ -79,115 +79,115 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -199,4 +199,8 @@
cairo
+
+
+
+
\ No newline at end of file
diff --git a/sample/sample.csproj b/sample/sample.csproj
index 9afd33b14..4b2f0fd71 100644
--- a/sample/sample.csproj
+++ b/sample/sample.csproj
@@ -81,7 +81,6 @@
-
@@ -109,6 +108,7 @@
+
diff --git a/sample/valtest/Makefile.am b/sample/valtest/Makefile.am
index 96073a0cc..05cf044f3 100644
--- a/sample/valtest/Makefile.am
+++ b/sample/valtest/Makefile.am
@@ -4,8 +4,14 @@ lib_LTLIBRARIES = libvalobj.la
assemblies=../../glib/glib-sharp.dll ../../gio/gio-sharp.dll ../../cairo/cairo-sharp.dll ../../pango/pango-sharp.dll ../../atk/atk-sharp.dll ../../gdk/gdk-sharp.dll ../../gtk/gtk-sharp.dll
references=$(addprefix -r:, $(assemblies))
+if PLATFORM_WIN32
+VALOBJ=Gtksharp\\Valobj.cs
+else
+VALOBJ=Gtksharp/Valobj.cs
+endif
+
valtest.exe: Valtest.cs Valobj.cs $(assemblies)
- $(CSC) $(CSFLAGS) -out:valtest.exe $(references) $(srcdir)/Valtest.cs Valobj.cs
+ $(CSC) $(CSFLAGS) -out:valtest.exe $(references) $(srcdir)/Valtest.cs $(VALOBJ)
libvalobj_la_SOURCES = \
valobj.c \