[Commit-gnuradio] r9373 - in gnuradio/branches/developers/jblum/grc: config grc grc/data grc/data/grc grc/data/grc_gnuradio grc/data/grc_gnuradio/blocks grc/src/grc grc/src/grc_gnuradio

[jblum]

Author: jblum
Date: 2008-08-22 17:34:57 -0600 (Fri, 22 Aug 2008)
New Revision: 9373

Added:
   gnuradio/branches/developers/jblum/grc/grc/Makefile.common
Removed:
   gnuradio/branches/developers/jblum/grc/grc/data/Makefile.common
Modified:
   gnuradio/branches/developers/jblum/grc/config/grc_gr_wxgui.m4
   gnuradio/branches/developers/jblum/grc/grc/data/Makefile.am
   gnuradio/branches/developers/jblum/grc/grc/data/grc/Makefile.am
   gnuradio/branches/developers/jblum/grc/grc/data/grc_gnuradio/Makefile.am
   
gnuradio/branches/developers/jblum/grc/grc/data/grc_gnuradio/blocks/Makefile.am
   gnuradio/branches/developers/jblum/grc/grc/src/grc/Makefile.am
   gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/Constants.py.in
   gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/Makefile.am
Log:
moved generation of constants.py

Modified: gnuradio/branches/developers/jblum/grc/config/grc_gr_wxgui.m4
===================================================================
--- gnuradio/branches/developers/jblum/grc/config/grc_gr_wxgui.m4       
2008-08-22 23:09:53 UTC (rev 9372)
+++ gnuradio/branches/developers/jblum/grc/config/grc_gr_wxgui.m4       
2008-08-22 23:34:57 UTC (rev 9373)
@@ -30,11 +30,11 @@
     dnl   no   : otherwise
     if test $passed = yes; then
         if ! ${PYTHON} -c 'import wx'; then
-           AC_MSG_RESULT([gr-wxgui requires wxPython, not found.])
+            AC_MSG_RESULT([gr-wxgui requires wxPython, not found.])
             passed=no
         fi
         if ! ${PYTHON} -c 'import numpy'; then
-           AC_MSG_RESULT([gr-wxgui requires numpy (Numeric Python), not 
found.])
+            AC_MSG_RESULT([gr-wxgui requires numpy (Numeric Python), not 
found.])
             passed=no
         fi
     fi

Copied: gnuradio/branches/developers/jblum/grc/grc/Makefile.common (from rev 
9372, gnuradio/branches/developers/jblum/grc/grc/data/Makefile.common)
===================================================================
--- gnuradio/branches/developers/jblum/grc/grc/Makefile.common                  
        (rev 0)
+++ gnuradio/branches/developers/jblum/grc/grc/Makefile.common  2008-08-22 
23:34:57 UTC (rev 9373)
@@ -0,0 +1,39 @@
+#
+# Copyright 2008 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+#
+
+include $(top_srcdir)/Makefile.common
+
+grc_data_prefix = @datadir@/${PACKAGE}/grc
+grc_data_dir = $(grc_data_prefix)/grc
+grc_gnuradio_data_dir = $(grc_data_prefix)/grc_gnuradio
+grc_gnuradio_blocks_dir = $(grc_data_prefix)/grc_gnuradio/blocks
+
+install-data-local:
+       $(mkinstalldirs) $(datadir)
+       $(foreach file, $(EXTRA_DIST), \
+               $(INSTALL_DATA) $(srcdir)/$(file) $(datadir)/$(file); \
+       )
+
+uninstall-local:
+       $(foreach file, $(EXTRA_DIST), \
+               $(RM) $(datadir)/$(file); \
+       )
+       $(RM) -fr $(datadir)

Modified: gnuradio/branches/developers/jblum/grc/grc/data/Makefile.am
===================================================================
--- gnuradio/branches/developers/jblum/grc/grc/data/Makefile.am 2008-08-22 
23:09:53 UTC (rev 9372)
+++ gnuradio/branches/developers/jblum/grc/grc/data/Makefile.am 2008-08-22 
23:34:57 UTC (rev 9373)
@@ -19,6 +19,6 @@
 # Boston, MA 02110-1301, USA.
 #
 
-include $(top_srcdir)/Makefile.common
+include $(top_srcdir)/grc/Makefile.common
 
 SUBDIRS = grc grc_gnuradio

Deleted: gnuradio/branches/developers/jblum/grc/grc/data/Makefile.common

Modified: gnuradio/branches/developers/jblum/grc/grc/data/grc/Makefile.am
===================================================================
--- gnuradio/branches/developers/jblum/grc/grc/data/grc/Makefile.am     
2008-08-22 23:09:53 UTC (rev 9372)
+++ gnuradio/branches/developers/jblum/grc/grc/data/grc/Makefile.am     
2008-08-22 23:34:57 UTC (rev 9373)
@@ -19,24 +19,13 @@
 # Boston, MA 02110-1301, USA.
 #
 
-include ../Makefile.common
+include $(top_srcdir)/grc/Makefile.common
 
-datadir = $(grc_data_prefix)/grc
-gen_file = ../../src/grc/Constants.py
+datadir = $(grc_data_dir)
 
-all: $(gen_file)
-
-$(gen_file): Makefile $(gen_file).in
-       sed \
-               -e 's|@address@hidden|@VERSION@|g' \
-               -e 's|@address@hidden|$(datadir)|g' \
-       address@hidden > $@
-
 EXTRA_DIST = \
        block_tree.dtd \
        flow_graph.dtd \
        grc-icon-256.png \
        grc-icon-256.svg \
        grc-icon-32.png
-
-MOSTLYCLEANFILES = $(gen_file)

Modified: 
gnuradio/branches/developers/jblum/grc/grc/data/grc_gnuradio/Makefile.am
===================================================================
--- gnuradio/branches/developers/jblum/grc/grc/data/grc_gnuradio/Makefile.am    
2008-08-22 23:09:53 UTC (rev 9372)
+++ gnuradio/branches/developers/jblum/grc/grc/data/grc_gnuradio/Makefile.am    
2008-08-22 23:34:57 UTC (rev 9373)
@@ -19,27 +19,14 @@
 # Boston, MA 02110-1301, USA.
 #
 
-include ../Makefile.common
+include $(top_srcdir)/grc/Makefile.common
 
 SUBDIRS = blocks
 
-datadir = $(grc_data_prefix)/grc_gnuradio
-docdir  = $(prefix)/share/doc/@address@hidden@VERSION@
-gen_file = ../../src/grc_gnuradio/Constants.py
+datadir = $(grc_gnuradio_data_dir)
 
-all: $(gen_file)
-
-$(gen_file): Makefile $(gen_file).in
-       sed \
-               -e 's|@address@hidden|$(PYTHONW)|g' \
-               -e 's|@address@hidden|$(datadir)|g' \
-               -e 's|@address@hidden|$(docdir)|g' \
-       address@hidden > $@
-
 EXTRA_DIST = \
        block.dtd \
        block_tree.xml \
        default_flow_graph.grc.xml \
        flow_graph.tmpl
-
-MOSTLYCLEANFILES = $(gen_file)

Modified: 
gnuradio/branches/developers/jblum/grc/grc/data/grc_gnuradio/blocks/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jblum/grc/grc/data/grc_gnuradio/blocks/Makefile.am 
    2008-08-22 23:09:53 UTC (rev 9372)
+++ 
gnuradio/branches/developers/jblum/grc/grc/data/grc_gnuradio/blocks/Makefile.am 
    2008-08-22 23:34:57 UTC (rev 9373)
@@ -19,9 +19,9 @@
 # Boston, MA 02110-1301, USA.
 #
 
-include ../../Makefile.common
+include $(top_srcdir)/grc/Makefile.common
 
-datadir = $(grc_data_prefix)/grc_gnuradio/blocks
+datadir = $(grc_gnuradio_blocks_dir)
 
 EXTRA_DIST = \
        audio_sink.xml \

Modified: gnuradio/branches/developers/jblum/grc/grc/src/grc/Makefile.am
===================================================================
--- gnuradio/branches/developers/jblum/grc/grc/src/grc/Makefile.am      
2008-08-22 23:09:53 UTC (rev 9372)
+++ gnuradio/branches/developers/jblum/grc/grc/src/grc/Makefile.am      
2008-08-22 23:34:57 UTC (rev 9373)
@@ -19,7 +19,7 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-include $(top_srcdir)/Makefile.common
+include $(top_srcdir)/grc/Makefile.common
 
 SUBDIRS = elements gui
 
@@ -36,3 +36,15 @@
        Preferences.py \
        StateCache.py \
        Utils.py
+
+gen_file = Constants.py
+
+all: $(gen_file)
+
+$(gen_file): Makefile $(gen_file).in
+       sed \
+               -e 's|@address@hidden|@VERSION@|g' \
+               -e 's|@address@hidden|$(grc_data_dir)|g' \
+       address@hidden > $@
+
+MOSTLYCLEANFILES = $(gen_file)

Modified: 
gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/Constants.py.in
===================================================================
--- gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/Constants.py.in 
2008-08-22 23:09:53 UTC (rev 9372)
+++ gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/Constants.py.in 
2008-08-22 23:34:57 UTC (rev 9373)
@@ -29,7 +29,7 @@
 #setup paths
 DOCS_DIR = os.path.join('@docdir@', 'xml')
 DATA_DIR = '@datadir@'
-BLOCKS_DIR = os.path.join(DATA_DIR, 'blocks')
+BLOCKS_DIR = '@blocksdir@'
 HIER_BLOCKS_LIB_DIR = os.path.join(os.path.expanduser('~'), '.grc_gnuradio')
 
 #file creation modes

Modified: 
gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/Makefile.am
===================================================================
--- gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/Makefile.am     
2008-08-22 23:09:53 UTC (rev 9372)
+++ gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/Makefile.am     
2008-08-22 23:34:57 UTC (rev 9373)
@@ -19,7 +19,7 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-include $(top_srcdir)/Makefile.common
+include $(top_srcdir)/grc/Makefile.common
 
 SUBDIRS = blks2 usrp utils wxgui
 
@@ -35,3 +35,18 @@
        Platform.py \
        Param.py \
        Port.py
+
+gen_file = Constants.py
+docdir = $(prefix)/share/doc/@address@hidden@VERSION@
+
+all: $(gen_file)
+
+$(gen_file): Makefile $(gen_file).in
+       sed \
+               -e 's|@address@hidden|$(PYTHONW)|g' \
+               -e 's|@address@hidden|$(grc_gnuradio_data_dir)|g' \
+               -e 's|@address@hidden|$(grc_gnuradio_blocks_dir)|g' \
+               -e 's|@address@hidden|$(docdir)|g' \
+       address@hidden > $@
+       
+MOSTLYCLEANFILES = $(gen_file)