commit-gnuradio
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commit-gnuradio] r9337 - in gnuradio/branches/developers/jblum/grc: . c

From: jblum
Subject: [Commit-gnuradio] r9337 - in gnuradio/branches/developers/jblum/grc: . config grc grc/src grc/src/grc grc/src/grc/elements grc/src/grc/gui grc/src/grc/gui/elements grc/src/grc_gnuradio grc/src/grc_gnuradio/blks2 grc/src/grc_gnuradio/usrp grc/src/grc_gnuradio/utils grc/src/grc_gnuradio/wxgui
Date: Tue, 19 Aug 2008 17:22:46 -0600 (MDT) 
Author: jblum
Date: 2008-08-19 17:22:45 -0600 (Tue, 19 Aug 2008)
New Revision: 9337

Added:
   gnuradio/branches/developers/jblum/grc/config/grc_grc.m4
   gnuradio/branches/developers/jblum/grc/grc/src/Makefile.am
Modified:
   gnuradio/branches/developers/jblum/grc/config/Makefile.am
   gnuradio/branches/developers/jblum/grc/configure.ac
   gnuradio/branches/developers/jblum/grc/grc/Makefile.am
   gnuradio/branches/developers/jblum/grc/grc/src/grc/Makefile.am
   gnuradio/branches/developers/jblum/grc/grc/src/grc/elements/Makefile.am
   gnuradio/branches/developers/jblum/grc/grc/src/grc/gui/Makefile.am
   gnuradio/branches/developers/jblum/grc/grc/src/grc/gui/elements/Makefile.am
   gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/Makefile.am
   gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/blks2/Makefile.am
   gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/usrp/Makefile.am
   gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/utils/Makefile.am
   gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/wxgui/Makefile.am
Log:
grc merge config

Modified: gnuradio/branches/developers/jblum/grc/config/Makefile.am
===================================================================
--- gnuradio/branches/developers/jblum/grc/config/Makefile.am   2008-08-19 
23:09:56 UTC (rev 9336)
+++ gnuradio/branches/developers/jblum/grc/config/Makefile.am   2008-08-19 
23:22:45 UTC (rev 9337)
@@ -34,6 +34,7 @@
        grc_gcell.m4 \
        grc_gnuradio_core.m4 \
        grc_gnuradio_examples.m4 \
+       grc_grc.m4 \
        grc_gr_atsc.m4 \
        grc_gr_audio_alsa.m4 \
        grc_gr_audio_jack.m4 \

Added: gnuradio/branches/developers/jblum/grc/config/grc_grc.m4
===================================================================
--- gnuradio/branches/developers/jblum/grc/config/grc_grc.m4                    
        (rev 0)
+++ gnuradio/branches/developers/jblum/grc/config/grc_grc.m4    2008-08-19 
23:22:45 UTC (rev 9337)
@@ -0,0 +1,40 @@
+dnl Copyright 2008 Free Software Foundation, Inc.
+dnl 
+dnl This file is part of GNU Radio
+dnl 
+dnl GNU Radio is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 3, or (at your option)
+dnl any later version.
+dnl 
+dnl GNU Radio is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl 
+dnl You should have received a copy of the GNU General Public License
+dnl along with GNU Radio; see the file COPYING.  If not, write to
+dnl the Free Software Foundation, Inc., 51 Franklin Street,
+dnl Boston, MA 02110-1301, USA.
+
+AC_DEFUN([GRC_GRC],[
+    GRC_ENABLE(grc)
+
+       dnl GRC_CHECK_DEPENDENCY(grc, gnuradio-core)
+
+    AC_CONFIG_FILES([ \
+               grc/src/grc/gui/elements/Makefile \
+               grc/src/grc/gui/Makefile \
+               grc/src/grc/elements/Makefile \
+               grc/src/grc/Makefile \
+               grc/src/grc_gnuradio/usrp/Makefile \
+               grc/src/grc_gnuradio/blks2/Makefile \
+               grc/src/grc_gnuradio/utils/Makefile \
+               grc/src/grc_gnuradio/wxgui/Makefile \
+               grc/src/grc_gnuradio/Makefile \
+               grc/src/Makefile \
+               grc/Makefile \
+    ])
+
+    GRC_BUILD_CONDITIONAL(grc)
+])

Modified: gnuradio/branches/developers/jblum/grc/configure.ac
===================================================================
--- gnuradio/branches/developers/jblum/grc/configure.ac 2008-08-19 23:09:56 UTC 
(rev 9336)
+++ gnuradio/branches/developers/jblum/grc/configure.ac 2008-08-19 23:22:45 UTC 
(rev 9337)
@@ -270,6 +270,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 last
+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/branches/developers/jblum/grc/grc/Makefile.am
===================================================================
--- gnuradio/branches/developers/jblum/grc/grc/Makefile.am      2008-08-19 
23:09:56 UTC (rev 9336)
+++ gnuradio/branches/developers/jblum/grc/grc/Makefile.am      2008-08-19 
23:22:45 UTC (rev 9337)
@@ -19,24 +19,6 @@
 # Boston, MA 02110-1301, USA.
 #
 
-DOCS_URL = http://www.ece.jhu.edu/~jblum/downloads/grc_gnuradio_docs.tar.gz
-DOCS_DEST = /usr/local/share/doc/
+include $(top_srcdir)/Makefile.common
 
-all:
-       @echo Options: install, uninstall, docs_install, docs_uninstall
-
-install:
-       python setup.py install
-       rm -rf build
-
-uninstall:
-       rm -rf `python -c "import grc,os;print os.path.dirname(grc.__file__)"`
-       rm -rf `python -c "import grc_gnuradio,os;print 
os.path.dirname(grc_gnuradio.__file__)"`
-       rm -rf `which grc` `which usrp_diagnostics`
-
-docs_install:
-       mkdir -p $(DOCS_DEST)
-       wget $(DOCS_URL) -O - | tar -xzv -C $(DOCS_DEST)
-
-docs_uninstall:
-       rm -rf $(DOCS_DEST)grc*
+SUBDIRS = src

Added: gnuradio/branches/developers/jblum/grc/grc/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jblum/grc/grc/src/Makefile.am                  
        (rev 0)
+++ gnuradio/branches/developers/jblum/grc/grc/src/Makefile.am  2008-08-19 
23:22:45 UTC (rev 9337)
@@ -0,0 +1,24 @@
+#
+# 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
+
+SUBDIRS = grc grc_gnuradio

Modified: gnuradio/branches/developers/jblum/grc/grc/src/grc/Makefile.am
===================================================================
--- gnuradio/branches/developers/jblum/grc/grc/src/grc/Makefile.am      
2008-08-19 23:09:56 UTC (rev 9336)
+++ gnuradio/branches/developers/jblum/grc/grc/src/grc/Makefile.am      
2008-08-19 23:22:45 UTC (rev 9337)
@@ -23,8 +23,7 @@
 
 SUBDIRS = elements gui
 
-ourpythondir = grc
-ourlibdir = grc
+ourpythondir = $(pythondir)/grc
 
 ourpython_PYTHON = \
        __init__.py \

Modified: 
gnuradio/branches/developers/jblum/grc/grc/src/grc/elements/Makefile.am
===================================================================
--- gnuradio/branches/developers/jblum/grc/grc/src/grc/elements/Makefile.am     
2008-08-19 23:09:56 UTC (rev 9336)
+++ gnuradio/branches/developers/jblum/grc/grc/src/grc/elements/Makefile.am     
2008-08-19 23:22:45 UTC (rev 9337)
@@ -21,8 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
-ourpythondir = grc/elements
-ourlibdir = grc/elements
+ourpythondir = $(pythondir)/grc/elements
 
 ourpython_PYTHON = \
        __init__.py \

Modified: gnuradio/branches/developers/jblum/grc/grc/src/grc/gui/Makefile.am
===================================================================
--- gnuradio/branches/developers/jblum/grc/grc/src/grc/gui/Makefile.am  
2008-08-19 23:09:56 UTC (rev 9336)
+++ gnuradio/branches/developers/jblum/grc/grc/src/grc/gui/Makefile.am  
2008-08-19 23:22:45 UTC (rev 9337)
@@ -23,8 +23,7 @@
 
 SUBDIRS = elements
 
-ourpythondir = grc/gui
-ourlibdir = grc/gui
+ourpythondir = $(pythondir)/grc/gui
 
 ourpython_PYTHON = \
        __init__.py \

Modified: 
gnuradio/branches/developers/jblum/grc/grc/src/grc/gui/elements/Makefile.am
===================================================================
--- gnuradio/branches/developers/jblum/grc/grc/src/grc/gui/elements/Makefile.am 
2008-08-19 23:09:56 UTC (rev 9336)
+++ gnuradio/branches/developers/jblum/grc/grc/src/grc/gui/elements/Makefile.am 
2008-08-19 23:22:45 UTC (rev 9337)
@@ -21,8 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
-ourpythondir = grc/gui/elements
-ourlibdir = grc/gui/elements
+ourpythondir = $(pythondir)/grc/gui/elements
 
 ourpython_PYTHON = \
        __init__.py \

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-19 23:09:56 UTC (rev 9336)
+++ gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/Makefile.am     
2008-08-19 23:22:45 UTC (rev 9337)
@@ -23,8 +23,7 @@
 
 SUBDIRS = blks2 usrp utils wxgui
 
-ourpythondir = grc_gnuradio
-ourlibdir = grc_gnuradio
+ourpythondir = $(pythondir)/grc_gnuradio
 
 ourpython_PYTHON = \
        __init__.py \

Modified: 
gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/blks2/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/blks2/Makefile.am   
    2008-08-19 23:09:56 UTC (rev 9336)
+++ 
gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/blks2/Makefile.am   
    2008-08-19 23:22:45 UTC (rev 9337)
@@ -21,8 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
-ourpythondir = grc_gnuradio/blks2
-ourlibdir = grc_gnuradio/blks2
+ourpythondir = $(pythondir)/grc_gnuradio/blks2
 
 ourpython_PYTHON = \
        __init__.py \

Modified: 
gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/usrp/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/usrp/Makefile.am    
    2008-08-19 23:09:56 UTC (rev 9336)
+++ 
gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/usrp/Makefile.am    
    2008-08-19 23:22:45 UTC (rev 9337)
@@ -21,8 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
-ourpythondir = grc_gnuradio/usrp
-ourlibdir = grc_gnuradio/usrp
+ourpythondir = $(pythondir)/grc_gnuradio/usrp
 
 ourpython_PYTHON = \
        __init__.py \

Modified: 
gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/utils/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/utils/Makefile.am   
    2008-08-19 23:09:56 UTC (rev 9336)
+++ 
gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/utils/Makefile.am   
    2008-08-19 23:22:45 UTC (rev 9337)
@@ -21,8 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
-ourpythondir = grc_gnuradio/utils
-ourlibdir = grc_gnuradio/utils
+ourpythondir = $(pythondir)/grc_gnuradio/utils
 
 ourpython_PYTHON = \
        __init__.py \

Modified: 
gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/wxgui/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/wxgui/Makefile.am   
    2008-08-19 23:09:56 UTC (rev 9336)
+++ 
gnuradio/branches/developers/jblum/grc/grc/src/grc_gnuradio/wxgui/Makefile.am   
    2008-08-19 23:22:45 UTC (rev 9337)
@@ -21,8 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
-ourpythondir = grc_gnuradio/wxgui
-ourlibdir = grc_gnuradio/wxgui
+ourpythondir = $(pythondir)/grc_gnuradio/wxgui
 
 ourpython_PYTHON = \
        __init__.py \
reply via email to
[Prev in Thread] Current Thread [Next in Thread]