diff options
| author | Nick Foster | 2011-04-15 23:04:29 -0700 |
|---|---|---|
| committer | Nick Foster | 2011-04-15 23:04:29 -0700 |
| commit | 7c48568abc3f0aa918e199f68acca5740250ee5d (patch) | |
| tree | 85c5a9b345defb0a7363b1d6132473dcf123b192 | |
| parent | d59273f379d7ab997e50c1dd8b0ac3dfc7bd1e33 (diff) | |
| download | gnuradio-7c48568abc3f0aa918e199f68acca5740250ee5d.tar.gz gnuradio-7c48568abc3f0aa918e199f68acca5740250ee5d.tar.bz2 gnuradio-7c48568abc3f0aa918e199f68acca5740250ee5d.zip | |
Volk: hack Orc back in
| -rw-r--r-- | volk/include/volk/make_makefile_am.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/volk/include/volk/make_makefile_am.py b/volk/include/volk/make_makefile_am.py index 2c9ef8fb6..bd6283b58 100644 --- a/volk/include/volk/make_makefile_am.py +++ b/volk/include/volk/make_makefile_am.py @@ -65,7 +65,7 @@ volk_orc_LIBADD = \ for machine_name in machines: tempstring += "if LV_MACHINE_" + machine_name.swapcase() + "\n" tempstring += "libvolk_" + machine_name + "_la_SOURCES = volk_machine_" + machine_name + ".cc\n" - tempstring += "libvolk_" + machine_name + "_la_CPPFLAGS = -I$(top_builddir)/include " + tempstring += "libvolk_" + machine_name + "_la_CPPFLAGS = -I$(top_builddir)/include $(volk_orc_CFLAGS) " for arch in machines[machine_name]: if archflags_dict[arch] != "none": tempstring += "-" + archflags_dict[arch] + " " @@ -80,9 +80,11 @@ volk_orc_LIBADD = \ if LV_HAVE_ORC libvolk_la_LDFLAGS += $(NO_UNDEFINED) -version-info 0:0:0 $(volk_orc_LDFLAGS) libvolk_la_LIBADD += $(volk_orc_LIBADD) +volk_orc_CFLAGS = -DLV_HAVE_ORC else libvolk_la_LDFLAGS += $(NO_UNDEFINED) -version-info 0:0:0 libvolk_la_LIBADD += +volk_orc_CFLAGS = endif |