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 2f5d322dfa67d42655c0889e2945db731eafaf0a..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,
@@ -15,11 +15,13 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with GNU Radio; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
 # 
 
 include $(top_srcdir)/Makefile.common
 
-EXTRA_DIST = README README.hacking
-SUBDIRS = python
+SUBDIRS = c++
+if PYTHON
+SUBDIRS += python grc
+endif