From c31f12f2dee7b42d327f85bbc5a9830735d05ec6 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Thu, 25 Nov 2010 11:27:36 -0700 Subject: add initial (no guile yet standalone app) --- gr-run-waveform/Makefile.am | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 gr-run-waveform/Makefile.am (limited to 'gr-run-waveform/Makefile.am') diff --git a/gr-run-waveform/Makefile.am b/gr-run-waveform/Makefile.am new file mode 100644 index 000000000..de820ee48 --- /dev/null +++ b/gr-run-waveform/Makefile.am @@ -0,0 +1,31 @@ +# +# Copyright 2004,2008,2009 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. +# + +ACLOCAL_AMFLAGS = -I config +DIST_SUBDIRS = config + +bin_PROGRAMS = run_waveform + +run_waveform_SOURCES = run_waveform.cc +run_waveform_CPPFLAGS = $(GUILE_CFLAGS) +run_waveform_LDADD = $(GUILE_LIBS) + +DISTCLEANFILES = gr-run-waveform.tar.gz -- cgit From 860164ebdb0dd76ce70ad912a8d2ebdd768e8329 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Thu, 25 Nov 2010 12:50:11 -0700 Subject: pass in srcdir so we can find our data file. --- gr-run-waveform/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gr-run-waveform/Makefile.am') diff --git a/gr-run-waveform/Makefile.am b/gr-run-waveform/Makefile.am index de820ee48..2e0b4c3ae 100644 --- a/gr-run-waveform/Makefile.am +++ b/gr-run-waveform/Makefile.am @@ -25,7 +25,7 @@ DIST_SUBDIRS = config bin_PROGRAMS = run_waveform run_waveform_SOURCES = run_waveform.cc -run_waveform_CPPFLAGS = $(GUILE_CFLAGS) +run_waveform_CPPFLAGS = $(GUILE_CFLAGS) -DSRCDIR=\"$(srcdir)\" run_waveform_LDADD = $(GUILE_LIBS) DISTCLEANFILES = gr-run-waveform.tar.gz -- cgit From e3ec22b15908d1a654c75c4106eb30efec5b0cf5 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Thu, 25 Nov 2010 20:34:56 -0800 Subject: Add gen-xyzzy, a tool to build the "magic fake filesystem" --- gr-run-waveform/Makefile.am | 1 + 1 file changed, 1 insertion(+) (limited to 'gr-run-waveform/Makefile.am') diff --git a/gr-run-waveform/Makefile.am b/gr-run-waveform/Makefile.am index 2e0b4c3ae..c8c207d1a 100644 --- a/gr-run-waveform/Makefile.am +++ b/gr-run-waveform/Makefile.am @@ -21,6 +21,7 @@ ACLOCAL_AMFLAGS = -I config DIST_SUBDIRS = config +EXTRA_DIST = gen-xyzzy bin_PROGRAMS = run_waveform -- cgit From 922bc95950787d74265cc68e572dba331753f6b2 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Fri, 26 Nov 2010 11:22:18 -0700 Subject: add test case and new XYZZY class files. --- gr-run-waveform/Makefile.am | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'gr-run-waveform/Makefile.am') diff --git a/gr-run-waveform/Makefile.am b/gr-run-waveform/Makefile.am index c8c207d1a..dc402e109 100644 --- a/gr-run-waveform/Makefile.am +++ b/gr-run-waveform/Makefile.am @@ -23,10 +23,27 @@ ACLOCAL_AMFLAGS = -I config DIST_SUBDIRS = config EXTRA_DIST = gen-xyzzy +# build the standalone waveform application bin_PROGRAMS = run_waveform -run_waveform_SOURCES = run_waveform.cc -run_waveform_CPPFLAGS = $(GUILE_CFLAGS) -DSRCDIR=\"$(srcdir)\" +# A unit test case for the XYZZY class +check_PROGRAMS = test_xyzzy +test_xyzzy_SOURCES = test_xyzzy.cc xyzzy.cc +test_xyzzy_CPPFLAGS = $(GUILE_CFLAGS) \ + -DSRCDIR=\"$(srcdir)\" \ + -DPKGLIBDIR=\"$(pkglibdir)\" + +# Don't install the internal header +noinst_HEADERS = xyzzy.h + +# The standalone waveform application +run_waveform_SOURCES = run_waveform.cc xyzzy.cc +run_waveform_CPPFLAGS = $(GUILE_CFLAGS) \ + -DSRCDIR=\"$(srcdir)\" \ + -DPKGLIBDIR=\"$(pkglibdir)\" +# Uncommenting this force make to statically link in the guile library. +# Note that this will fail to link it you don't have libguile.a. +# run_waveform_LDFLAGS = -static run_waveform_LDADD = $(GUILE_LIBS) DISTCLEANFILES = gr-run-waveform.tar.gz -- cgit From d9f4d83886cc19eb10808e85ac3785779b3000f1 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Fri, 26 Nov 2010 16:00:21 -0700 Subject: pass in the data dir too --- gr-run-waveform/Makefile.am | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gr-run-waveform/Makefile.am') diff --git a/gr-run-waveform/Makefile.am b/gr-run-waveform/Makefile.am index dc402e109..5168e44dd 100644 --- a/gr-run-waveform/Makefile.am +++ b/gr-run-waveform/Makefile.am @@ -31,7 +31,7 @@ check_PROGRAMS = test_xyzzy test_xyzzy_SOURCES = test_xyzzy.cc xyzzy.cc test_xyzzy_CPPFLAGS = $(GUILE_CFLAGS) \ -DSRCDIR=\"$(srcdir)\" \ - -DPKGLIBDIR=\"$(pkglibdir)\" + -DDATAROOTDIR=\"$(datarootdir)\" # Don't install the internal header noinst_HEADERS = xyzzy.h @@ -40,7 +40,8 @@ noinst_HEADERS = xyzzy.h run_waveform_SOURCES = run_waveform.cc xyzzy.cc run_waveform_CPPFLAGS = $(GUILE_CFLAGS) \ -DSRCDIR=\"$(srcdir)\" \ - -DPKGLIBDIR=\"$(pkglibdir)\" + -DPKGLIBDIR=\"$(pkglibdir)\" \ + -DDATAROOTDIR=\"$(datarootdir)\" # Uncommenting this force make to statically link in the guile library. # Note that this will fail to link it you don't have libguile.a. # run_waveform_LDFLAGS = -static -- cgit From e3b28ef55710ba40139921e50874b64a8089b7ef Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Fri, 26 Nov 2010 19:44:46 -0700 Subject: link the guile libs into the test cases --- gr-run-waveform/Makefile.am | 1 + 1 file changed, 1 insertion(+) (limited to 'gr-run-waveform/Makefile.am') diff --git a/gr-run-waveform/Makefile.am b/gr-run-waveform/Makefile.am index 5168e44dd..13db3105d 100644 --- a/gr-run-waveform/Makefile.am +++ b/gr-run-waveform/Makefile.am @@ -32,6 +32,7 @@ test_xyzzy_SOURCES = test_xyzzy.cc xyzzy.cc test_xyzzy_CPPFLAGS = $(GUILE_CFLAGS) \ -DSRCDIR=\"$(srcdir)\" \ -DDATAROOTDIR=\"$(datarootdir)\" +test_xyzzy_LDADD = $(GUILE_LIBS) # Don't install the internal header noinst_HEADERS = xyzzy.h -- cgit From 93f9a98efb8dbfe48ba6cbe8325969e97fe840da Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Sat, 27 Nov 2010 11:30:00 -0700 Subject: build the generated filesystem and install it. Build libpath.h, needed by xyzzy-load.c to get it's path definitions. --- gr-run-waveform/Makefile.am | 67 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 63 insertions(+), 4 deletions(-) (limited to 'gr-run-waveform/Makefile.am') diff --git a/gr-run-waveform/Makefile.am b/gr-run-waveform/Makefile.am index 13db3105d..a2040ec66 100644 --- a/gr-run-waveform/Makefile.am +++ b/gr-run-waveform/Makefile.am @@ -21,24 +21,37 @@ ACLOCAL_AMFLAGS = -I config DIST_SUBDIRS = config -EXTRA_DIST = gen-xyzzy +EXTRA_DIST = gen-xyzzy load.x # build the standalone waveform application bin_PROGRAMS = run_waveform +# Rather than build a library, we just use a variable so the same code +# can be used in test cases, as well as the run-waveform application. +SRCS = xyzzy.cc # xyzzy-load.c + +# This is where the data file created by gen-xyzzy gets installed. This file +# is needed by run-waveform and the test case. +filesystemdir = $(datarootdir)/gnuradio/gr-run-waveform + +# libpath is to support xyzzy-load.c, filesystem.dat is the data file +BUILT_SOURCES = libpath.h filesystem.dat +dist_filesystem_DATA = filesystem.dat + # A unit test case for the XYZZY class check_PROGRAMS = test_xyzzy -test_xyzzy_SOURCES = test_xyzzy.cc xyzzy.cc +test_xyzzy_SOURCES = test_xyzzy.cc $(SRCS) test_xyzzy_CPPFLAGS = $(GUILE_CFLAGS) \ -DSRCDIR=\"$(srcdir)\" \ -DDATAROOTDIR=\"$(datarootdir)\" test_xyzzy_LDADD = $(GUILE_LIBS) +test_xyzzy_DEPENDENCIES = $(BUILT_SOURCES) # Don't install the internal header noinst_HEADERS = xyzzy.h # The standalone waveform application -run_waveform_SOURCES = run_waveform.cc xyzzy.cc +run_waveform_SOURCES = run_waveform.cc $(SRCS) run_waveform_CPPFLAGS = $(GUILE_CFLAGS) \ -DSRCDIR=\"$(srcdir)\" \ -DPKGLIBDIR=\"$(pkglibdir)\" \ @@ -47,5 +60,51 @@ run_waveform_CPPFLAGS = $(GUILE_CFLAGS) \ # Note that this will fail to link it you don't have libguile.a. # run_waveform_LDFLAGS = -static run_waveform_LDADD = $(GUILE_LIBS) +run_waveform_DEPENDENCIES = $(BUILT_SOURCES) + +DISTCLEANFILES = gr-run-waveform.tar.gz libpath.h filesystem.dat + +libpath.h: $(srcdir)/Makefile.in $(top_builddir)/config.status + @echo "Generating libpath.h..." + @rm -f libpath.tmp + @echo '/* generated by Makefile */' > libpath.tmp + @echo '#define SCM_PKGDATA_DIR "$(pkgdatadir)"' >> libpath.tmp + @echo '#define SCM_LIBRARY_DIR "$(pkgdatadir)/$(GUILE_EFFECTIVE_VERSION)"'>>libpath.tmp + @echo '#define SCM_SITE_DIR "$(pkgdatadir)/site"' >> libpath.tmp + @echo '#define SCM_BUILD_INFO { \' >> libpath.tmp + @echo ' { "srcdir", "'"`cd @srcdir@; pwd`"'" }, \' >> libpath.tmp + @echo ' { "top_srcdir", "@top_srcdir_absolute@" }, \' >> libpath.tmp + @echo ' { "prefix", "@prefix@" }, \' >> libpath.tmp + @echo ' { "exec_prefix", "@exec_prefix@" }, \' >> libpath.tmp + @echo ' { "bindir", "@bindir@" }, \' >> libpath.tmp + @echo ' { "sbindir", "@sbindir@" }, \' >> libpath.tmp + @echo ' { "libexecdir", "@libexecdir@" }, \' >> libpath.tmp + @echo ' { "datadir", "@datadir@" }, \' >> libpath.tmp + @echo ' { "sysconfdir", "@sysconfdir@" }, \' >> libpath.tmp + @echo ' { "sharedstatedir", "@sharedstatedir@" }, \' >> libpath.tmp + @echo ' { "localstatedir", "@localstatedir@" }, \' >> libpath.tmp + @echo ' { "libdir", "@libdir@" }, \' >> libpath.tmp + @echo ' { "infodir", "@infodir@" }, \' >> libpath.tmp + @echo ' { "mandir", "@mandir@" }, \' >> libpath.tmp + @echo ' { "includedir", "@includedir@" }, \' >> libpath.tmp + @echo ' { "pkgdatadir", "$(datadir)/@PACKAGE@" }, \' >> libpath.tmp + @echo ' { "pkglibdir", "$(libdir)/@PACKAGE@" }, \' >> libpath.tmp + @echo ' { "pkgincludedir", "$(includedir)/@PACKAGE@" }, \' \ + >> libpath.tmp + @echo ' { "guileversion", "@GUILE_VERSION@" }, \' >> libpath.tmp + @echo ' { "libguileinterface", "@LIBGUILE_INTERFACE@" }, \' \ + >> libpath.tmp + @echo ' { "LIBS", "@GUILE_LIBS@" }, \' >> libpath.tmp + @echo ' { "CFLAGS", "@GUILE_CFLAGS@" }, \' >> libpath.tmp + @echo ' { "buildstamp", "'"`date`"'" }, \' >> libpath.tmp + @echo '}' >> libpath.tmp + @mv libpath.tmp libpath.h -DISTCLEANFILES = gr-run-waveform.tar.gz +# Typical usage: +# gen-xyzzy -o filesystem.dat /usr/share/guile/1.8 /usr/local/share/guile/site +# Where /usr/share/guile points to the system guile installation and +# /usr/local/share/guile/site points to the GNU Radio installed guile files. Note +# that this requires GNU Radio to be installed before the outout will be correct. +filesystem.dat: + -$(RM) -f filesystem.dat + $(PYTHON) $(srcdir)/gen-xyzzy $(GUILE_INSTALL_PATH) $(datarootdir)/guile/site > filesystem.dat -- cgit From 66a68e3c4710a26cab8d5d586b9e9bacd1d4761e Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Sat, 27 Nov 2010 16:13:42 -0700 Subject: move the contents of load.x into the source file. --- gr-run-waveform/Makefile.am | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gr-run-waveform/Makefile.am') diff --git a/gr-run-waveform/Makefile.am b/gr-run-waveform/Makefile.am index a2040ec66..a6e237bc4 100644 --- a/gr-run-waveform/Makefile.am +++ b/gr-run-waveform/Makefile.am @@ -21,26 +21,26 @@ ACLOCAL_AMFLAGS = -I config DIST_SUBDIRS = config -EXTRA_DIST = gen-xyzzy load.x +EXTRA_DIST = gen-xyzzy # build the standalone waveform application bin_PROGRAMS = run_waveform # Rather than build a library, we just use a variable so the same code # can be used in test cases, as well as the run-waveform application. -SRCS = xyzzy.cc # xyzzy-load.c +SRCS = xyzzy.cc xyzzy-load.c # This is where the data file created by gen-xyzzy gets installed. This file # is needed by run-waveform and the test case. filesystemdir = $(datarootdir)/gnuradio/gr-run-waveform -# libpath is to support xyzzy-load.c, filesystem.dat is the data file +# libpath is to support xyzzy-load.cc, filesystem.dat is the data file BUILT_SOURCES = libpath.h filesystem.dat dist_filesystem_DATA = filesystem.dat # A unit test case for the XYZZY class check_PROGRAMS = test_xyzzy -test_xyzzy_SOURCES = test_xyzzy.cc $(SRCS) +test_xyzzy_SOURCES = test_xyzzy.cc xyzzy.cc xyzzy-load.c #$(SRCS) test_xyzzy_CPPFLAGS = $(GUILE_CFLAGS) \ -DSRCDIR=\"$(srcdir)\" \ -DDATAROOTDIR=\"$(datarootdir)\" @@ -107,4 +107,4 @@ libpath.h: $(srcdir)/Makefile.in $(top_builddir)/config.status # that this requires GNU Radio to be installed before the outout will be correct. filesystem.dat: -$(RM) -f filesystem.dat - $(PYTHON) $(srcdir)/gen-xyzzy $(GUILE_INSTALL_PATH) $(datarootdir)/guile/site > filesystem.dat + python $(srcdir)/gen-xyzzy $(GUILE_INSTALL_PATH) $(datarootdir)/guile/site > filesystem.dat -- cgit From 1d130688b7178fd76db43c01bb629e8060a0cd4b Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Sun, 28 Nov 2010 10:41:37 -0700 Subject: use PYTHON from configure instead of hardcoding it. --- gr-run-waveform/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gr-run-waveform/Makefile.am') diff --git a/gr-run-waveform/Makefile.am b/gr-run-waveform/Makefile.am index a6e237bc4..26601c8c3 100644 --- a/gr-run-waveform/Makefile.am +++ b/gr-run-waveform/Makefile.am @@ -107,4 +107,4 @@ libpath.h: $(srcdir)/Makefile.in $(top_builddir)/config.status # that this requires GNU Radio to be installed before the outout will be correct. filesystem.dat: -$(RM) -f filesystem.dat - python $(srcdir)/gen-xyzzy $(GUILE_INSTALL_PATH) $(datarootdir)/guile/site > filesystem.dat + $(PYTHON) $(srcdir)/gen-xyzzy $(GUILE_INSTALL_PATH) $(datarootdir)/guile/site > filesystem.dat -- cgit From 925e377fac66324dd8fe07ccdd7fbb77ea47a856 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Sun, 28 Nov 2010 17:45:56 -0700 Subject: add new test case, similar to run-waveform --- gr-run-waveform/Makefile.am | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'gr-run-waveform/Makefile.am') diff --git a/gr-run-waveform/Makefile.am b/gr-run-waveform/Makefile.am index 26601c8c3..2098a0396 100644 --- a/gr-run-waveform/Makefile.am +++ b/gr-run-waveform/Makefile.am @@ -39,14 +39,21 @@ BUILT_SOURCES = libpath.h filesystem.dat dist_filesystem_DATA = filesystem.dat # A unit test case for the XYZZY class -check_PROGRAMS = test_xyzzy -test_xyzzy_SOURCES = test_xyzzy.cc xyzzy.cc xyzzy-load.c #$(SRCS) +check_PROGRAMS = test_xyzzy test_waveform +test_xyzzy_SOURCES = test_xyzzy.cc xyzzy.cc xyzzy-load.c test_xyzzy_CPPFLAGS = $(GUILE_CFLAGS) \ -DSRCDIR=\"$(srcdir)\" \ -DDATAROOTDIR=\"$(datarootdir)\" test_xyzzy_LDADD = $(GUILE_LIBS) test_xyzzy_DEPENDENCIES = $(BUILT_SOURCES) +test_waveform_SOURCES = test_waveform.cc xyzzy.cc xyzzy-load.c +test_waveform_CPPFLAGS = $(GUILE_CFLAGS) \ + -DSRCDIR=\"$(srcdir)\" \ + -DDATAROOTDIR=\"$(datarootdir)\" +test_waveform_LDADD = $(GUILE_LIBS) +test_waveform_DEPENDENCIES = $(BUILT_SOURCES) + # Don't install the internal header noinst_HEADERS = xyzzy.h -- cgit From f65e80377e43de3635bf1ced46005ba7e6e8a1a5 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Sun, 28 Nov 2010 19:07:27 -0700 Subject: rename the test case to use C inetead of C++ --- gr-run-waveform/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gr-run-waveform/Makefile.am') diff --git a/gr-run-waveform/Makefile.am b/gr-run-waveform/Makefile.am index 2098a0396..74d2153cf 100644 --- a/gr-run-waveform/Makefile.am +++ b/gr-run-waveform/Makefile.am @@ -47,7 +47,7 @@ test_xyzzy_CPPFLAGS = $(GUILE_CFLAGS) \ test_xyzzy_LDADD = $(GUILE_LIBS) test_xyzzy_DEPENDENCIES = $(BUILT_SOURCES) -test_waveform_SOURCES = test_waveform.cc xyzzy.cc xyzzy-load.c +test_waveform_SOURCES = test_waveform.c xyzzy.cc xyzzy-load.c test_waveform_CPPFLAGS = $(GUILE_CFLAGS) \ -DSRCDIR=\"$(srcdir)\" \ -DDATAROOTDIR=\"$(datarootdir)\" -- cgit From d821d126d852883671f22efe9d96b64829d665a1 Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Mon, 29 Nov 2010 07:57:57 -0700 Subject: add scheme test cases to EXTRA_DIST --- gr-run-waveform/Makefile.am | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gr-run-waveform/Makefile.am') diff --git a/gr-run-waveform/Makefile.am b/gr-run-waveform/Makefile.am index 74d2153cf..804be530d 100644 --- a/gr-run-waveform/Makefile.am +++ b/gr-run-waveform/Makefile.am @@ -21,7 +21,10 @@ ACLOCAL_AMFLAGS = -I config DIST_SUBDIRS = config -EXTRA_DIST = gen-xyzzy +EXTRA_DIST = gen-xyzzy \ + guile/readline.scm \ + guile/cat.scm \ + guile/simple.scm # build the standalone waveform application bin_PROGRAMS = run_waveform -- cgit From dd75f58e8b7efb061ff58b29bd1bfa7b306d3058 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Fri, 3 Dec 2010 12:12:55 -0800 Subject: Add filesystem.dat to CLEANFILES; other minor tweaks. --- gr-run-waveform/Makefile.am | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gr-run-waveform/Makefile.am') diff --git a/gr-run-waveform/Makefile.am b/gr-run-waveform/Makefile.am index 804be530d..4c9c7af19 100644 --- a/gr-run-waveform/Makefile.am +++ b/gr-run-waveform/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2004,2008,2009 Free Software Foundation, Inc. +# Copyright 2004,2008,2009,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -20,7 +20,7 @@ # ACLOCAL_AMFLAGS = -I config -DIST_SUBDIRS = config +SUBDIRS = config EXTRA_DIST = gen-xyzzy \ guile/readline.scm \ guile/cat.scm \ @@ -83,7 +83,7 @@ libpath.h: $(srcdir)/Makefile.in $(top_builddir)/config.status @echo '#define SCM_SITE_DIR "$(pkgdatadir)/site"' >> libpath.tmp @echo '#define SCM_BUILD_INFO { \' >> libpath.tmp @echo ' { "srcdir", "'"`cd @srcdir@; pwd`"'" }, \' >> libpath.tmp - @echo ' { "top_srcdir", "@top_srcdir_absolute@" }, \' >> libpath.tmp + @echo ' { "top_srcdir", "@abs_top_srcdir@" }, \' >> libpath.tmp @echo ' { "prefix", "@prefix@" }, \' >> libpath.tmp @echo ' { "exec_prefix", "@exec_prefix@" }, \' >> libpath.tmp @echo ' { "bindir", "@bindir@" }, \' >> libpath.tmp @@ -117,4 +117,7 @@ libpath.h: $(srcdir)/Makefile.in $(top_builddir)/config.status # that this requires GNU Radio to be installed before the outout will be correct. filesystem.dat: -$(RM) -f filesystem.dat + echo $(PYTHON) $(srcdir)/gen-xyzzy $(GUILE_INSTALL_PATH) $(datarootdir)/guile/site > filesystem.dat $(PYTHON) $(srcdir)/gen-xyzzy $(GUILE_INSTALL_PATH) $(datarootdir)/guile/site > filesystem.dat + +CLEANFILES = filesystem.dat -- cgit From 6f1a20284530b20ee3e318cd2fc6724e65b96a14 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Fri, 3 Dec 2010 14:32:07 -0800 Subject: Rename run_waveform.cc gr-run-waveform.cc --- gr-run-waveform/Makefile.am | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gr-run-waveform/Makefile.am') diff --git a/gr-run-waveform/Makefile.am b/gr-run-waveform/Makefile.am index 4c9c7af19..1c8305e1e 100644 --- a/gr-run-waveform/Makefile.am +++ b/gr-run-waveform/Makefile.am @@ -27,7 +27,7 @@ EXTRA_DIST = gen-xyzzy \ guile/simple.scm # build the standalone waveform application -bin_PROGRAMS = run_waveform +bin_PROGRAMS = gr-run-waveform # Rather than build a library, we just use a variable so the same code # can be used in test cases, as well as the run-waveform application. @@ -61,16 +61,16 @@ test_waveform_DEPENDENCIES = $(BUILT_SOURCES) noinst_HEADERS = xyzzy.h # The standalone waveform application -run_waveform_SOURCES = run_waveform.cc $(SRCS) -run_waveform_CPPFLAGS = $(GUILE_CFLAGS) \ +gr_run_waveform_SOURCES = gr-run-waveform.cc $(SRCS) +gr_run_waveform_CPPFLAGS = $(GUILE_CFLAGS) \ -DSRCDIR=\"$(srcdir)\" \ -DPKGLIBDIR=\"$(pkglibdir)\" \ -DDATAROOTDIR=\"$(datarootdir)\" # Uncommenting this force make to statically link in the guile library. # Note that this will fail to link it you don't have libguile.a. # run_waveform_LDFLAGS = -static -run_waveform_LDADD = $(GUILE_LIBS) -run_waveform_DEPENDENCIES = $(BUILT_SOURCES) +gr_run_waveform_LDADD = $(GUILE_LIBS) +gr_run_waveform_DEPENDENCIES = $(BUILT_SOURCES) DISTCLEANFILES = gr-run-waveform.tar.gz libpath.h filesystem.dat -- cgit From e89f4ac103fb6fa2013853389c449b102fcf2be8 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Fri, 3 Dec 2010 22:01:22 -0800 Subject: Initialize GUILE_LOAD_PATH and LTDL_LIBRARY_PATH based on prefix. --- gr-run-waveform/Makefile.am | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gr-run-waveform/Makefile.am') diff --git a/gr-run-waveform/Makefile.am b/gr-run-waveform/Makefile.am index 1c8305e1e..6371772c3 100644 --- a/gr-run-waveform/Makefile.am +++ b/gr-run-waveform/Makefile.am @@ -53,7 +53,10 @@ test_xyzzy_DEPENDENCIES = $(BUILT_SOURCES) test_waveform_SOURCES = test_waveform.c xyzzy.cc xyzzy-load.c test_waveform_CPPFLAGS = $(GUILE_CFLAGS) \ -DSRCDIR=\"$(srcdir)\" \ - -DDATAROOTDIR=\"$(datarootdir)\" + -DPKGLIBDIR=\"$(pkglibdir)\" \ + -DDATAROOTDIR=\"$(datarootdir)\" \ + -DLIBDIR=\"$(libdir)\" + test_waveform_LDADD = $(GUILE_LIBS) test_waveform_DEPENDENCIES = $(BUILT_SOURCES) @@ -65,7 +68,8 @@ gr_run_waveform_SOURCES = gr-run-waveform.cc $(SRCS) gr_run_waveform_CPPFLAGS = $(GUILE_CFLAGS) \ -DSRCDIR=\"$(srcdir)\" \ -DPKGLIBDIR=\"$(pkglibdir)\" \ - -DDATAROOTDIR=\"$(datarootdir)\" + -DDATAROOTDIR=\"$(datarootdir)\" \ + -DLIBDIR=\"$(libdir)\" # Uncommenting this force make to statically link in the guile library. # Note that this will fail to link it you don't have libguile.a. # run_waveform_LDFLAGS = -static -- cgit From f8701535f8674bac374c4c4f6f99b831e2d7c2f2 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Fri, 3 Dec 2010 22:08:46 -0800 Subject: Rename test_waveform.c test_embed.c --- gr-run-waveform/Makefile.am | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gr-run-waveform/Makefile.am') diff --git a/gr-run-waveform/Makefile.am b/gr-run-waveform/Makefile.am index 6371772c3..6a8bcfe9a 100644 --- a/gr-run-waveform/Makefile.am +++ b/gr-run-waveform/Makefile.am @@ -42,7 +42,7 @@ BUILT_SOURCES = libpath.h filesystem.dat dist_filesystem_DATA = filesystem.dat # A unit test case for the XYZZY class -check_PROGRAMS = test_xyzzy test_waveform +check_PROGRAMS = test_xyzzy test_embed test_xyzzy_SOURCES = test_xyzzy.cc xyzzy.cc xyzzy-load.c test_xyzzy_CPPFLAGS = $(GUILE_CFLAGS) \ -DSRCDIR=\"$(srcdir)\" \ @@ -50,15 +50,15 @@ test_xyzzy_CPPFLAGS = $(GUILE_CFLAGS) \ test_xyzzy_LDADD = $(GUILE_LIBS) test_xyzzy_DEPENDENCIES = $(BUILT_SOURCES) -test_waveform_SOURCES = test_waveform.c xyzzy.cc xyzzy-load.c -test_waveform_CPPFLAGS = $(GUILE_CFLAGS) \ +test_embed_SOURCES = test_embed.c xyzzy.cc xyzzy-load.c +test_embed_CPPFLAGS = $(GUILE_CFLAGS) \ -DSRCDIR=\"$(srcdir)\" \ -DPKGLIBDIR=\"$(pkglibdir)\" \ -DDATAROOTDIR=\"$(datarootdir)\" \ -DLIBDIR=\"$(libdir)\" -test_waveform_LDADD = $(GUILE_LIBS) -test_waveform_DEPENDENCIES = $(BUILT_SOURCES) +test_embed_LDADD = $(GUILE_LIBS) +test_embed_DEPENDENCIES = $(BUILT_SOURCES) # Don't install the internal header noinst_HEADERS = xyzzy.h -- cgit From 20141767bab8be4f81e58148ea806e032ca9f7c4 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Fri, 3 Dec 2010 22:21:41 -0800 Subject: Uhh, make that test_embed.cc --- gr-run-waveform/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gr-run-waveform/Makefile.am') diff --git a/gr-run-waveform/Makefile.am b/gr-run-waveform/Makefile.am index 6a8bcfe9a..3ab7d6fb2 100644 --- a/gr-run-waveform/Makefile.am +++ b/gr-run-waveform/Makefile.am @@ -50,7 +50,7 @@ test_xyzzy_CPPFLAGS = $(GUILE_CFLAGS) \ test_xyzzy_LDADD = $(GUILE_LIBS) test_xyzzy_DEPENDENCIES = $(BUILT_SOURCES) -test_embed_SOURCES = test_embed.c xyzzy.cc xyzzy-load.c +test_embed_SOURCES = test_embed.cc $(SRCS) test_embed_CPPFLAGS = $(GUILE_CFLAGS) \ -DSRCDIR=\"$(srcdir)\" \ -DPKGLIBDIR=\"$(pkglibdir)\" \ -- cgit From c744baf8140be7a2df5d34c972edfbfa81fe46f4 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Thu, 30 Dec 2010 11:47:55 -0800 Subject: Rename gr-run-waveform/gr-run-waveform.cc to gr-run-waveform-binary.cc This is the first step to allow the binary and the script versions of gr-run-waveform to co-exist. --- gr-run-waveform/Makefile.am | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gr-run-waveform/Makefile.am') diff --git a/gr-run-waveform/Makefile.am b/gr-run-waveform/Makefile.am index 3ab7d6fb2..903ab2246 100644 --- a/gr-run-waveform/Makefile.am +++ b/gr-run-waveform/Makefile.am @@ -27,7 +27,7 @@ EXTRA_DIST = gen-xyzzy \ guile/simple.scm # build the standalone waveform application -bin_PROGRAMS = gr-run-waveform +bin_PROGRAMS = gr-run-waveform-binary # Rather than build a library, we just use a variable so the same code # can be used in test cases, as well as the run-waveform application. @@ -64,8 +64,8 @@ test_embed_DEPENDENCIES = $(BUILT_SOURCES) noinst_HEADERS = xyzzy.h # The standalone waveform application -gr_run_waveform_SOURCES = gr-run-waveform.cc $(SRCS) -gr_run_waveform_CPPFLAGS = $(GUILE_CFLAGS) \ +gr_run_waveform_binary_SOURCES = gr-run-waveform-binary.cc $(SRCS) +gr_run_waveform_binary_CPPFLAGS = $(GUILE_CFLAGS) \ -DSRCDIR=\"$(srcdir)\" \ -DPKGLIBDIR=\"$(pkglibdir)\" \ -DDATAROOTDIR=\"$(datarootdir)\" \ @@ -73,8 +73,8 @@ gr_run_waveform_CPPFLAGS = $(GUILE_CFLAGS) \ # Uncommenting this force make to statically link in the guile library. # Note that this will fail to link it you don't have libguile.a. # run_waveform_LDFLAGS = -static -gr_run_waveform_LDADD = $(GUILE_LIBS) -gr_run_waveform_DEPENDENCIES = $(BUILT_SOURCES) +gr_run_waveform_binary_LDADD = $(GUILE_LIBS) +gr_run_waveform_binary_DEPENDENCIES = $(BUILT_SOURCES) DISTCLEANFILES = gr-run-waveform.tar.gz libpath.h filesystem.dat -- cgit From 48bd82280404c47a611cb5c852054f34e6ddb4f3 Mon Sep 17 00:00:00 2001 From: Eric Blossom Date: Thu, 30 Dec 2010 11:58:35 -0800 Subject: Add symlink to gr-run-waveform when installing gr-run-waveform-binary. --- gr-run-waveform/Makefile.am | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gr-run-waveform/Makefile.am') diff --git a/gr-run-waveform/Makefile.am b/gr-run-waveform/Makefile.am index 903ab2246..4313e9ec4 100644 --- a/gr-run-waveform/Makefile.am +++ b/gr-run-waveform/Makefile.am @@ -125,3 +125,9 @@ filesystem.dat: $(PYTHON) $(srcdir)/gen-xyzzy $(GUILE_INSTALL_PATH) $(datarootdir)/guile/site > filesystem.dat CLEANFILES = filesystem.dat + + +# Create a symlink from gr-run-waveform-binary to gr-run-waveform +install-exec-hook: + -$(RM) $(bindir)/gr-run-waveform + (cd $(bindir) && $(LN_S) gr-run-waveform-binary gr-run-waveform) -- 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. --- gr-run-waveform/Makefile.am | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gr-run-waveform/Makefile.am') diff --git a/gr-run-waveform/Makefile.am b/gr-run-waveform/Makefile.am index 4313e9ec4..75a05294d 100644 --- a/gr-run-waveform/Makefile.am +++ b/gr-run-waveform/Makefile.am @@ -128,6 +128,9 @@ CLEANFILES = filesystem.dat # Create a symlink from gr-run-waveform-binary to gr-run-waveform -install-exec-hook: - -$(RM) $(bindir)/gr-run-waveform - (cd $(bindir) && $(LN_S) gr-run-waveform-binary gr-run-waveform) +install-exec-local: + -$(RM) $(DESTDIR)$(bindir)/gr-run-waveform + (cd $(DESTDIR)$(bindir) && $(LN_S) gr-run-waveform-binary gr-run-waveform) + +uninstall-local: + -$(RM) $(DESTDIR)$(bindir)/gr-run-waveform -- cgit