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