re-enable grc, passes distcheck

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9723 221aa14e-8319-0410-a670-987f0aec2ac5

diff --git a/configure.ac b/configure.ac
index f6e618d1b4893f0e5a01fc546c3ebac146ea7712..13de26c611162ece36610bac0893795d66871b37 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -97,6 +97,8 @@ GR_SCRIPTING
 AC_CHECK_PROG([XMLTO],[xmlto],[yes],[])
 AM_CONDITIONAL([HAS_XMLTO], [test x$XMLTO = xyes])
 
+AC_PROG_SED
+
 dnl Checks for libraries.
 AC_CHECK_LIB(socket,socket)
 
@@ -297,7 +299,7 @@ GRC_GR_WXGUI
 GRC_GR_SOUNDER                 dnl this must come after GRC_USRP
 GRC_GR_UTILS                    dnl this must come after GRC_GR_WXGUI
 GRC_GNURADIO_EXAMPLES          dnl must come after all GRC_GR_*
-dnl GRC_GRC                    dnl breaks the build at r9698 ticket:298
+GRC_GRC
 
 # Each component is now either to be built, was skipped, will be
 # included from pre-installed libraries and includes, or failed

diff --git a/grc/freedesktop/Makefile.am b/grc/freedesktop/Makefile.am
index 3ec4ac5b2e56f8508547bc10790fafc51a0be32d..3755f2e1ef43228a34f14d84484d08a9f598a2dd 100644 (file)
--- a/grc/freedesktop/Makefile.am
+++ b/grc/freedesktop/Makefile.am
@@ -22,6 +22,7 @@
 include $(top_srcdir)/grc/Makefile.inc
 
 ourdatadir = $(grc_data_prefix)/freedesktop
+
 dist_ourdata_DATA = \
        grc-icon-256.png \
        grc-icon-128.png \
@@ -33,14 +34,16 @@ dist_ourdata_DATA = \
        gnuradio-usrp_diagnostics.desktop
 
 dist_bin_SCRIPTS = grc_setup_freedesktop
-BUILT_SOURCES = grc_setup_freedesktop
-grc_setup_freedesktop: Makefile $(srcdir)/grc_setup_freedesktop.in
-       sed -e 's|@SRCDIR[@]|$(ourdatadir)|g' $(srcdir)/grc_setup_freedesktop.in > $@
+
+grc_setup_freedesktop: Makefile grc_setup_freedesktop.in
+       $(SED) -e 's|@SRCDIR[@]|$(ourdatadir)|g' $(srcdir)/$@.in > $@
 
 EXTRA_DIST = $(srcdir)/grc_setup_freedesktop.in
-MOSTLYCLEANFILES = $(BUILT_SOURCES)
+
+MOSTLYCLEANFILES = grc_setup_freedesktop
 
 install-data-hook: grc_setup_freedesktop
-       grc_setup_freedesktop install
+       bash $(srcdir)/grc_setup_freedesktop install $(srcdir)
+
 uninstall-hook: grc_setup_freedesktop
        bash $(srcdir)/grc_setup_freedesktop uninstall $(srcdir)

diff --git a/grc/src/platforms/base/Makefile.am b/grc/src/platforms/base/Makefile.am
index fbfc87e00d67854f73ee96d21c42852f7e742b2d..4cc08b03693ecb8f852f55fe783164d1246abde4 100644 (file)
--- a/grc/src/platforms/base/Makefile.am
+++ b/grc/src/platforms/base/Makefile.am
@@ -34,15 +34,13 @@ ourpython_PYTHON = \
        Port.py \
        __init__.py
 
-BUILT_SOURCES = Constants.py
-
-Constants.py: Makefile $(srcdir)/Constants.py.in
-       sed \
+Constants.py: Makefile Constants.py.in
+       $(SED) \
                -e 's|@PACKAGE[@]|$(PACKAGE)|g' \
                -e 's|@VERSION[@]|$(VERSION)|g' \
                -e 's|@datadir[@]|$(grc_base_data_dir)|g' \
-       $(srcdir)/Constants.py.in > $@
+       $(srcdir)/$@.in > $@
 
 EXTRA_DIST = $(srcdir)/Constants.py.in
 
-MOSTLYCLEANFILES = $(BUILT_SOURCES)
+MOSTLYCLEANFILES = Constants.py

diff --git a/grc/src/platforms/python/Makefile.am b/grc/src/platforms/python/Makefile.am
index 13b5f77d854de640a722f23b8621b1a45c60582c..d50ed54ed5bba0de99feaa2b6f48aa9cd14ab473 100644 (file)
--- a/grc/src/platforms/python/Makefile.am
+++ b/grc/src/platforms/python/Makefile.am
@@ -36,16 +36,14 @@ ourpython_PYTHON = \
        Port.py \
        __init__.py
 
-BUILT_SOURCES = Constants.py
-
-Constants.py: Makefile $(srcdir)/Constants.py.in
-       sed \
+Constants.py: Makefile Constants.py.in
+       $(SED) \
                -e 's|@PYTHONW[@]|$(PYTHONW)|g' \
                -e 's|@datadir[@]|$(grc_python_data_dir)|g' \
                -e 's|@blocksdir[@]|$(grc_python_blocks_dir)|g' \
                -e 's|@docdir[@]|$(gr_docdir)|g' \
-       $(srcdir)/Constants.py.in > $@
+       $(srcdir)/$@.in > $@
 
 EXTRA_DIST = $(srcdir)/Constants.py.in
 
-MOSTLYCLEANFILES = $(BUILT_SOURCES)
+MOSTLYCLEANFILES = Constants.py