Merged build_config branch into trunk:

[debian/gnuradio] / gnuradio-core / src / lib / swig / Makefile.am

diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am
index 8c77d39b270b60a32b78cfe55a0b48838452059f..d3060e9d9ba33faceeeebfc2ed36bc474a89e4ce 100644 (file)
--- a/gnuradio-core/src/lib/swig/Makefile.am
+++ b/gnuradio-core/src/lib/swig/Makefile.am
@@ -28,7 +28,7 @@ include $(top_srcdir)/Makefile.common
 grgrpythondir = $(grpythondir)/gr
 grgrlibdir    = $(grpyexecdir)/gr
 
-INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) -I$(srcdir) \
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) -I$(srcdir) \
         $(WITH_INCLUDES)
 
 EXTRA_DIST = gen-swig-bug-fix
@@ -69,7 +69,7 @@ BUILT_SOURCES =                               \
        gnuradio_swig_py_io.h           \
        gnuradio_swig_bug_workaround.h  
 
-SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(INCLUDES) $(WITH_SWIG_INCLUDES) \
+SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(AM_CPPFLAGS) $(WITH_SWIG_INCLUDES) \
        $(WITH_INCLUDES)
 
 # ----------------------------------------------------------------