summaryrefslogtreecommitdiff
path: root/usrp/host/lib
diff options
context:
space:
mode:
authorNick Foster2011-01-10 15:25:19 -0800
committerNick Foster2011-01-10 15:25:19 -0800
commit70e978b7fdc0285b56ed3ec7be3f10dc3d922504 (patch)
tree75231113034c1ac75277fbe444c02e9b600b2a7a /usrp/host/lib
parent0e92b93f21fc9c324c379bc318120d414e7422cc (diff)
parentbb438e7d12c5767123f8abed5810f284a5f18bf8 (diff)
downloadgnuradio-70e978b7fdc0285b56ed3ec7be3f10dc3d922504.tar.gz
gnuradio-70e978b7fdc0285b56ed3ec7be3f10dc3d922504.tar.bz2
gnuradio-70e978b7fdc0285b56ed3ec7be3f10dc3d922504.zip
Merge branch 'next' of http://gnuradio.org/git/gnuradio into next
Diffstat (limited to 'usrp/host/lib')
-rw-r--r--usrp/host/lib/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/usrp/host/lib/Makefile.am b/usrp/host/lib/Makefile.am
index b8b60fa98..96ab55821 100644
--- a/usrp/host/lib/Makefile.am
+++ b/usrp/host/lib/Makefile.am
@@ -42,11 +42,11 @@ libusrp_la_LIBADD = $(libusrp_la_common_LIBADD)
libusrp_la_LDFLAGS = $(libusrp_la_common_LDFLAGS)
endif
-EXTRA_DIST = \
+EXTRA_DIST += \
std_paths.h.in \
usrp_dbid.dat
-BUILT_SOURCES = $(abs_top_builddir)/usrp/host/include/usrp/usrp_dbid.h
+BUILT_SOURCES += $(abs_top_builddir)/usrp/host/include/usrp/usrp_dbid.h
BUILT_SOURCES += usrp_dbid.cc \
usrp_dbid.py