diff options
| author | Josh Blum <josh@joshknows.com> | 2010-12-01 15:31:41 -0500 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-12-01 15:31:41 -0500 |
| commit | 7d8f756d11189d9378a1bbeb921baabc9c0bf643 (patch) | |
| tree | 7ac264d20c6e19c232eb8a23e9278d8df90b9ad5 /gr-uhd | |
| parent | 389d93f465b2114959aa86931d6b473634950e46 (diff) | |
uhd: replaced CFLAGS with CPPFLAGS variable, and fixed swig args FIXME
Diffstat (limited to 'gr-uhd')
| -rw-r--r-- | gr-uhd/lib/Makefile.am | 2 | ||||
| -rw-r--r-- | gr-uhd/swig/Makefile.am | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/gr-uhd/lib/Makefile.am b/gr-uhd/lib/Makefile.am index 099d0edbc4..1bcfbbbdc4 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 9eb3eab11b..33a690a7bb 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) |