  tests/offsets/Makefile.am    |    6 +++++
  tests/repository/Makefile.am |    2 ++
  tests/scanner/Makefile.am    |    4 ++++
- 10 files changed, 103 insertions(+), 45 deletions(-)
+ 10 files changed, 103 insertions(+), 29 deletions(-)
 
 diff --git a/Makefile-gir.am b/Makefile-gir.am
-index 2b39e54..97c0d02 100644
+index 2b39e54..63b2f2b 100644
 --- a/Makefile-gir.am
 +++ b/Makefile-gir.am
 @@ -26,17 +26,17 @@ CLEANFILES += gir/cairo-1.0.gir

 
 gir/DBusGLib-1.0.typelib: GObject-2.0.gir
 
@@ -97,11 +98,7 @@ gir/DBusGLib-1.0.typelib: GObject-2.0.gir
 GOBJECT_INCLUDEDIR=$(shell pkg-config --variable=includedir gobject-2.0)/glib-2.0
 GOBJECT_LIBDIR=$(shell pkg-config --variable=libdir gobject-2.0)
 
-if OS_WIN32
-GOBJECT_LIBRARY=libgobject-2.0-0
-else
 GOBJECT_LIBRARY=gobject-2.0
-endif
 
 GObject-2.0.gir: GLib-2.0.gir
 GObject_2_0_gir_LIBS = $(GOBJECT_LIBRARY)
@@ -129,11 +126,7 @@ BUILT_GIRSOURCES += GObject-2.0.gir
 GMODULE_INCLUDEDIR=$(shell pkg-config --variable=includedir gmodule-2.0)/glib-2.0
 GMODULE_LIBDIR=$(shell pkg-config --variable=libdir gmodule-2.0)
 
-if OS_WIN32
-GMODULE_LIBRARY=libgmodule-2.0-0
-else
 GMODULE_LIBRARY=gmodule-2.0
-endif
 
 GModule-2.0.gir: GLib-2.0.gir
 
@@ -158,11 +151,7 @@ BUILT_GIRSOURCES += GModule-2.0.gir
 GIO_INCLUDEDIR=$(shell pkg-config --variable=includedir gio-2.0)/glib-2.0
 GIO_LIBDIR=$(shell pkg-config --variable=libdir gio-2.0)
 
-if OS_WIN32
-GIO_LIBRARY=libgio-2.0-0
-else
 GIO_LIBRARY=gio-2.0
-endif
 
 if HAVE_GIO_UNIX
 GIO_UNIX_HDRS=$(shell pkg-config --variable=includedir gio-unix-2.0)/gio-unix-2.0/gio/*.h
diff --git a/Makefile-giscanner.am b/Makefile-giscanner.am
index e8def0e..4c1d21e 100644
--- a/Makefile-giscanner.am

 
 # glib with source (to enable documentation)
 if WITH_GLIBSRC
@@ -89,7 +89,12 @@ endif
 
 BUILT_GIRSOURCES += GLib-2.0.gir
 
