Merge commit 'v3.3.0' into upstream

[debian/gnuradio] / gnuradio-examples / Makefile.am

diff --git a/gnuradio-examples/Makefile.am b/gnuradio-examples/Makefile.am
index b6207ff059b4443bdf08dc9cda83d4d69cdadf9d..9ea890c120261389eb6a40d6d798324ff1efdec2 100644 (file)
--- a/gnuradio-examples/Makefile.am
+++ b/gnuradio-examples/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2004 Free Software Foundation, Inc.
+# Copyright 2004,2007,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -21,4 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
-SUBDIRS = python
+SUBDIRS = c++
+if PYTHON
+SUBDIRS += python grc
+endif