diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2016-01-20 14:34:00 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2016-01-20 15:28:58 +0100 |
| commit | 5e3bcf20be6188331c856d9d8854fb931b2abba7 (patch) | |
| tree | 169b4681757f6ad0a657bcb0f5b01e2395901c95 | |
| parent | 5c33826855a8d88889cdbbfc78b27c86549715d5 (diff) | |
| download | astra-5e3bcf20be6188331c856d9d8854fb931b2abba7.tar.gz astra-5e3bcf20be6188331c856d9d8854fb931b2abba7.tar.bz2 astra-5e3bcf20be6188331c856d9d8854fb931b2abba7.tar.xz astra-5e3bcf20be6188331c856d9d8854fb931b2abba7.zip | |
Avoid incorrect include dirs when building python modules
| -rw-r--r-- | build/linux/Makefile.in | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/build/linux/Makefile.in b/build/linux/Makefile.in index 4f99db2..c165d37 100644 --- a/build/linux/Makefile.in +++ b/build/linux/Makefile.in @@ -32,7 +32,6 @@ NVCCFLAGS=@SAVED_NVCCFLAGS@ LDFLAGS=@SAVED_LDFLAGS@ LIBS=@SAVED_LIBS@ -CPPFLAGS+=-I$(srcdir)/../.. -I$(srcdir)/../../include -I$(srcdir)/../../lib/include CXXFLAGS+=-g -O3 -Wall -Wshadow LIBS+=-lpthread LDFLAGS+=-g @@ -59,7 +58,7 @@ PYLIBDIR = $(shell $(PYTHON) -c 'from distutils.sysconfig import get_config_var; PYINCDIR = $(shell $(PYTHON) -c 'from distutils.sysconfig import get_python_inc; import six; six.print_(get_python_inc())') PYLIBVER = `basename $(PYINCDIR)` CPPFLAGS += -DASTRA_PYTHON -I$(PYINCDIR) -PYCPPFLAGS = $(CPPFLAGS) +PYCPPFLAGS := $(CPPFLAGS) PYCPPFLAGS += -I../include PYLDFLAGS = $(LDFLAGS) PYLDFLAGS += -L$(abs_top_builddir)/.libs @@ -67,6 +66,10 @@ LIBS += -l$(PYLIBVER) LDFLAGS += -L$(PYLIBDIR) endif +# This is below where PYCPPFLAGS copies CPPFLAGS. The python code is built +# from a different directory, so these relative includes would be wrong. +CPPFLAGS+=-I$(srcdir)/../.. -I$(srcdir)/../../include -I$(srcdir)/../../lib/include + BOOST_CPPFLAGS= BOOST_LDFLAGS= |