From 81867e5dfd939d8afdacbe22c6e2d41d4bc4b37e Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Fri, 5 Nov 2010 19:43:33 -0700 Subject: Create guile QA framework. Also moves hand coded files out of gnuradio-core/src/lib/swig/gnuradio that were getting nuked by make clean. --- gnuradio-core/src/guile/Makefile.am | 38 +++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 gnuradio-core/src/guile/Makefile.am (limited to 'gnuradio-core/src/guile/Makefile.am') diff --git a/gnuradio-core/src/guile/Makefile.am b/gnuradio-core/src/guile/Makefile.am new file mode 100644 index 000000000..3c21373af --- /dev/null +++ b/gnuradio-core/src/guile/Makefile.am @@ -0,0 +1,38 @@ +# +# 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 . +# + +include $(top_srcdir)/Makefile.common + +TESTS = run_guile_tests + +EXTRA_DIST = run_guile_tests.in + +# These are the hand-code guile files for gnuradio-core. +# +# Swig/common.scm is glue that's required for the goops wrappers. +# gnuradio/export-safely.scm works around some problems in the goops generated wrappers. +# gnuradio/core.scm glues the 5 pieces of gnuradio_core_* into a single module. +# gnuradio/runtime-shim implements "guile friendly" versions of connect & disconnect. + +nobase_guile_DATA = \ + Swig/common.scm \ + gnuradio/core.scm \ + gnuradio/export-safely.scm \ + gnuradio/runtime-shim.scm + -- cgit From a79986e0a88632029daf2dad5d05518d33bb1866 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Fri, 5 Nov 2010 21:58:58 -0700 Subject: First real guile QA code --- gnuradio-core/src/guile/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnuradio-core/src/guile/Makefile.am') diff --git a/gnuradio-core/src/guile/Makefile.am b/gnuradio-core/src/guile/Makefile.am index 3c21373af..ef6ab0b7e 100644 --- a/gnuradio-core/src/guile/Makefile.am +++ b/gnuradio-core/src/guile/Makefile.am @@ -34,5 +34,5 @@ nobase_guile_DATA = \ Swig/common.scm \ gnuradio/core.scm \ gnuradio/export-safely.scm \ - gnuradio/runtime-shim.scm - + gnuradio/runtime-shim.scm \ + srfi/srfi-64.scm -- cgit From b316cb06d0c6aa7be9942e48c71324fb8d637de8 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Fri, 5 Nov 2010 22:32:35 -0700 Subject: More guile QA code --- gnuradio-core/src/guile/Makefile.am | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnuradio-core/src/guile/Makefile.am') diff --git a/gnuradio-core/src/guile/Makefile.am b/gnuradio-core/src/guile/Makefile.am index ef6ab0b7e..5a9721b64 100644 --- a/gnuradio-core/src/guile/Makefile.am +++ b/gnuradio-core/src/guile/Makefile.am @@ -36,3 +36,5 @@ nobase_guile_DATA = \ gnuradio/export-safely.scm \ gnuradio/runtime-shim.scm \ srfi/srfi-64.scm + +CLEANFILES = qa_*.log -- cgit From 45a88c35386e7ea0d93651cd528bc7c1261d3197 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Fri, 5 Nov 2010 23:25:54 -0700 Subject: Add qa_*.scm files to Makefile as noinst_DATA --- gnuradio-core/src/guile/Makefile.am | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'gnuradio-core/src/guile/Makefile.am') diff --git a/gnuradio-core/src/guile/Makefile.am b/gnuradio-core/src/guile/Makefile.am index 5a9721b64..4db679cff 100644 --- a/gnuradio-core/src/guile/Makefile.am +++ b/gnuradio-core/src/guile/Makefile.am @@ -21,7 +21,8 @@ include $(top_srcdir)/Makefile.common TESTS = run_guile_tests -EXTRA_DIST = run_guile_tests.in +EXTRA_DIST = \ + run_guile_tests.in # These are the hand-code guile files for gnuradio-core. # @@ -37,4 +38,14 @@ nobase_guile_DATA = \ gnuradio/runtime-shim.scm \ srfi/srfi-64.scm +noinst_DATA = \ + qa_0000_basics.scm \ + qa_0010_ctor_filter.scm \ + qa_0010_ctor_general.scm \ + qa_0010_ctor_gengen.scm \ + qa_0010_ctor_hier.scm \ + qa_0010_ctor_io.scm \ + qa_0010_ctor_runtime.scm + + CLEANFILES = qa_*.log -- cgit From edca19393f74f803b2b5a970683d216ef41c05c3 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Sun, 7 Nov 2010 15:10:03 -0800 Subject: new QA code work-in-progress (forgot -a ...) --- gnuradio-core/src/guile/Makefile.am | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'gnuradio-core/src/guile/Makefile.am') diff --git a/gnuradio-core/src/guile/Makefile.am b/gnuradio-core/src/guile/Makefile.am index 4db679cff..bbb36794e 100644 --- a/gnuradio-core/src/guile/Makefile.am +++ b/gnuradio-core/src/guile/Makefile.am @@ -38,14 +38,14 @@ nobase_guile_DATA = \ gnuradio/runtime-shim.scm \ srfi/srfi-64.scm -noinst_DATA = \ - qa_0000_basics.scm \ - qa_0010_ctor_filter.scm \ - qa_0010_ctor_general.scm \ - qa_0010_ctor_gengen.scm \ - qa_0010_ctor_hier.scm \ - qa_0010_ctor_io.scm \ - qa_0010_ctor_runtime.scm - +# noinst_DATA = \ +# qa_0000_basics.scm \ +# qa_0010_ctor_filter.scm \ +# qa_0010_ctor_general.scm \ +# qa_0010_ctor_gengen.scm \ +# qa_0010_ctor_hier.scm \ +# qa_0010_ctor_io.scm \ +# qa_0010_ctor_runtime.scm +# CLEANFILES = qa_*.log -- cgit From 8a4a74414804f1ccc1ce748b14f82acff3078806 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Sun, 7 Nov 2010 15:37:04 -0800 Subject: Modify *.test to import correct modules --- gnuradio-core/src/guile/Makefile.am | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'gnuradio-core/src/guile/Makefile.am') diff --git a/gnuradio-core/src/guile/Makefile.am b/gnuradio-core/src/guile/Makefile.am index bbb36794e..71ce29067 100644 --- a/gnuradio-core/src/guile/Makefile.am +++ b/gnuradio-core/src/guile/Makefile.am @@ -36,16 +36,16 @@ nobase_guile_DATA = \ gnuradio/core.scm \ gnuradio/export-safely.scm \ gnuradio/runtime-shim.scm \ - srfi/srfi-64.scm + gnuradio/test-suite/guile-test \ + gnuradio/test-suite/lib.scm -# noinst_DATA = \ -# qa_0000_basics.scm \ -# qa_0010_ctor_filter.scm \ -# qa_0010_ctor_general.scm \ -# qa_0010_ctor_gengen.scm \ -# qa_0010_ctor_hier.scm \ -# qa_0010_ctor_io.scm \ -# qa_0010_ctor_runtime.scm -# +noinst_DATA = \ + 00_runtime_basics.test \ + 00_runtime_ctors.test \ + filter_ctors.test \ + general_ctors.test \ + gengen_ctors.test \ + hier_ctors.test \ + io_ctors.test -CLEANFILES = qa_*.log +CLEANFILES = guile.log -- cgit From f4959dce1e5ec6b61c10df489c2421d56963beb3 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Sun, 7 Nov 2010 16:02:24 -0800 Subject: guile-test -> guile-test.in so we can use @GUILE@ --- gnuradio-core/src/guile/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnuradio-core/src/guile/Makefile.am') diff --git a/gnuradio-core/src/guile/Makefile.am b/gnuradio-core/src/guile/Makefile.am index 71ce29067..d7fdbce60 100644 --- a/gnuradio-core/src/guile/Makefile.am +++ b/gnuradio-core/src/guile/Makefile.am @@ -22,7 +22,9 @@ include $(top_srcdir)/Makefile.common TESTS = run_guile_tests EXTRA_DIST = \ - run_guile_tests.in + run_guile_tests.in \ + gnuradio/test-suite/guile-test.in + # These are the hand-code guile files for gnuradio-core. # -- cgit From 72739e8fde9353e502edc937bd6f9f77f6b80cc6 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Sun, 7 Nov 2010 16:42:07 -0800 Subject: Move *.test to tests directory --- gnuradio-core/src/guile/Makefile.am | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gnuradio-core/src/guile/Makefile.am') diff --git a/gnuradio-core/src/guile/Makefile.am b/gnuradio-core/src/guile/Makefile.am index d7fdbce60..f3c02a446 100644 --- a/gnuradio-core/src/guile/Makefile.am +++ b/gnuradio-core/src/guile/Makefile.am @@ -42,12 +42,12 @@ nobase_guile_DATA = \ gnuradio/test-suite/lib.scm noinst_DATA = \ - 00_runtime_basics.test \ - 00_runtime_ctors.test \ - filter_ctors.test \ - general_ctors.test \ - gengen_ctors.test \ - hier_ctors.test \ - io_ctors.test + tests/00_runtime_basics.test \ + tests/00_runtime_ctors.test \ + tests/filter_ctors.test \ + tests/general_ctors.test \ + tests/gengen_ctors.test \ + tests/hier_ctors.test \ + tests/io_ctors.test CLEANFILES = guile.log -- cgit From b87c20de46e52c4cac66dc80b74db48d60a43095 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Tue, 9 Nov 2010 09:14:34 -0700 Subject: make the tests directory before trying to run any tests --- gnuradio-core/src/guile/Makefile.am | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnuradio-core/src/guile/Makefile.am') diff --git a/gnuradio-core/src/guile/Makefile.am b/gnuradio-core/src/guile/Makefile.am index f3c02a446..c8d05ecfa 100644 --- a/gnuradio-core/src/guile/Makefile.am +++ b/gnuradio-core/src/guile/Makefile.am @@ -25,7 +25,6 @@ EXTRA_DIST = \ run_guile_tests.in \ gnuradio/test-suite/guile-test.in - # These are the hand-code guile files for gnuradio-core. # # Swig/common.scm is glue that's required for the goops wrappers. @@ -51,3 +50,7 @@ noinst_DATA = \ tests/io_ctors.test CLEANFILES = guile.log + +check-am: all-am + @test -d "tests" || $(mkinstalldirs) "tests" + $(MAKE) $(AM_MAKEFLAGS) check-TESTS -- cgit From 5f89cc658099916aad49dcff0ebef296eaa09135 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Tue, 9 Nov 2010 09:20:36 -0800 Subject: Remove guile-test.in. We're not rewriting the header anymore --- gnuradio-core/src/guile/Makefile.am | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'gnuradio-core/src/guile/Makefile.am') diff --git a/gnuradio-core/src/guile/Makefile.am b/gnuradio-core/src/guile/Makefile.am index c8d05ecfa..5eb9444af 100644 --- a/gnuradio-core/src/guile/Makefile.am +++ b/gnuradio-core/src/guile/Makefile.am @@ -22,8 +22,7 @@ include $(top_srcdir)/Makefile.common TESTS = run_guile_tests EXTRA_DIST = \ - run_guile_tests.in \ - gnuradio/test-suite/guile-test.in + run_guile_tests.in # These are the hand-code guile files for gnuradio-core. # -- cgit From fa9eeb2aab040a3c74da639233ba8f9a585b0455 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Wed, 10 Nov 2010 18:12:02 -0800 Subject: Add @srcdir@ to test directory specifier --- gnuradio-core/src/guile/Makefile.am | 4 ---- 1 file changed, 4 deletions(-) (limited to 'gnuradio-core/src/guile/Makefile.am') diff --git a/gnuradio-core/src/guile/Makefile.am b/gnuradio-core/src/guile/Makefile.am index 5eb9444af..f4cc14175 100644 --- a/gnuradio-core/src/guile/Makefile.am +++ b/gnuradio-core/src/guile/Makefile.am @@ -49,7 +49,3 @@ noinst_DATA = \ tests/io_ctors.test CLEANFILES = guile.log - -check-am: all-am - @test -d "tests" || $(mkinstalldirs) "tests" - $(MAKE) $(AM_MAKEFLAGS) check-TESTS -- cgit From abde5affda1533c518cce06d5edcffa4eda52340 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Sat, 13 Nov 2010 16:19:48 -0800 Subject: dail-tone.wfd example waveform can be loaded and run by gr-run-waveform. Write new app, gr-run-waveform, that reads waveforms and runs them. We'll need to turn this into a small piece of C/C++ code that embeds guile, but the guts of it is working. --- gnuradio-core/src/guile/Makefile.am | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnuradio-core/src/guile/Makefile.am') diff --git a/gnuradio-core/src/guile/Makefile.am b/gnuradio-core/src/guile/Makefile.am index f4cc14175..0c0becbc1 100644 --- a/gnuradio-core/src/guile/Makefile.am +++ b/gnuradio-core/src/guile/Makefile.am @@ -22,7 +22,8 @@ include $(top_srcdir)/Makefile.common TESTS = run_guile_tests EXTRA_DIST = \ - run_guile_tests.in + run_guile_tests.in \ + $(GUILE_TESTS) # These are the hand-code guile files for gnuradio-core. # @@ -36,10 +37,11 @@ nobase_guile_DATA = \ gnuradio/core.scm \ gnuradio/export-safely.scm \ gnuradio/runtime-shim.scm \ + gnuradio/waveform.scm \ gnuradio/test-suite/guile-test \ gnuradio/test-suite/lib.scm -noinst_DATA = \ +GUILE_TESTS = \ tests/00_runtime_basics.test \ tests/00_runtime_ctors.test \ tests/filter_ctors.test \ -- cgit From 9cf988ad17529416f841870b01d0f548e1a0b9a0 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Sun, 21 Nov 2010 21:47:15 -0700 Subject: fix so distcheck *almost* fully works --- gnuradio-core/src/guile/Makefile.am | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnuradio-core/src/guile/Makefile.am') diff --git a/gnuradio-core/src/guile/Makefile.am b/gnuradio-core/src/guile/Makefile.am index 0c0becbc1..c2f8b5c39 100644 --- a/gnuradio-core/src/guile/Makefile.am +++ b/gnuradio-core/src/guile/Makefile.am @@ -23,6 +23,7 @@ TESTS = run_guile_tests EXTRA_DIST = \ run_guile_tests.in \ + $(nobase_guile_DATA) \ $(GUILE_TESTS) # These are the hand-code guile files for gnuradio-core. @@ -51,3 +52,5 @@ GUILE_TESTS = \ tests/io_ctors.test CLEANFILES = guile.log + +no_dist_dirs = python guile -- cgit From d692a41f98e7b888c745efbb9fcbbb0400f39025 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Wed, 24 Nov 2010 17:29:11 -0800 Subject: Major Makefile.am housecleaning. Passes distcheck. Move all occurrences of swig_built_sources out of Makefile.am's. Move all SWIG related use of BUILT_SOURCES out of Makefile.am's. Clean up 'if PYTHON' conditionalization in gr-* Still left to do: fix Makefile.swig CLEANFILES and no_dist_files such that they remove exactly the generated files. --- gnuradio-core/src/guile/Makefile.am | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gnuradio-core/src/guile/Makefile.am') diff --git a/gnuradio-core/src/guile/Makefile.am b/gnuradio-core/src/guile/Makefile.am index c2f8b5c39..209e664a0 100644 --- a/gnuradio-core/src/guile/Makefile.am +++ b/gnuradio-core/src/guile/Makefile.am @@ -21,7 +21,7 @@ include $(top_srcdir)/Makefile.common TESTS = run_guile_tests -EXTRA_DIST = \ +EXTRA_DIST += \ run_guile_tests.in \ $(nobase_guile_DATA) \ $(GUILE_TESTS) @@ -52,5 +52,3 @@ GUILE_TESTS = \ tests/io_ctors.test CLEANFILES = guile.log - -no_dist_dirs = python guile -- cgit From 4dce044bcba406c69704baad7ff1a30a35a6d0e2 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Wed, 24 Nov 2010 19:18:11 -0800 Subject: Add conditionals around gnuradio-core/src/{guile,python} --- gnuradio-core/src/guile/Makefile.am | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnuradio-core/src/guile/Makefile.am') diff --git a/gnuradio-core/src/guile/Makefile.am b/gnuradio-core/src/guile/Makefile.am index 209e664a0..4e12b646d 100644 --- a/gnuradio-core/src/guile/Makefile.am +++ b/gnuradio-core/src/guile/Makefile.am @@ -19,6 +19,8 @@ include $(top_srcdir)/Makefile.common +if GUILE + TESTS = run_guile_tests EXTRA_DIST += \ @@ -26,7 +28,7 @@ EXTRA_DIST += \ $(nobase_guile_DATA) \ $(GUILE_TESTS) -# These are the hand-code guile files for gnuradio-core. +# These are the hand-coded guile files for gnuradio-core. # # Swig/common.scm is glue that's required for the goops wrappers. # gnuradio/export-safely.scm works around some problems in the goops generated wrappers. @@ -52,3 +54,5 @@ GUILE_TESTS = \ tests/io_ctors.test CLEANFILES = guile.log + +endif -- cgit From 9d91d36c7e509928705f093935024d08d2c019c8 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Thu, 2 Dec 2010 17:27:36 -0800 Subject: Move guts of gr-run-waveform into gnuradio/run-waveform.scm --- gnuradio-core/src/guile/Makefile.am | 1 + 1 file changed, 1 insertion(+) (limited to 'gnuradio-core/src/guile/Makefile.am') diff --git a/gnuradio-core/src/guile/Makefile.am b/gnuradio-core/src/guile/Makefile.am index 4e12b646d..50d46411a 100644 --- a/gnuradio-core/src/guile/Makefile.am +++ b/gnuradio-core/src/guile/Makefile.am @@ -41,6 +41,7 @@ nobase_guile_DATA = \ gnuradio/export-safely.scm \ gnuradio/runtime-shim.scm \ gnuradio/waveform.scm \ + gnuradio/run-waveform.scm \ gnuradio/test-suite/guile-test \ gnuradio/test-suite/lib.scm -- cgit From cef9e8f38edb3f6aaea811fa04cfeebdbf26ba59 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Thu, 2 Dec 2010 21:21:41 -0800 Subject: Moved contents of gr-guile into gnuradio-core/src/guile and removed gr-guile. Passes distcheck. --- gnuradio-core/src/guile/Makefile.am | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnuradio-core/src/guile/Makefile.am') 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 -- cgit From 9bc62cca21a0a171cbc220419af91b3d8f7e333b Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Fri, 3 Dec 2010 14:08:07 -0800 Subject: Add "shims" for booting (mostly) from magic file system --- gnuradio-core/src/guile/Makefile.am | 1 + 1 file changed, 1 insertion(+) (limited to 'gnuradio-core/src/guile/Makefile.am') diff --git a/gnuradio-core/src/guile/Makefile.am b/gnuradio-core/src/guile/Makefile.am index 447500b46..cebef89f1 100644 --- a/gnuradio-core/src/guile/Makefile.am +++ b/gnuradio-core/src/guile/Makefile.am @@ -39,6 +39,7 @@ SUBDIRS = example-waveforms # gnuradio/runtime-shim implements "guile friendly" versions of connect & disconnect. nobase_guile_DATA = \ + +boot+/ice-9/boot-9.scm \ Swig/common.scm \ gnuradio/core.scm \ gnuradio/export-safely.scm \ -- cgit From 63728823a570a305a18d462dae2d07ba77d520fd Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Fri, 3 Dec 2010 14:32:15 -0800 Subject: Revert "Add "shims" for booting (mostly) from magic file system" This reverts commit 9bc62cca21a0a171cbc220419af91b3d8f7e333b. This stragegy didn't work. Our new gsubrs have not yet be defined when the ice-9/boot-9.scm code is loaded. --- gnuradio-core/src/guile/Makefile.am | 1 - 1 file changed, 1 deletion(-) (limited to 'gnuradio-core/src/guile/Makefile.am') diff --git a/gnuradio-core/src/guile/Makefile.am b/gnuradio-core/src/guile/Makefile.am index cebef89f1..447500b46 100644 --- a/gnuradio-core/src/guile/Makefile.am +++ b/gnuradio-core/src/guile/Makefile.am @@ -39,7 +39,6 @@ SUBDIRS = example-waveforms # gnuradio/runtime-shim implements "guile friendly" versions of connect & disconnect. nobase_guile_DATA = \ - +boot+/ice-9/boot-9.scm \ Swig/common.scm \ gnuradio/core.scm \ gnuradio/export-safely.scm \ -- cgit From 67c77e22564fbd9cf4543ff939495b3259b3818c Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Fri, 10 Dec 2010 16:12:04 -0800 Subject: Add new Guile gsubr that loads shared libraries using the equivalent of the RTLD_GLOBAL flag. This is part of a work-around for swig bug: 1863647 http://sourceforge.net/tracker/index.php?func=detail&aid=1863647&group_id=1645&atid=101645 --- gnuradio-core/src/guile/Makefile.am | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'gnuradio-core/src/guile/Makefile.am') diff --git a/gnuradio-core/src/guile/Makefile.am b/gnuradio-core/src/guile/Makefile.am index 447500b46..b78225f4d 100644 --- a/gnuradio-core/src/guile/Makefile.am +++ b/gnuradio-core/src/guile/Makefile.am @@ -60,4 +60,14 @@ GUILE_TESTS = \ CLEANFILES = guile.log + +scmlibdir = $(libdir) +scmdir = $(guiledir) + +scmlib_LTLIBRARIES = libguile-gnuradio-dynl-global.la + +libguile_gnuradio_dynl_global_la_SOURCES = dynl-global.c +libguile_gnuradio_dynl_global_la_CPPFLAGS = $(GUILE_CFLAGS) +libguile_gnuradio_dynl_global_la_LIBADD = $(GUILE_LIBS) + endif -- cgit From 16416305bf6dc7879b81c6b86568a5597d8d5ab0 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Thu, 30 Dec 2010 13:50:11 -0800 Subject: Create and install gr-run-waveform-script, and symlink to it when installed. --- gnuradio-core/src/guile/Makefile.am | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'gnuradio-core/src/guile/Makefile.am') diff --git a/gnuradio-core/src/guile/Makefile.am b/gnuradio-core/src/guile/Makefile.am index b78225f4d..a74037ae7 100644 --- a/gnuradio-core/src/guile/Makefile.am +++ b/gnuradio-core/src/guile/Makefile.am @@ -31,6 +31,10 @@ EXTRA_DIST += \ SUBDIRS = example-waveforms + +bin_SCRIPTS = \ + gr-run-waveform-script + # These are the hand-coded guile files for gnuradio-core. # # Swig/common.scm is glue that's required for the goops wrappers. @@ -42,10 +46,9 @@ nobase_guile_DATA = \ Swig/common.scm \ gnuradio/core.scm \ gnuradio/export-safely.scm \ + gnuradio/run-waveform.scm \ 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 @@ -70,4 +73,9 @@ libguile_gnuradio_dynl_global_la_SOURCES = dynl-global.c libguile_gnuradio_dynl_global_la_CPPFLAGS = $(GUILE_CFLAGS) libguile_gnuradio_dynl_global_la_LIBADD = $(GUILE_LIBS) +# Create a symlink from gr-run-waveform-script to gr-run-waveform +install-exec-hook: + -$(RM) $(bindir)/gr-run-waveform + (cd $(bindir) && $(LN_S) gr-run-waveform-script gr-run-waveform) + endif -- cgit From 66768f6ec30edbc2cf481e16b92a387b483dde6c Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Thu, 30 Dec 2010 15:23:59 -0800 Subject: Create symlink using install-exec-local, not install-exec-hook. Also rm the symlink using uninstall-local. Passes distcheck. --- gnuradio-core/src/guile/Makefile.am | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'gnuradio-core/src/guile/Makefile.am') diff --git a/gnuradio-core/src/guile/Makefile.am b/gnuradio-core/src/guile/Makefile.am index a74037ae7..122f05d97 100644 --- a/gnuradio-core/src/guile/Makefile.am +++ b/gnuradio-core/src/guile/Makefile.am @@ -28,10 +28,6 @@ EXTRA_DIST += \ $(nobase_guile_DATA) \ $(GUILE_TESTS) - -SUBDIRS = example-waveforms - - bin_SCRIPTS = \ gr-run-waveform-script @@ -74,8 +70,11 @@ libguile_gnuradio_dynl_global_la_CPPFLAGS = $(GUILE_CFLAGS) libguile_gnuradio_dynl_global_la_LIBADD = $(GUILE_LIBS) # Create a symlink from gr-run-waveform-script to gr-run-waveform -install-exec-hook: - -$(RM) $(bindir)/gr-run-waveform - (cd $(bindir) && $(LN_S) gr-run-waveform-script gr-run-waveform) +install-exec-local: + -$(RM) $(DESTDIR)$(bindir)/gr-run-waveform + (cd $(DESTDIR)$(bindir) && $(LN_S) gr-run-waveform-script gr-run-waveform) + +uninstall-local: + -$(RM) $(DESTDIR)$(bindir)/gr-run-waveform endif -- cgit