Imported Upstream version 1.40.0

[platform/upstream/gobject-introspection.git] / Makefile-gir.am

diff --git a/Makefile-gir.am b/Makefile-gir.am
index d1d15d8..52f7ee3 100644 (file)
--- a/Makefile-gir.am
+++ b/Makefile-gir.am
@@ -27,18 +27,18 @@ CLEANFILES += gir/cairo-1.0.gir
 EXTRA_DIST += gir/cairo-1.0.gir.in
 
 # Doesn't seem to work to do gir/%.typelib =(
-gir/cairo-1.0.typelib: g-ir-compiler
-gir/DBus-1.0.typelib: g-ir-compiler
-gir/DBusGLib-1.0.typelib: g-ir-compiler
-gir/fontconfig-2.0.typelib: g-ir-compiler
-gir/freetype2-2.0.typelib: g-ir-compiler
-gir/GL-1.0.typelib: g-ir-compiler
-gir/libxml2-2.0.typelib: g-ir-compiler
-gir/xft-2.0.typelib: g-ir-compiler
-gir/xlib-2.0.typelib: g-ir-compiler
-gir/xfixes-4.0.typelib: g-ir-compiler
-gir/xrandr-1.3.typelib: g-ir-compiler
-gir/win32-1.0.typelib: g-ir-compiler
+gir/cairo-1.0.typelib: g-ir-compiler$(EXEEXT)
+gir/DBus-1.0.typelib: g-ir-compiler$(EXEEXT)
+gir/DBusGLib-1.0.typelib: g-ir-compiler$(EXEEXT)
+gir/fontconfig-2.0.typelib: g-ir-compiler$(EXEEXT)
+gir/freetype2-2.0.typelib: g-ir-compiler$(EXEEXT)
+gir/GL-1.0.typelib: g-ir-compiler$(EXEEXT)
+gir/libxml2-2.0.typelib: g-ir-compiler$(EXEEXT)
+gir/xft-2.0.typelib: g-ir-compiler$(EXEEXT)
+gir/xlib-2.0.typelib: g-ir-compiler$(EXEEXT)
+gir/xfixes-4.0.typelib: g-ir-compiler$(EXEEXT)
+gir/xrandr-1.3.typelib: g-ir-compiler$(EXEEXT)
+gir/win32-1.0.typelib: g-ir-compiler$(EXEEXT)
 
 # glib with source (to enable documentation)
 if WITH_GLIBSRC
@@ -58,11 +58,7 @@ endif
 GLIB_INCLUDEDIR=$(shell pkg-config --variable=includedir glib-2.0)/glib-2.0
 GLIB_LIBDIR=$(shell pkg-config --variable=libdir glib-2.0)
 
-if OS_WIN32
-GLIB_LIBRARY=libglib-2.0-0
-else
 GLIB_LIBRARY=glib-2.0
-endif
 
 GLib_2_0_gir_LIBS = $(GLIB_LIBRARY) $(GOBJECT_LIBRARY)
 GLib_2_0_gir_SCANNERFLAGS = \
@@ -99,11 +95,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)
@@ -131,11 +123,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
 
@@ -161,11 +149,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