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 ad8ca5b1a4d9e7465db4ee2720bd3fb7cc56371d..9ea890c120261389eb6a40d6d798324ff1efdec2 100644 (file)
--- a/gnuradio-examples/Makefile.am
+++ b/gnuradio-examples/Makefile.am
@@ -1,11 +1,11 @@
 #
-# Copyright 2004 Free Software Foundation, Inc.
+# Copyright 2004,2007,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
 # GNU Radio is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 # 
 # GNU Radio is distributed in the hope that it will be useful,
@@ -21,4 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
-SUBDIRS = python
+SUBDIRS = c++
+if PYTHON
+SUBDIRS += python grc
+endif