summaryrefslogtreecommitdiff
path: root/Makefile-giscanner.am
diff options
context:
space:
mode:
authorDieter Verfaillie <dieterv@optionexplicit.be>2011-09-05 15:48:26 +0200
committerDieter Verfaillie <dieterv@optionexplicit.be>2011-09-07 21:37:39 +0200
commita8977bc6c93793fc9a2e9b6d4315c385d5ed4cb9 (patch)
tree4d4a48dfa4a28b057302c670da65b60cdc1aad79 /Makefile-giscanner.am
parent4b57f684dac03a57edcff0ee554883eab7f345b3 (diff)
downloadgobject-introspection-a8977bc6c93793fc9a2e9b6d4315c385d5ed4cb9.tar.gz
Windows port: Use an improved python.m4
- AM_CHECK_PYTHON_HEADERS macro now allows PYTHON_INCLUDES to be overridden from an environment variable and - the new AM_CHECK_PYTHON_LIBS macro to check for ability to link against libpython. This also allows PYTHON_LIBS and PYTHON_LIB_LOC to be overridden from their respective environment variables. This allows gobject-introspection to be built with MinGW/MSYS by doing: PYTHON_DIR="/c/Python27" SRC_DIR="/d/dev/gnome.org/checkout/gobject-introspection/src" ... PYTHON_INCLUDES="-I${PYTHON_DIR}/include/" \ PYTHON_LIBS="-L${PYTHON_DIR}/libs/ -lpython${PYTHON_VERSION}" \ PYTHON_LIB_LOC="${PYTHON_DIR}/libs/" \ "${SRC_DIR}/configure" \ https://bugzilla.gnome.org/show_bug.cgi?id=620566
Diffstat (limited to 'Makefile-giscanner.am')
-rw-r--r--Makefile-giscanner.am8
1 files changed, 3 insertions, 5 deletions
diff --git a/Makefile-giscanner.am b/Makefile-giscanner.am
index 841089f2..8ae523f6 100644
--- a/Makefile-giscanner.am
+++ b/Makefile-giscanner.am
@@ -58,16 +58,14 @@ _giscanner_la_CFLAGS = \
$(PYTHON_INCLUDES) \
$(GOBJECT_CFLAGS) \
-I$(top_srcdir)/giscanner
-_giscanner_la_LIBADD = libgiscanner.la $(GOBJECT_LIBS)
+_giscanner_la_LIBADD = libgiscanner.la $(GOBJECT_LIBS) $(PYTHON_LIBS)
_giscanner_la_LDFLAGS = \
-module -avoid-version -export-symbols-regex init_giscanner
if OS_WIN32
-# Yuck. Probably there is a way to get this from Python, but I don't
-# know how. Use -Wl to avoid libtool crack.
-PYVER= `echo $(PYTHON_VERSION) | sed 's/\.//g'`
-_giscanner_la_LDFLAGS += -Wl,$(pyexecdir)/../../libs/libpython$(PYVER).a -no-undefined
+_giscanner_la_LDFLAGS += \
+ -no-undefined
endif
_giscanner_la_SOURCES = giscanner/giscannermodule.c