diff options
| author | Nick Foster | 2011-04-13 17:18:14 -0700 |
|---|---|---|
| committer | Nick Foster | 2011-04-13 17:18:14 -0700 |
| commit | 9b7d444aaebbe0708e9703bce30c63b63bc81825 (patch) | |
| tree | 29121aa250decfb1ed9ca7876e1857eec8779d83 /gr-uhd/lib/Makefile.am | |
| parent | 258186d5ca2e811ced7ea637fd16e3ed3bb5573e (diff) | |
| parent | e8ff9ef4bb77517428e1208ff4b3551a38107bbd (diff) | |
| download | gnuradio-9b7d444aaebbe0708e9703bce30c63b63bc81825.tar.gz gnuradio-9b7d444aaebbe0708e9703bce30c63b63bc81825.tar.bz2 gnuradio-9b7d444aaebbe0708e9703bce30c63b63bc81825.zip | |
Merge branch 'master' of http://gnuradio.org/git/gnuradio into cpuid
Conflicts:
volk/Makefile.common
volk/lib/qa_utils.cc
Diffstat (limited to 'gr-uhd/lib/Makefile.am')
| -rw-r--r-- | gr-uhd/lib/Makefile.am | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/gr-uhd/lib/Makefile.am b/gr-uhd/lib/Makefile.am index 7ddb45cb3..c27682f7f 100644 --- a/gr-uhd/lib/Makefile.am +++ b/gr-uhd/lib/Makefile.am @@ -24,27 +24,19 @@ include $(top_srcdir)/Makefile.common AM_CPPFLAGS = \ $(STD_DEFINES_AND_INCLUDES) \ $(WITH_INCLUDES) \ - $(UHD_CPPFLAGS) + $(UHD_CPPFLAGS) \ + -Dgnuradio_uhd_EXPORTS lib_LTLIBRARIES = libgnuradio-uhd.la libgnuradio_uhd_la_SOURCES = \ - uhd_multi_usrp_source.cc \ - uhd_multi_usrp_sink.cc \ - uhd_single_usrp_source.cc \ - uhd_single_usrp_sink.cc + gr_uhd_usrp_source.cc \ + gr_uhd_usrp_sink.cc libgnuradio_uhd_la_LIBADD = \ $(GNURADIO_CORE_LA) \ $(UHD_LIBS) -libgnuradio_uhd_la_LDFLAGS = $(LTVERSIONFLAGS) - -grinclude_HEADERS = \ - gr_uhd_api.h \ - uhd_multi_usrp_source.h \ - uhd_multi_usrp_sink.h \ - uhd_single_usrp_source.h \ - uhd_single_usrp_sink.h +libgnuradio_uhd_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) noinst_HEADERS = |