From ea7c52bbf9aabdd7f8103ea032afe43084f137b7 Mon Sep 17 00:00:00 2001
From: Mike Kestner <mkestner@gmail.com>
Date: Fri, 7 Jan 2011 21:22:35 -0600
Subject: [PATCH] Kill libglibsharpglue.

* configure.ac: remove glib/glue/Makefile expansion
* glib/Makefile.am: remove glue SUBDIR
* glib/Thread.cs: move to non-glue supported check
* glib/glue: kill
---
 configure.ac          |  1 -
 glib/Makefile.am      |  2 +-
 glib/Thread.cs        |  6 +++---
 glib/glue/Makefile.am | 19 -------------------
 glib/glue/thread.c    | 32 --------------------------------
 glib/glue/win32dll.c  | 16 ----------------
 6 files changed, 4 insertions(+), 72 deletions(-)
 delete mode 100644 glib/glue/Makefile.am
 delete mode 100644 glib/glue/thread.c
 delete mode 100755 glib/glue/win32dll.c

diff --git a/configure.ac b/configure.ac
index bfd26afc2..d9f030ba2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -224,7 +224,6 @@ generator/gapi3-codegen
 glib/Makefile
 glib/glib-sharp-3.0.pc
 glib/glib-sharp.dll.config
-glib/glue/Makefile
 gio/Makefile
 gio/gio-sharp-3.0.pc
 gio/gio-sharp.dll.config
diff --git a/glib/Makefile.am b/glib/Makefile.am
index 037917ebe..8158db23f 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = glue
+SUBDIRS =
 
 TARGET = $(ASSEMBLY)
 ASSEMBLY = $(ASSEMBLY_NAME).dll
diff --git a/glib/Thread.cs b/glib/Thread.cs
index 4895a582c..7ce2ce21a 100644
--- a/glib/Thread.cs
+++ b/glib/Thread.cs
@@ -36,13 +36,13 @@ namespace GLib
 			g_thread_init (IntPtr.Zero);
 		}
 
-		[DllImport("glibsharpglue-3")]
-		static extern bool glibsharp_g_thread_supported ();
+		[DllImport ("libgthread-2.0-0.dll", CallingConvention = CallingConvention.Cdecl)]
+		static extern bool g_thread_get_initialized ();
 
 		public static bool Supported
 		{
 			get {
-				return glibsharp_g_thread_supported ();
+				return g_thread_get_initialized ();
 			}
 		}
 	}
diff --git a/glib/glue/Makefile.am b/glib/glue/Makefile.am
deleted file mode 100644
index d27d08387..000000000
--- a/glib/glue/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-lib_LTLIBRARIES = libglibsharpglue-3.la
-
-libglibsharpglue_3_la_LDFLAGS = -module -avoid-version -no-undefined
-
-libglibsharpglue_3_la_SOURCES = 	\
-	thread.c
-
-# Adding a new glue file?
-
-libglibsharpglue_3_la_LIBADD = $(GLIB_LIBS)
-
-INCLUDES = $(GLIB_CFLAGS) $(GTK_SHARP_VERSION_CFLAGS) -I$(top_srcdir)
-
-libglibsharpglue.dll: $(libglibsharpglue_3_la_OBJECTS) libglibsharpglue.rc libglibsharpglue.def
-	./build-dll libglibsharpglue-3 $(VERSION)
-
-CLEANFILES = lib*.a lib*.dll
-
-EXTRA_DIST = win32dll.c
diff --git a/glib/glue/thread.c b/glib/glue/thread.c
deleted file mode 100644
index 4fcf8c699..000000000
--- a/glib/glue/thread.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* thread.c : glue functions for GLib.Thread
- *
- * Author: Alp Toker  <alp@atoker.com>
- *
- * Copyright (c) 2005 Alp Toker
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the Lesser GNU General 
- * Public License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-
-#include <glib/gthread.h>
-
-gboolean glibsharp_g_thread_supported (void);
-
-gboolean
-glibsharp_g_thread_supported ()
-{
-	return g_thread_supported ();
-}
-
diff --git a/glib/glue/win32dll.c b/glib/glue/win32dll.c
deleted file mode 100755
index a57c07683..000000000
--- a/glib/glue/win32dll.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#undef WIN32_LEAN_AND_MEAN
-#include <stdio.h>
-
-BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
-{
-	return TRUE;
-}
-
-/*
-BOOL APIENTRY DllMainCRTStartup (HINSTANCE hInst, DWORD reason, LPVOID reserved)
-{
-	return TRUE;
-}
-*/