summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Blossom2010-12-30 11:47:55 -0800
committerEric Blossom2010-12-30 16:01:45 -0800
commitc744baf8140be7a2df5d34c972edfbfa81fe46f4 (patch)
tree68860cfff04b1b98e7e7ae8fe738867024ff50b9
parentc6dfc4ce9227001a371457a39d0e44528b1f6827 (diff)
downloadgnuradio-c744baf8140be7a2df5d34c972edfbfa81fe46f4.tar.gz
gnuradio-c744baf8140be7a2df5d34c972edfbfa81fe46f4.tar.bz2
gnuradio-c744baf8140be7a2df5d34c972edfbfa81fe46f4.zip
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.
-rw-r--r--gr-run-waveform/Makefile.am10
-rw-r--r--gr-run-waveform/configure.ac2
-rw-r--r--gr-run-waveform/gr-run-waveform-binary.cc (renamed from gr-run-waveform/gr-run-waveform.cc)0
3 files changed, 6 insertions, 6 deletions
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
diff --git a/gr-run-waveform/configure.ac b/gr-run-waveform/configure.ac
index e0964fa78..ea7a06128 100644
--- a/gr-run-waveform/configure.ac
+++ b/gr-run-waveform/configure.ac
@@ -25,7 +25,7 @@ AC_CONFIG_AUX_DIR([.])
AC_CONFIG_HEADERS([grconfig.h])
AC_CONFIG_MACRO_DIR(config)
-AC_CONFIG_SRCDIR(gr-run-waveform.cc)
+AC_CONFIG_SRCDIR(gr-run-waveform-binary.cc)
AM_INIT_AUTOMAKE("gr-run-waveform", "0.1")
AC_CANONICAL_BUILD
diff --git a/gr-run-waveform/gr-run-waveform.cc b/gr-run-waveform/gr-run-waveform-binary.cc
index ac81b0eaa..ac81b0eaa 100644
--- a/gr-run-waveform/gr-run-waveform.cc
+++ b/gr-run-waveform/gr-run-waveform-binary.cc