fcd: moved items to current layout standard

* Public header files moved from lib/ to include/fcd

* Contents of apps/ moved to examples/ to get into gnuradio/examples,
  apps for programs to be installed into $PREFIX/bin

13 files changed, 63 insertions, 14 deletions

diff --git a/config/grc_gr_fcd.m4 b/config/grc_gr_fcd.m4
index 2844c4735..8094e1926 100644
--- a/config/grc_gr_fcd.m4
+++ b/config/grc_gr_fcd.m4
@@ -55,6 +55,8 @@ AC_DEFUN([GRC_GR_FCD],[
     AC_CONFIG_FILES([ \
         gr-fcd/Makefile \
     	gr-fcd/gnuradio-fcd.pc \
+	gr-fcd/include/Makefile \
+	gr-fcd/include/fcd/Makefile \
 	gr-fcd/lib/Makefile \
 	gr-fcd/lib/hid/Makefile \
 	gr-fcd/lib/fcd/Makefile \
@@ -63,7 +65,7 @@ AC_DEFUN([GRC_GR_FCD],[
     	gr-fcd/python/Makefile \
 	gr-fcd/python/run_tests \
     	gr-fcd/grc/Makefile \
-    	gr-fcd/apps/Makefile \
+    	gr-fcd/examples/Makefile \
 	gr-fcd/doc/Makefile \
     ])
 
diff --git a/gr-fcd/Makefile.am b/gr-fcd/Makefile.am
index 4d5094c01..092634f29 100644
--- a/gr-fcd/Makefile.am
+++ b/gr-fcd/Makefile.am
@@ -28,7 +28,7 @@ EXTRA_DIST = \
 	README \
 	README.hacking
 
-SUBDIRS = lib swig python grc apps doc
+SUBDIRS = lib swig python grc examples doc
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gnuradio-fcd.pc
diff --git a/gr-fcd/apps/.gitignore b/gr-fcd/examples/.gitignore
index 52ffc3037..52ffc3037 100644
--- a/gr-fcd/apps/.gitignore
+++ b/gr-fcd/examples/.gitignore
diff --git a/gr-fcd/apps/Makefile.am b/gr-fcd/examples/Makefile.am
index 8f8f180ef..a57d7a808 100644
--- a/gr-fcd/apps/Makefile.am
+++ b/gr-fcd/examples/Makefile.am
@@ -20,7 +20,7 @@
 include $(top_srcdir)/Makefile.common
 
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/gr-fcd/lib/ \
+	-I$(top_srcdir)/gr-fcd/include/fcd \
 	-I$(top_srcdir)/gr-audio/include \
 	$(STD_DEFINES_AND_INCLUDES) \
 	$(WITH_INCLUDES)
@@ -28,23 +28,22 @@ AM_CPPFLAGS = \
 GR_FCD_LA=$(top_builddir)/gr-fcd/lib/libgnuradio-fcd.la
 GNURADIO_AUDIO_LA=$(top_builddir)/gr-audio/lib/libgnuradio-audio.la
 
-LDADD = \
-	$(GR_FCD_LA) \
-	$(GNURADIO_CORE_LA) \
-	$(GNURADIO_AUDIO_LA) \
-	$(BOOST_PROGRAM_OPTIONS_LIB)
+ourdatadir = $(exampledir)/fcd
 
-bin_PROGRAMS = \
+ourdata_PROGRAMS = \
 	fcd_nfm_rx
 
 fcd_nfm_rx_SOURCES = \
 	fcd_nfm_rx.cc
 
-if PYTHON
+fcd_nfm_rx_LDADD = \
+	$(GR_FCD_LA) \
+	$(GNURADIO_CORE_LA) \
+	$(GNURADIO_AUDIO_LA) \
+	$(BOOST_PROGRAM_OPTIONS_LIB)
 
-EXTRA_DIST = \
+dist_ourdata_SCRIPTS = \
     fcd_fft_wx.grc \
     fcd_apt_rx.grc \
     fcd_nfm_rx.grc
 
-endif
diff --git a/gr-fcd/apps/fcd_apt_rx.grc b/gr-fcd/examples/fcd_apt_rx.grc
index c4d3e64d1..c4d3e64d1 100644
--- a/gr-fcd/apps/fcd_apt_rx.grc
+++ b/gr-fcd/examples/fcd_apt_rx.grc
diff --git a/gr-fcd/apps/fcd_fft_wx.grc b/gr-fcd/examples/fcd_fft_wx.grc
index c045bbfa2..c045bbfa2 100644
--- a/gr-fcd/apps/fcd_fft_wx.grc
+++ b/gr-fcd/examples/fcd_fft_wx.grc
diff --git a/gr-fcd/apps/fcd_nfm_rx.cc b/gr-fcd/examples/fcd_nfm_rx.cc
index 97ef7cf19..97ef7cf19 100644
--- a/gr-fcd/apps/fcd_nfm_rx.cc
+++ b/gr-fcd/examples/fcd_nfm_rx.cc
diff --git a/gr-fcd/apps/fcd_nfm_rx.grc b/gr-fcd/examples/fcd_nfm_rx.grc
index 9dac3fcb8..9dac3fcb8 100644
--- a/gr-fcd/apps/fcd_nfm_rx.grc
+++ b/gr-fcd/examples/fcd_nfm_rx.grc
diff --git a/gr-fcd/include/Makefile.am b/gr-fcd/include/Makefile.am
new file mode 100644
index 000000000..77dbaf5e4
--- /dev/null
+++ b/gr-fcd/include/Makefile.am
@@ -0,0 +1,24 @@
+#
+# Copyright 2012 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 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
+
+SUBDIRS = fcd
diff --git a/gr-fcd/include/fcd/Makefile.am b/gr-fcd/include/fcd/Makefile.am
new file mode 100644
index 000000000..e66a56113
--- /dev/null
+++ b/gr-fcd/include/fcd/Makefile.am
@@ -0,0 +1,24 @@
+#
+# Copyright 2012 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 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
+
+grinclude_HEADERS = fcd_source_c.h
diff --git a/gr-fcd/lib/fcd_source_c.h b/gr-fcd/include/fcd/fcd_source_c.h
index 9a0c69403..9a0c69403 100644
--- a/gr-fcd/lib/fcd_source_c.h
+++ b/gr-fcd/include/fcd/fcd_source_c.h
diff --git a/gr-fcd/lib/Makefile.am b/gr-fcd/lib/Makefile.am
index 89f3446f8..30e9f0283 100644
--- a/gr-fcd/lib/Makefile.am
+++ b/gr-fcd/lib/Makefile.am
@@ -27,6 +27,7 @@ AM_CPPFLAGS = \
 	$(STD_DEFINES_AND_INCLUDES) \
 	$(WITH_INCLUDES) \
 	-I$(top_srcdir)/gr-audio/include \
+	-I$(top_srcdir)/gr-fcd/include/fcd \
 	-I$(top_srcdir)/gr-fcd/lib/fcd
 
 lib_LTLIBRARIES = libgnuradio-fcd.la
@@ -41,4 +42,3 @@ libgnuradio_fcd_la_LIBADD = \
 
 libgnuradio_fcd_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
 
-grinclude_HEADERS = fcd_source_c.h
diff --git a/gr-fcd/swig/Makefile.am b/gr-fcd/swig/Makefile.am
index db20e587b..cec8fa29a 100644
--- a/gr-fcd/swig/Makefile.am
+++ b/gr-fcd/swig/Makefile.am
@@ -33,7 +33,7 @@ endif
 
 
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/gr-fcd/lib \
+	-I$(top_srcdir)/gr-fcd/include/fcd \
 	-I$(top_srcdir)/gr-audio/include \
 	$(STD_DEFINES_AND_INCLUDES) \
 	$(PYTHON_CPPFLAGS) \