[gobject-introspection] Remove special W32 libnames, as they break stuff
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gobject-introspection] Remove special W32 libnames, as they break stuff
- Date: Sat, 22 Feb 2014 23:24:52 +0000 (UTC)
commit 5d3b91f03e03ca2e8dedca4870e26f8fa49f5e8d
Author: Руслан Ижбулатов <lrn1986 gmail com>
Date: Fri Feb 21 11:17:23 2014 +0000
Remove special W32 libnames, as they break stuff
https://bugzilla.gnome.org/show_bug.cgi?id=724881
Makefile-gir.am | 16 ----------------
1 files changed, 0 insertions(+), 16 deletions(-)
---
diff --git a/Makefile-gir.am b/Makefile-gir.am
index 3676756..52f7ee3 100644
--- a/Makefile-gir.am
+++ b/Makefile-gir.am
@@ -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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]