Skip to content
Snippets Groups Projects
Commit 51534ceefe7a authored by Alexandre Rostovtsev's avatar Alexandre Rostovtsev
Browse files

Fix python build by using libxsltmod_la_CPPFLAGS instead of AM_CPPFLAGS

Commit a2cd8a03 broke the --with-python build by moving includes from
INCLUDES to AM_CPPFLAGS. AM_CPPFLAGS gets ignored when a target-specific
*_CPPFLAGS variable exists, but at least some automake versions
automatically add "libxsltmod_la_CPPFLAGS = -shared" to python/Makefile.in

https://bugzilla.gnome.org/show_bug.cgi?id=684637
parent 0e5fce03363e
No related branches found
No related tags found
No related merge requests found
...@@ -3,12 +3,6 @@ ...@@ -3,12 +3,6 @@
SUBDIRS= . tests SUBDIRS= . tests
AM_CPPFLAGS = \
-I$(PYTHON_INCLUDES) \
-I$(top_srcdir)/libxslt \
-I$(top_srcdir) \
-I../libexslt
AM_CFLAGS = $(LIBXML_CFLAGS) AM_CFLAGS = $(LIBXML_CFLAGS)
DOCS_DIR = $(datadir)/doc/libxslt-python-$(LIBXSLT_VERSION) DOCS_DIR = $(datadir)/doc/libxslt-python-$(LIBXSLT_VERSION)
...@@ -36,6 +30,11 @@ ...@@ -36,6 +30,11 @@
python_LTLIBRARIES = libxsltmod.la python_LTLIBRARIES = libxsltmod.la
libxsltmod_la_CPPFLAGS = \
-I$(PYTHON_INCLUDES) \
-I$(top_srcdir)/libxslt \
-I$(top_srcdir) \
-I../libexslt
libxsltmod_la_SOURCES = libxslt.c types.c libxsltmod_la_SOURCES = libxslt.c types.c
nodist_libxsltmod_la_SOURCES = libxslt-py.c nodist_libxsltmod_la_SOURCES = libxslt-py.c
libxsltmod_la_LIBADD = $(mylibs) $(PYTHON_LIBS) libxsltmod_la_LIBADD = $(mylibs) $(PYTHON_LIBS)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment