summaryrefslogtreecommitdiff
path: root/usrp/Makefile.am
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/Makefile.am
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/Makefile.am')
-rw-r--r--usrp/Makefile.am4
1 files changed, 3 insertions, 1 deletions
diff --git a/usrp/Makefile.am b/usrp/Makefile.am
index c3e529da9..cde72e1eb 100644
--- a/usrp/Makefile.am
+++ b/usrp/Makefile.am
@@ -19,7 +19,9 @@
# Boston, MA 02110-1301, USA.
#
-EXTRA_DIST = \
+include $(top_srcdir)/Makefile.common
+
+EXTRA_DIST += \
usrp.pc.in \
usrp.iss.in \
usrp.inf