diff options
| author | Josh Blum | 2010-12-01 15:31:41 -0500 |
|---|---|---|
| committer | Josh Blum | 2010-12-01 15:31:41 -0500 |
| commit | 7d8f756d11189d9378a1bbeb921baabc9c0bf643 (patch) | |
| tree | 7ac264d20c6e19c232eb8a23e9278d8df90b9ad5 | |
| parent | 389d93f465b2114959aa86931d6b473634950e46 (diff) | |
| download | gnuradio-7d8f756d11189d9378a1bbeb921baabc9c0bf643.tar.gz gnuradio-7d8f756d11189d9378a1bbeb921baabc9c0bf643.tar.bz2 gnuradio-7d8f756d11189d9378a1bbeb921baabc9c0bf643.zip | |
uhd: replaced CFLAGS with CPPFLAGS variable, and fixed swig args FIXME
| -rw-r--r-- | config/grc_gr_uhd.m4 | 4 | ||||
| -rw-r--r-- | gr-uhd/lib/Makefile.am | 2 | ||||
| -rw-r--r-- | gr-uhd/swig/Makefile.am | 7 |
3 files changed, 6 insertions, 7 deletions
diff --git a/config/grc_gr_uhd.m4 b/config/grc_gr_uhd.m4 index 4de905ad0..00892867d 100644 --- a/config/grc_gr_uhd.m4 +++ b/config/grc_gr_uhd.m4 @@ -29,8 +29,8 @@ AC_DEFUN([GRC_GR_UHD],[ [UHD], [uhd >= 1.0.0 uhd < 2.0.0], [], [passed=no; AC_MSG_RESULT([gr-uhd requires libuhd 1.x.x])] ) - UHD_CFLAGS="${UHD_CFLAGS} -I\${abs_top_srcdir}/gr-uhd/lib" - AC_SUBST(UHD_CFLAGS) + UHD_CPPFLAGS="${UHD_CPPFLAGS} -I\${abs_top_srcdir}/gr-uhd/lib" + AC_SUBST(UHD_CPPFLAGS) AC_SUBST(UHD_LIBS) fi diff --git a/gr-uhd/lib/Makefile.am b/gr-uhd/lib/Makefile.am index 099d0edbc..1bcfbbbdc 100644 --- a/gr-uhd/lib/Makefile.am +++ b/gr-uhd/lib/Makefile.am @@ -24,7 +24,7 @@ include $(top_srcdir)/Makefile.common AM_CPPFLAGS = \ $(STD_DEFINES_AND_INCLUDES) \ $(WITH_INCLUDES) \ - $(UHD_CFLAGS) + $(UHD_CPPFLAGS) lib_LTLIBRARIES = libgnuradio-uhd.la diff --git a/gr-uhd/swig/Makefile.am b/gr-uhd/swig/Makefile.am index 9eb3eab11..33a690a7b 100644 --- a/gr-uhd/swig/Makefile.am +++ b/gr-uhd/swig/Makefile.am @@ -25,7 +25,9 @@ AM_CPPFLAGS = \ $(STD_DEFINES_AND_INCLUDES) \ $(PYTHON_CPPFLAGS) \ $(WITH_INCLUDES) \ - $(UHD_CFLAGS) + $(UHD_CPPFLAGS) + +uhd_swig_swig_args = $(UHD_CPPFLAGS) if PYTHON # ---------------------------------------------------------------- @@ -55,9 +57,6 @@ uhd_swig_swiginclude_headers = include $(top_srcdir)/Makefile.swig -# FIXME better way to set this? -STD_SWIG_PYTHON_ARGS += $(UHD_CFLAGS) - # add some of the variables generated inside the Makefile.swig.gen BUILT_SOURCES = $(swig_built_sources) |