diff options
| author | Tom Rondeau | 2011-01-04 12:04:00 -0500 |
|---|---|---|
| committer | Tom Rondeau | 2011-01-04 12:04:00 -0500 |
| commit | f7ba4702a44213e3bc03c41ea0c4eb1f02f230c7 (patch) | |
| tree | 48148f9db0b47ee14e0e7eea82e174cf9c82ebf4 /gr-run-waveform | |
| parent | 99c2b220675f3ca73ef5cf0a9ebe03706f813d61 (diff) | |
| parent | 66768f6ec30edbc2cf481e16b92a387b483dde6c (diff) | |
| download | gnuradio-f7ba4702a44213e3bc03c41ea0c4eb1f02f230c7.tar.gz gnuradio-f7ba4702a44213e3bc03c41ea0c4eb1f02f230c7.tar.bz2 gnuradio-f7ba4702a44213e3bc03c41ea0c4eb1f02f230c7.zip | |
Merge branch 'next' of gnuradio.org:gnuradio into next
Diffstat (limited to 'gr-run-waveform')
| -rw-r--r-- | gr-run-waveform/Makefile.am | 19 | ||||
| -rw-r--r-- | gr-run-waveform/configure.ac | 3 | ||||
| -rw-r--r-- | gr-run-waveform/gr-run-waveform-binary.cc (renamed from gr-run-waveform/gr-run-waveform.cc) | 0 |
3 files changed, 16 insertions, 6 deletions
diff --git a/gr-run-waveform/Makefile.am b/gr-run-waveform/Makefile.am index 3ab7d6fb2..75a05294d 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 @@ -125,3 +125,12 @@ 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-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 diff --git a/gr-run-waveform/configure.ac b/gr-run-waveform/configure.ac index e0964fa78..288c7bd1d 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 @@ -35,6 +35,7 @@ dnl AC_CANONICAL_TARGET dnl Find the the C++ compiler AC_PROG_CXX AM_PROG_CC_C_O +AC_PROG_LN_S GR_LIB64 dnl check for lib64 suffix after choosing compilers 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 |