summaryrefslogtreecommitdiff
path: root/gr-fcd
diff options
context:
space:
mode:
authorJohnathan Corgan <jcorgan@corganenterprises.com>2012-03-10 11:09:10 -0800
committerJohnathan Corgan <jcorgan@corganenterprises.com>2012-03-10 11:09:10 -0800
commitd8ad6e8e04226d9edf0a7d6d06955ed5db68dfab (patch)
tree4860e5a5c0302eb9fa167b4ff6de8c9b7abdbc99 /gr-fcd
parentb6ecb24e7a0756f166b75476b276b8b7c5677bf0 (diff)
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
Diffstat (limited to 'gr-fcd')
-rw-r--r--gr-fcd/Makefile.am2
-rw-r--r--gr-fcd/examples/.gitignore (renamed from gr-fcd/apps/.gitignore)0
-rw-r--r--gr-fcd/examples/Makefile.am (renamed from gr-fcd/apps/Makefile.am)19
-rw-r--r--gr-fcd/examples/fcd_apt_rx.grc (renamed from gr-fcd/apps/fcd_apt_rx.grc)0
-rw-r--r--gr-fcd/examples/fcd_fft_wx.grc (renamed from gr-fcd/apps/fcd_fft_wx.grc)0
-rw-r--r--gr-fcd/examples/fcd_nfm_rx.cc (renamed from gr-fcd/apps/fcd_nfm_rx.cc)0
-rw-r--r--gr-fcd/examples/fcd_nfm_rx.grc (renamed from gr-fcd/apps/fcd_nfm_rx.grc)0
-rw-r--r--gr-fcd/include/Makefile.am24
-rw-r--r--gr-fcd/include/fcd/Makefile.am24
-rw-r--r--gr-fcd/include/fcd/fcd_source_c.h (renamed from gr-fcd/lib/fcd_source_c.h)0
-rw-r--r--gr-fcd/lib/Makefile.am2
-rw-r--r--gr-fcd/swig/Makefile.am2
12 files changed, 60 insertions, 13 deletions
diff --git a/gr-fcd/Makefile.am b/gr-fcd/Makefile.am
index 4d5094c01b..092634f29a 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 52ffc30374..52ffc30374 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 8f8f180efa..a57d7a808a 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 c4d3e64d1a..c4d3e64d1a 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 c045bbfa24..c045bbfa24 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 97ef7cf193..97ef7cf193 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 9dac3fcb85..9dac3fcb85 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 0000000000..77dbaf5e46
--- /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 0000000000..e66a561130
--- /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 9a0c694032..9a0c694032 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 89f3446f80..30e9f0283d 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 db20e587b6..cec8fa29a9 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) \
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-13 13:53:23 +0000