[Commit-gnuradio] r9723 - in gnuradio/trunk: . grc/freedesktop grc/src/platforms/base grc/src/platforms/python

[jblum]

Author: jblum
Date: 2008-10-07 12:32:29 -0600 (Tue, 07 Oct 2008)
New Revision: 9723

Modified:
   gnuradio/trunk/configure.ac
   gnuradio/trunk/grc/freedesktop/Makefile.am
   gnuradio/trunk/grc/src/platforms/base/Makefile.am
   gnuradio/trunk/grc/src/platforms/python/Makefile.am
Log:
re-enable grc, passes distcheck

Modified: gnuradio/trunk/configure.ac
===================================================================
--- gnuradio/trunk/configure.ac 2008-10-06 02:39:21 UTC (rev 9722)
+++ gnuradio/trunk/configure.ac 2008-10-07 18:32:29 UTC (rev 9723)
@@ -97,6 +97,8 @@
 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_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

Modified: gnuradio/trunk/grc/freedesktop/Makefile.am
===================================================================
--- gnuradio/trunk/grc/freedesktop/Makefile.am  2008-10-06 02:39:21 UTC (rev 
9722)
+++ gnuradio/trunk/grc/freedesktop/Makefile.am  2008-10-07 18:32:29 UTC (rev 
9723)
@@ -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 @@
        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|@address@hidden|$(ourdatadir)|g' 
$(srcdir)/grc_setup_freedesktop.in > $@
 
+grc_setup_freedesktop: Makefile grc_setup_freedesktop.in
+       $(SED) -e 's|@address@hidden|$(ourdatadir)|g' $(srcdir)/address@hidden 
> $@
+
 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)

Modified: gnuradio/trunk/grc/src/platforms/base/Makefile.am
===================================================================
--- gnuradio/trunk/grc/src/platforms/base/Makefile.am   2008-10-06 02:39:21 UTC 
(rev 9722)
+++ gnuradio/trunk/grc/src/platforms/base/Makefile.am   2008-10-07 18:32:29 UTC 
(rev 9723)
@@ -34,15 +34,13 @@
        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|@address@hidden|$(PACKAGE)|g' \
                -e 's|@address@hidden|$(VERSION)|g' \
                -e 's|@address@hidden|$(grc_base_data_dir)|g' \
-       $(srcdir)/Constants.py.in > $@
+       $(srcdir)/address@hidden > $@
 
 EXTRA_DIST = $(srcdir)/Constants.py.in
 
-MOSTLYCLEANFILES = $(BUILT_SOURCES)
+MOSTLYCLEANFILES = Constants.py

Modified: gnuradio/trunk/grc/src/platforms/python/Makefile.am
===================================================================
--- gnuradio/trunk/grc/src/platforms/python/Makefile.am 2008-10-06 02:39:21 UTC 
(rev 9722)
+++ gnuradio/trunk/grc/src/platforms/python/Makefile.am 2008-10-07 18:32:29 UTC 
(rev 9723)
@@ -36,16 +36,14 @@
        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|@address@hidden|$(PYTHONW)|g' \
                -e 's|@address@hidden|$(grc_python_data_dir)|g' \
                -e 's|@address@hidden|$(grc_python_blocks_dir)|g' \
                -e 's|@address@hidden|$(gr_docdir)|g' \
-       $(srcdir)/Constants.py.in > $@
+       $(srcdir)/address@hidden > $@
 
 EXTRA_DIST = $(srcdir)/Constants.py.in
 
-MOSTLYCLEANFILES = $(BUILT_SOURCES)
+MOSTLYCLEANFILES = Constants.py