summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config/Makefile.am1
-rw-r--r--config/grc_gnuradio_core.m43
-rw-r--r--config/grc_gr_guile.m436
-rw-r--r--configure.ac1
-rw-r--r--gnuradio-core/src/guile/Makefile.am4
-rw-r--r--gnuradio-core/src/guile/example-waveforms/.gitignore (renamed from gr-guile/.gitignore)0
-rw-r--r--gnuradio-core/src/guile/example-waveforms/Makefile.am (renamed from gr-guile/example-waveforms/Makefile.am)0
-rw-r--r--gnuradio-core/src/guile/example-waveforms/dial-tone.wfd (renamed from gr-guile/example-waveforms/dial-tone.wfd)0
-rwxr-xr-xgnuradio-core/src/guile/gnuradio/scripts/gr-run-waveform.in (renamed from gr-guile/apps/gr-run-waveform)2
-rw-r--r--gr-guile/Makefile.am26
-rw-r--r--gr-guile/apps/.gitignore6
-rw-r--r--gr-guile/apps/Makefile.am25
-rw-r--r--gr-guile/apps/README2
-rw-r--r--gr-guile/example-waveforms/.gitignore6
14 files changed, 8 insertions, 104 deletions
diff --git a/config/Makefile.am b/config/Makefile.am
index 6e8f81987..e525ccf36 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -61,7 +61,6 @@ m4macros = \
grc_gr_gcell.m4 \
grc_gr_gpio.m4 \
grc_gr_gsm_fr_vocoder.m4 \
- grc_gr_guile.m4 \
grc_gr_noaa.m4 \
grc_gr_radar_mono.m4 \
grc_gr_radio_astronomy.m4 \
diff --git a/config/grc_gnuradio_core.m4 b/config/grc_gnuradio_core.m4
index ff3df8c60..e60bdac59 100644
--- a/config/grc_gnuradio_core.m4
+++ b/config/grc_gnuradio_core.m4
@@ -85,6 +85,8 @@ AC_DEFUN([GRC_GNURADIO_CORE],[
gnuradio-core/src/gen_interpolator_taps/Makefile \
gnuradio-core/src/guile/Makefile \
gnuradio-core/src/guile/run_guile_tests \
+ gnuradio-core/src/guile/gnuradio/scripts/gr-run-waveform \
+ gnuradio-core/src/guile/example-waveforms/Makefile \
gnuradio-core/src/lib/Makefile \
gnuradio-core/src/lib/filter/Makefile \
gnuradio-core/src/lib/g72x/Makefile \
@@ -118,6 +120,7 @@ AC_DEFUN([GRC_GNURADIO_CORE],[
[
chmod +x gnuradio-core/src/python/gnuradio/gr/run_tests
chmod +x gnuradio-core/src/guile/run_guile_tests
+ chmod +x gnuradio-core/src/guile/gnuradio/scripts/gr-run-waveform
])
])
])
diff --git a/config/grc_gr_guile.m4 b/config/grc_gr_guile.m4
deleted file mode 100644
index 35d6834eb..000000000
--- a/config/grc_gr_guile.m4
+++ /dev/null
@@ -1,36 +0,0 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006,2008,2009,2010 Free Software Foundation, Inc.
-dnl
-dnl This file is part of GNU Radio
-dnl
-dnl GNU Radio is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 3, or (at your option)
-dnl any later version.
-dnl
-dnl GNU Radio is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-dnl GNU General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU General Public License
-dnl along with GNU Radio; see the file COPYING. If not, write to
-dnl the Free Software Foundation, Inc., 51 Franklin Street,
-dnl Boston, MA 02110-1301, USA.
-
-AC_DEFUN([GRC_GR_GUILE],[
- GRC_ENABLE(gr-guile)
-
- dnl Don't do gr-guile if gnuradio-core skipped
- GRC_CHECK_DEPENDENCY(gr-guile, gnuradio-core)
-
- AC_CONFIG_FILES([ \
- gr-guile/Makefile \
- gr-guile/apps/Makefile \
- gr-guile/example-waveforms/Makefile \
- ])
-
- GRC_BUILD_CONDITIONAL(gr-guile,[
- dnl run_tests is created from run_tests.in. Make it executable.
- dnl AC_CONFIG_COMMANDS([run_tests_guile], [chmod +x gr-guile/apps/run_guile_tests])
- ])
-])
diff --git a/configure.ac b/configure.ac
index 00527d383..92b728a41 100644
--- a/configure.ac
+++ b/configure.ac
@@ -375,7 +375,6 @@ GRC_GR_COMEDI
GRC_GR_CVSD_VOCODER
GRC_GR_GPIO
GRC_GR_GSM_FR_VOCODER
-GRC_GR_GUILE
GRC_GR_NOAA
GRC_GR_PAGER
GRC_GR_RADAR_MONO
diff --git a/gnuradio-core/src/guile/Makefile.am b/gnuradio-core/src/guile/Makefile.am
index 50d46411a..447500b46 100644
--- a/gnuradio-core/src/guile/Makefile.am
+++ b/gnuradio-core/src/guile/Makefile.am
@@ -28,6 +28,9 @@ EXTRA_DIST += \
$(nobase_guile_DATA) \
$(GUILE_TESTS)
+
+SUBDIRS = example-waveforms
+
# These are the hand-coded guile files for gnuradio-core.
#
# Swig/common.scm is glue that's required for the goops wrappers.
@@ -42,6 +45,7 @@ nobase_guile_DATA = \
gnuradio/runtime-shim.scm \
gnuradio/waveform.scm \
gnuradio/run-waveform.scm \
+ gnuradio/scripts/gr-run-waveform \
gnuradio/test-suite/guile-test \
gnuradio/test-suite/lib.scm
diff --git a/gr-guile/.gitignore b/gnuradio-core/src/guile/example-waveforms/.gitignore
index 16c984055..16c984055 100644
--- a/gr-guile/.gitignore
+++ b/gnuradio-core/src/guile/example-waveforms/.gitignore
diff --git a/gr-guile/example-waveforms/Makefile.am b/gnuradio-core/src/guile/example-waveforms/Makefile.am
index 277b4ad0b..277b4ad0b 100644
--- a/gr-guile/example-waveforms/Makefile.am
+++ b/gnuradio-core/src/guile/example-waveforms/Makefile.am
diff --git a/gr-guile/example-waveforms/dial-tone.wfd b/gnuradio-core/src/guile/example-waveforms/dial-tone.wfd
index ced3df572..ced3df572 100644
--- a/gr-guile/example-waveforms/dial-tone.wfd
+++ b/gnuradio-core/src/guile/example-waveforms/dial-tone.wfd
diff --git a/gr-guile/apps/gr-run-waveform b/gnuradio-core/src/guile/gnuradio/scripts/gr-run-waveform.in
index 555956c70..8186d2e09 100755
--- a/gr-guile/apps/gr-run-waveform
+++ b/gnuradio-core/src/guile/gnuradio/scripts/gr-run-waveform.in
@@ -1,4 +1,4 @@
-#!/usr/bin/guile \
+#!@GUILE@ \
-e main -s
!#
;;;
diff --git a/gr-guile/Makefile.am b/gr-guile/Makefile.am
deleted file mode 100644
index 423c1fca8..000000000
--- a/gr-guile/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-# Copyright 2010 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 this program. If not, see <http://www.gnu.org/licenses/>.
-#
-
-include $(top_srcdir)/Makefile.common
-
-if GUILE
-
-SUBDIRS = apps example-waveforms
-
-endif
diff --git a/gr-guile/apps/.gitignore b/gr-guile/apps/.gitignore
deleted file mode 100644
index 16c984055..000000000
--- a/gr-guile/apps/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-/Makefile
-/Makefile.in
-/.deps
-/.libs
-/*.la
-/*.lo
diff --git a/gr-guile/apps/Makefile.am b/gr-guile/apps/Makefile.am
deleted file mode 100644
index 04e1208bc..000000000
--- a/gr-guile/apps/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Copyright 2010 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 this program. If not, see <http://www.gnu.org/licenses/>.
-#
-
-include $(top_srcdir)/Makefile.common
-
-bin_SCRIPTS = \
- gr-run-waveform
-
-EXTRA_DIST += gr-run-waveform
diff --git a/gr-guile/apps/README b/gr-guile/apps/README
deleted file mode 100644
index 703146bd4..000000000
--- a/gr-guile/apps/README
+++ /dev/null
@@ -1,2 +0,0 @@
-This applications will not run from the build tree. They must be
-installed first using "make install"
diff --git a/gr-guile/example-waveforms/.gitignore b/gr-guile/example-waveforms/.gitignore
deleted file mode 100644
index 16c984055..000000000
--- a/gr-guile/example-waveforms/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-/Makefile
-/Makefile.in
-/.deps
-/.libs
-/*.la
-/*.lo
generated by cgit (git 2.34.1) at 2025-01-28 22:12:20 +0000