diff options
| author | Josh Blum | 2011-03-14 16:57:13 -0700 |
|---|---|---|
| committer | Josh Blum | 2011-03-14 16:57:13 -0700 |
| commit | 4d5096c8b084c5832256dc2cd8bb617ee93d94a4 (patch) | |
| tree | cd0ca60a18f6e1201b1f911f20851defa9d2421b /gr-qtgui/Makefile.am | |
| parent | 7df5b10ddcd64309a5c299f662a4cd62a7d175ab (diff) | |
| parent | fcebe220ba4690a4c339daa3d0909aad7776e631 (diff) | |
| download | gnuradio-4d5096c8b084c5832256dc2cd8bb617ee93d94a4.tar.gz gnuradio-4d5096c8b084c5832256dc2cd8bb617ee93d94a4.tar.bz2 gnuradio-4d5096c8b084c5832256dc2cd8bb617ee93d94a4.zip | |
Merge branch 'wip/qtgui/grc' into mergeme/qtgui/grc
Conflicts:
grc/grc_gnuradio/Makefile.am
Diffstat (limited to 'gr-qtgui/Makefile.am')
| -rw-r--r-- | gr-qtgui/Makefile.am | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gr-qtgui/Makefile.am b/gr-qtgui/Makefile.am index d53f96c1f..30b249589 100644 --- a/gr-qtgui/Makefile.am +++ b/gr-qtgui/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2008 Free Software Foundation, Inc. +# Copyright 2008-2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -23,3 +23,7 @@ include $(top_srcdir)/Makefile.common SUBDIRS = src DIST_SUBDIRS = src + +if PYTHON +SUBDIRS += grc +endif |