From 07bd878bc30f7ab54afc1e2f0055419388c3c992 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Sun, 13 Mar 2011 17:33:33 -0700
Subject: grc: moved all usrp1 and usrp2 stuff out of grc and into gr-usrp*/grc

Moved grc xml files, python wrappers (USRP1 only), probe apps + freedesktop files.

When the gr-usrp and gr-usrp2 directories are removed, grc will not have to change.

Minor change: the freedesktop files are always installed now.
This does not mean that they are installed properly with xdg,
it just means that the runtime can have access to the icons.
---
 gr-usrp/Makefile.am | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'gr-usrp/Makefile.am')

diff --git a/gr-usrp/Makefile.am b/gr-usrp/Makefile.am
index 221a10816..be4035dd4 100644
--- a/gr-usrp/Makefile.am
+++ b/gr-usrp/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2004 Free Software Foundation, Inc.
+# Copyright 2004,2011 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -27,5 +27,9 @@ EXTRA_DIST += \
 
 SUBDIRS = src apps
 
+if PYTHON
+SUBDIRS += grc
+endif
+
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gnuradio-usrp.pc
-- 
cgit