[pygobject] rename the pyglib shared library so we don't load the old one
- From: John Palmieri <johnp src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pygobject] rename the pyglib shared library so we don't load the old one
- Date: Thu, 11 Aug 2011 12:48:55 +0000 (UTC)
commit 7431b49a161df9178c55b814d3adff992ac2d722
Author: John (J5) Palmieri <johnp redhat com>
Date: Fri Jul 22 12:26:32 2011 -0400
rename the pyglib shared library so we don't load the old one
https://bugzilla.gnome.org/show_bug.cgi?id=642048
gi/Makefile.am | 2 +-
gi/_glib/Makefile.am | 10 +++++-----
gi/_gobject/Makefile.am | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/gi/Makefile.am b/gi/Makefile.am
index 71f0b65..ee5eb00 100644
--- a/gi/Makefile.am
+++ b/gi/Makefile.am
@@ -27,7 +27,7 @@ _gi_la_LDFLAGS = \
-export-symbols-regex "init_gi|PyInit__gi"
_gi_la_LIBADD = \
$(GI_LIBS) \
- $(top_builddir)/gi/_glib/libpyglib-2 0- PYTHON_BASENAME@.la
+ $(top_builddir)/gi/_glib/libpyglib-gi-2 0- PYTHON_BASENAME@.la
_gi_la_SOURCES = \
pygi-repository.c \
pygi-repository.h \
diff --git a/gi/_glib/Makefile.am b/gi/_glib/Makefile.am
index 5651d69..fcea61d 100644
--- a/gi/_glib/Makefile.am
+++ b/gi/_glib/Makefile.am
@@ -1,7 +1,7 @@
AUTOMAKE_OPTIONS = 1.7
INCLUDES = $(PYTHON_INCLUDES) $(GLIB_CFLAGS) -DPY_SSIZE_T_CLEAN
-lib_LTLIBRARIES = libpyglib-2 0- PYTHON_BASENAME@.la
+lib_LTLIBRARIES = libpyglib-gi-2 0- PYTHON_BASENAME@.la
pkgpyexecdir = $(pyexecdir)
@@ -16,9 +16,9 @@ if PLATFORM_WIN32
common_ldflags += -no-undefined
endif
-libpyglib_2_0_ PYTHON_BASENAME@_la_CFLAGS = $(GLIB_CFLAGS)
-libpyglib_2_0_ PYTHON_BASENAME@_la_LIBADD = $(GLIB_LIBS) $(FFI_LIBS)
-libpyglib_2_0_ PYTHON_BASENAME@_la_SOURCES = \
+libpyglib_gi_2_0_ PYTHON_BASENAME@_la_CFLAGS = $(GLIB_CFLAGS)
+libpyglib_gi_2_0_ PYTHON_BASENAME@_la_LIBADD = $(GLIB_LIBS) $(FFI_LIBS)
+libpyglib_gi_2_0_ PYTHON_BASENAME@_la_SOURCES = \
pyglib.c \
pyglib.h \
pyglib-private.h \
@@ -26,7 +26,7 @@ libpyglib_2_0_ PYTHON_BASENAME@_la_SOURCES = \
_glib_la_CFLAGS = $(GLIB_CFLAGS)
_glib_la_LDFLAGS = $(common_ldflags) -export-symbols-regex "_glib|PyInit__glib"
-_glib_la_LIBADD = $(GLIB_LIBS) $(PYTHON_LIBS) libpyglib-2 0- PYTHON_BASENAME@.la
+_glib_la_LIBADD = $(GLIB_LIBS) $(PYTHON_LIBS) libpyglib-gi-2 0- PYTHON_BASENAME@.la
_glib_la_SOURCES = \
glibmodule.c \
pygiochannel.c \
diff --git a/gi/_gobject/Makefile.am b/gi/_gobject/Makefile.am
index ddeaa17..7e15d4c 100644
--- a/gi/_gobject/Makefile.am
+++ b/gi/_gobject/Makefile.am
@@ -30,7 +30,7 @@ _gobject_la_LIBADD = \
$(GLIB_LIBS) \
$(FFI_LIBS) \
$(PYTHON_LIBS) \
- $(top_builddir)/gi/_glib/libpyglib-2 0- PYTHON_BASENAME@.la
+ $(top_builddir)/gi/_glib/libpyglib-gi-2 0- PYTHON_BASENAME@.la
_gobject_la_SOURCES = \
gobjectmodule.c \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]