lib/libxslt
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxslt synced 2025-08-07 10:42:55 +03:00
Code Activity

Fix python build by using libxsltmod_la_CPPFLAGS instead of AM_CPPFLAGS

Browse Source 
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
This commit is contained in:
Alexandre Rostovtsev
2012-09-22 17:44:32 -04:00
committed by Daniel Veillard
parent 2fbfdd5dbb
commit 358bd4e46c
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
python/Makefile.am
View File

@@ -3,12 +3,6 @@ AUTOMAKE_OPTIONS = 1.4 foreign
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 @@ all-local: libxslt.py
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)