7 files changed, 19 insertions, 58 deletions
diff --git a/gr-fcd/examples/.gitignore b/gr-fcd/examples/.gitignore
deleted file mode 100644
index 52ffc3037..000000000
--- a/gr-fcd/examples/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-/Makefile
-/Makefile.in
-/.deps/*
-/.libs/*
-/fcd_nfm_rx
-/fcd_nfm_rx.o
diff --git a/gr-fcd/examples/CMakeLists.txt b/gr-fcd/examples/c++/CMakeLists.txt
index 477a6311b..05574f4a8 100644
--- a/gr-fcd/examples/CMakeLists.txt
+++ b/gr-fcd/examples/c++/CMakeLists.txt
@@ -26,16 +26,6 @@ target_link_libraries(fcd_nfm_rx gnuradio-fcd)
 
 INSTALL(TARGETS
     fcd_nfm_rx
-    DESTINATION ${GR_PKG_DATA_DIR}/examples/fcd
+    DESTINATION ${GR_PKG_FCD_EXAMPLES_DIR}
     COMPONENT "fcd_examples"
 )
-
-if(ENABLE_PYTHON)
-  INSTALL(FILES
-    fcd_apt_rx.grc
-    fcd_fft_wx.grc
-    fcd_nfm_rx.grc
-    DESTINATION ${GR_PKG_DATA_DIR}/examples/fcd
-    COMPONENT "fcd_examples"
-  )
-endif()
diff --git a/gr-fcd/examples/fcd_nfm_rx.cc b/gr-fcd/examples/c++/fcd_nfm_rx.cc
index 97ef7cf19..0ebc5d288 100644
--- a/gr-fcd/examples/fcd_nfm_rx.cc
+++ b/gr-fcd/examples/c++/fcd_nfm_rx.cc
@@ -1,16 +1,16 @@
 /*
  * Copyright 2011 Free Software Foundation, Inc.
- * 
+ *
  * 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 3, or (at your option)
  * any later version.
- * 
+ *
  * GNU Radio is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * 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., 51 Franklin Street,
@@ -19,10 +19,10 @@
 
 /*
  * Simple GNU Radio C++ example for using the Funcube Dongle.
- * 
+ *
  * Construct a simple narrow band FM receiver using the gr-fcd
  * block as source.
- * 
+ *
  * This example uses "hw:1" as FCD source device and the default
  * audio device for output.
  *
@@ -83,7 +83,7 @@ int main(int argc, char **argv)
     fcd_source_c_sptr fcd = fcd_make_source_c(device);
     fcd->set_freq_khz(freq);
     fcd->set_lna_gain(gain);
-    
+
     // Low pass filter
     std::vector<float> taps = gr_firdes::low_pass(1.0, 96000, 5000.0, 1000.0);
     gr_fir_filter_ccf_sptr filter = gr_make_fir_filter_ccf (2, taps);
diff --git a/gr-fcd/examples/Makefile.am b/gr-fcd/examples/grc/CMakeLists.txt
index a57d7a808..e33fdf182 100644
--- a/gr-fcd/examples/Makefile.am
+++ b/gr-fcd/examples/grc/CMakeLists.txt
@@ -1,49 +1,26 @@
+# Copyright 2012 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
 #
-# Copyright 2011,2012 Free Software Foundation, Inc.
-# 
 # 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 3, or (at your option)
 # any later version.
-# 
+#
 # GNU Radio is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # 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., 51 Franklin Street,
 # Boston, MA 02110-1301, USA.
-# 
-
-include $(top_srcdir)/Makefile.common
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/gr-fcd/include/fcd \
-	-I$(top_srcdir)/gr-audio/include \
-	$(STD_DEFINES_AND_INCLUDES) \
-	$(WITH_INCLUDES)
-
-GR_FCD_LA=$(top_builddir)/gr-fcd/lib/libgnuradio-fcd.la
-GNURADIO_AUDIO_LA=$(top_builddir)/gr-audio/lib/libgnuradio-audio.la
-
-ourdatadir = $(exampledir)/fcd
-
-ourdata_PROGRAMS = \
-	fcd_nfm_rx
-
-fcd_nfm_rx_SOURCES = \
-	fcd_nfm_rx.cc
-
-fcd_nfm_rx_LDADD = \
-	$(GR_FCD_LA) \
-	$(GNURADIO_CORE_LA) \
-	$(GNURADIO_AUDIO_LA) \
-	$(BOOST_PROGRAM_OPTIONS_LIB)
-
-dist_ourdata_SCRIPTS = \
-    fcd_fft_wx.grc \
-    fcd_apt_rx.grc \
-    fcd_nfm_rx.grc
 
+INSTALL(FILES
+  fcd_apt_rx.grc
+  fcd_fft_wx.grc
+  fcd_nfm_rx.grc
+  DESTINATION ${GR_PKG_FCD_EXAMPLES_DIR}
+  COMPONENT "fcd_examples"
+)
+\ No newline at end of file
diff --git a/gr-fcd/examples/fcd_apt_rx.grc b/gr-fcd/examples/grc/fcd_apt_rx.grc
index c4d3e64d1..c4d3e64d1 100644
--- a/gr-fcd/examples/fcd_apt_rx.grc
+++ b/gr-fcd/examples/grc/fcd_apt_rx.grc
diff --git a/gr-fcd/examples/fcd_fft_wx.grc b/gr-fcd/examples/grc/fcd_fft_wx.grc
index c045bbfa2..c045bbfa2 100644
--- a/gr-fcd/examples/fcd_fft_wx.grc
+++ b/gr-fcd/examples/grc/fcd_fft_wx.grc
diff --git a/gr-fcd/examples/fcd_nfm_rx.grc b/gr-fcd/examples/grc/fcd_nfm_rx.grc
index 9dac3fcb8..9dac3fcb8 100644
--- a/gr-fcd/examples/fcd_nfm_rx.grc
+++ b/gr-fcd/examples/grc/fcd_nfm_rx.grc