diff options
| author | Alexandre Rostovtsev <tetromino@gentoo.org> | 2012-09-22 17:44:32 -0400 |
|---|---|---|
| committer | Daniel Veillard <veillard@redhat.com> | 2012-11-21 14:25:45 +0800 |
| commit | 358bd4e46c2a17b7856401e206150bd17b538cfe (patch) | |
| tree | 9425181ed95f6f41c04db47529e64bb7dca8ce64 | |
| parent | 2fbfdd5dbb08724e29e3331b846a30785542c7d1 (diff) | |
| download | libxslt-358bd4e46c2a17b7856401e206150bd17b538cfe.tar.gz libxslt-358bd4e46c2a17b7856401e206150bd17b538cfe.tar.bz2 libxslt-358bd4e46c2a17b7856401e206150bd17b538cfe.zip | |
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
| -rw-r--r-- | python/Makefile.am | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/python/Makefile.am b/python/Makefile.am index 48a6c6e5..fa58b78f 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -3,12 +3,6 @@ AUTOMAKE_OPTIONS = 1.4 foreign SUBDIRS= . tests -AM_CPPFLAGS = \ - -I$(PYTHON_INCLUDES) \ - -I$(top_srcdir)/libxslt \ - -I$(top_srcdir) \ - -I../libexslt - AM_CFLAGS = $(LIBXML_CFLAGS) DOCS_DIR = $(datadir)/doc/libxslt-python-$(LIBXSLT_VERSION) @@ -36,6 +30,11 @@ all-local: libxslt.py 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 nodist_libxsltmod_la_SOURCES = libxslt-py.c libxsltmod_la_LIBADD = $(mylibs) $(PYTHON_LIBS) |