[Commit-gnuradio] r11023 - in gnuradio/branches/developers/eb/t367: . config docs docs/doxygen gnuradio-core

[eb]

Author: eb
Date: 2009-05-13 20:13:36 -0600 (Wed, 13 May 2009)
New Revision: 11023

Added:
   gnuradio/branches/developers/eb/t367/config/grc_docs.m4
   gnuradio/branches/developers/eb/t367/docs/Makefile.am
   gnuradio/branches/developers/eb/t367/docs/doxygen/
Removed:
   gnuradio/branches/developers/eb/t367/gnuradio-core/doc/
Modified:
   gnuradio/branches/developers/eb/t367/config/Makefile.am
   gnuradio/branches/developers/eb/t367/config/grc_gnuradio_core.m4
   gnuradio/branches/developers/eb/t367/configure.ac
   gnuradio/branches/developers/eb/t367/docs/
   gnuradio/branches/developers/eb/t367/docs/doxygen/Doxyfile.in
   gnuradio/branches/developers/eb/t367/gnuradio-core/Makefile.am
Log:
work-in-progress: still ugly

Modified: gnuradio/branches/developers/eb/t367/config/Makefile.am
===================================================================
--- gnuradio/branches/developers/eb/t367/config/Makefile.am     2009-05-13 
23:29:24 UTC (rev 11022)
+++ gnuradio/branches/developers/eb/t367/config/Makefile.am     2009-05-14 
02:13:36 UTC (rev 11023)
@@ -45,6 +45,7 @@
        bnv_have_qt.m4 \
        cppunit.m4 \
        grc_build.m4 \
+       grc_docs.m4 \
        grc_gcell.m4 \
        grc_gnuradio_core.m4 \
        grc_gnuradio_examples.m4 \

Added: gnuradio/branches/developers/eb/t367/config/grc_docs.m4
===================================================================
--- gnuradio/branches/developers/eb/t367/config/grc_docs.m4                     
        (rev 0)
+++ gnuradio/branches/developers/eb/t367/config/grc_docs.m4     2009-05-14 
02:13:36 UTC (rev 11023)
@@ -0,0 +1,33 @@
+dnl Copyright 2009 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_DOCS],[
+    GRC_ENABLE(docs)
+
+    AC_CONFIG_FILES([ \
+       docs/Makefile \
+        docs/doxygen/Doxyfile \
+        docs/doxygen/Makefile \
+        docs/doxygen/other/Makefile \
+        docs/doxygen/xml-swig/Makefile \
+    ])
+
+    GRC_BUILD_CONDITIONAL(docs)
+
+])


Property changes on: gnuradio/branches/developers/eb/t367/config/grc_docs.m4
___________________________________________________________________
Added: svn:eol-style
   + LF

Modified: gnuradio/branches/developers/eb/t367/config/grc_gnuradio_core.m4
===================================================================
--- gnuradio/branches/developers/eb/t367/config/grc_gnuradio_core.m4    
2009-05-13 23:29:24 UTC (rev 11022)
+++ gnuradio/branches/developers/eb/t367/config/grc_gnuradio_core.m4    
2009-05-14 02:13:36 UTC (rev 11023)
@@ -80,10 +80,6 @@
     AC_CONFIG_FILES([ \
         gnuradio-core/Makefile
         gnuradio-core/gnuradio-core.pc \
-        gnuradio-core/doc/Doxyfile \
-        gnuradio-core/doc/Makefile \
-        gnuradio-core/doc/other/Makefile \
-        gnuradio-core/doc/xml-swig/Makefile \
         gnuradio-core/src/Makefile \
         gnuradio-core/src/gen_interpolator_taps/Makefile \
         gnuradio-core/src/lib/Makefile \

Modified: gnuradio/branches/developers/eb/t367/configure.ac
===================================================================
--- gnuradio/branches/developers/eb/t367/configure.ac   2009-05-13 23:29:24 UTC 
(rev 11022)
+++ gnuradio/branches/developers/eb/t367/configure.ac   2009-05-14 02:13:36 UTC 
(rev 11023)
@@ -330,6 +330,7 @@
 GRC_GR_UTILS                    dnl this must come after GRC_GR_WXGUI
 GRC_GNURADIO_EXAMPLES          dnl must come after all GRC_GR_*
 GRC_GRC
+GRC_DOCS                       dnl must be last
 
 # Each component is now either to be built, was skipped, will be
 # included from pre-installed libraries and includes, or failed


Property changes on: gnuradio/branches/developers/eb/t367/docs
___________________________________________________________________
Added: svn:ignore
   + Makefile.in
Makefile


Added: gnuradio/branches/developers/eb/t367/docs/Makefile.am
===================================================================
--- gnuradio/branches/developers/eb/t367/docs/Makefile.am                       
        (rev 0)
+++ gnuradio/branches/developers/eb/t367/docs/Makefile.am       2009-05-14 
02:13:36 UTC (rev 11023)
@@ -0,0 +1,23 @@
+#
+# Copyright 2009 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 this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+
+include $(top_srcdir)/Makefile.common
+
+SUBDIRS = doxygen


Property changes on: gnuradio/branches/developers/eb/t367/docs/Makefile.am
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: gnuradio/branches/developers/eb/t367/docs/doxygen/Doxyfile.in
===================================================================
--- gnuradio/branches/developers/eb/t367/gnuradio-core/doc/Doxyfile.in  
2009-05-13 05:39:36 UTC (rev 11020)
+++ gnuradio/branches/developers/eb/t367/docs/doxygen/Doxyfile.in       
2009-05-14 02:13:36 UTC (rev 11023)
@@ -495,7 +495,6 @@
 
 FILE_PATTERNS          = *.h \
                          *.dox \
-                         *.py \
                         *.cc
 
 # The RECURSIVE tag can be used to turn specify whether or not subdirectories 
@@ -511,27 +510,14 @@
 # We split these by top_srcdir and top_builddir (this matters in a VPATH build)
 
 EXCLUDE  = \
-       @abs_top_builddir@/gnuradio-core/src/lib/swig \
-       @abs_top_builddir@/gr-atsc/src/lib/atsc.cc \
-       @abs_top_builddir@/gr-atsc/src/lib/atsc.py \
-       @abs_top_builddir@/gr-audio-oss/src/audio_oss.py \
-       @abs_top_builddir@/gr-audio-osx/src/test_audio_loop.py \
-       @abs_top_builddir@/gr-cvsd-vocoder/src/lib/cvsd_vocoder.py \    
-       @abs_top_builddir@/gr-cvsd-vocoder/src/python/encdec.py \       
-       @abs_top_builddir@/gr-gsm-fr-vocoder/src/lib/gsm \
-       @abs_top_builddir@/gr-gsm-fr-vocoder/src/lib/gsm_full_rate.py \ 
-       @abs_top_builddir@/gr-gsm-fr-vocoder/src/python/encdec.py \     
-       @abs_top_builddir@/gr-pager/src/pager_swig.py \
-       @abs_top_builddir@/gr-radar-mono/src/python/usrp_radar_mono.py \
-       @abs_top_builddir@/gr-trellis/src/lib/trellis.py \
-       @abs_top_builddir@/gr-usrp/src/usrp1.py \
-       @abs_top_builddir@/gr-video-sdl/src/video_sdl.py \
-       @abs_top_builddir@/usrp/host/swig \
        @abs_top_builddir@/docs \
+       @abs_top_builddir@/docs/doxygen/xml \
+       @abs_top_builddir@/docs/doxygen/xml-swig \
        @abs_top_builddir@/dtools \
+       @abs_top_builddir@/gcell/ibm \
        @abs_top_builddir@/gnuradio-core/doc/other/doxypy.py \
-       @abs_top_builddir@/gnuradio-core/doc/xml \
-       @abs_top_builddir@/gnuradio-core/doc/xml-swig \
+       @abs_top_builddir@/gnuradio-core/doc/other/shared_ptr_docstub.h \
+       @abs_top_builddir@/gnuradio-core/doc/other/vector_docstub.h \
        @abs_top_builddir@/gnuradio-core/src/lib/bug_work_around_6.cc \
        @abs_top_builddir@/gnuradio-core/src/lib/filter/assembly.h \
        @abs_top_builddir@/gnuradio-core/src/lib/filter/generate_all.py \
@@ -544,11 +530,14 @@
        
@abs_top_builddir@/gnuradio-core/src/lib/filter/generate_gr_interp_fir_filter_XXX.py
 \
        
@abs_top_builddir@/gnuradio-core/src/lib/filter/generate_gr_rational_resampler_base_XXX.py
 \
        @abs_top_builddir@/gnuradio-core/src/lib/filter/generate_utils.py \
+       @abs_top_builddir@/gnuradio-core/src/lib/filter/gr_altivec.h \
        @abs_top_builddir@/gnuradio-core/src/lib/filter/sse_debug.h \
        @abs_top_builddir@/gnuradio-core/src/lib/gengen/generate_all.py \
        @abs_top_builddir@/gnuradio-core/src/lib/gengen/generate_common.py \
        @abs_top_builddir@/gnuradio-core/src/lib/missing/bug_work_around_8.cc \
+       @abs_top_builddir@/gnuradio-core/src/lib/missing/getopt.h \
        @abs_top_builddir@/gnuradio-core/src/lib/runtime/gr_error_handler.cc \
+       @abs_top_builddir@/gnuradio-core/src/lib/swig \
        @abs_top_builddir@/gnuradio-core/src/python/bin \
        @abs_top_builddir@/gnuradio-core/src/python/build_utils.py \
        @abs_top_builddir@/gnuradio-core/src/python/build_utils_codes.py \
@@ -557,14 +546,40 @@
        
@abs_top_builddir@/gnuradio-core/src/python/gnuradio/gr/gr_threading_24.py \
        @abs_top_builddir@/gnuradio-core/src/tests \
        @abs_top_builddir@/gnuradio-core/src/utils \
+       @abs_top_builddir@/gnuradio-examples/python/apps/hf_radio/output.py \
+       @abs_top_builddir@/gnuradio-examples/python/apps/hf_radio/ui.py \
+       @abs_top_builddir@/gr-atsc/src/lib/atsc.cc \
+       @abs_top_builddir@/gr-atsc/src/lib/atsc.py \
        @abs_top_builddir@/gr-atsc/src/lib/gen_encoder.py \
        @abs_top_builddir@/gr-atsc/src/python \
+       @abs_top_builddir@/gr-atsc/src/python \
+       @abs_top_builddir@/gr-audio-alsa/src/audio-alsa.py \
+       @abs_top_builddir@/gr-audio-oss/src/audio_oss.py \
+       @abs_top_builddir@/gr-audio-osx/src/test_audio_loop.py \
+       @abs_top_builddir@/gr-cvsd-vocoder/src/lib/cvsd_vocoder.py \    
+       @abs_top_builddir@/gr-cvsd-vocoder/src/python/encdec.py \       
+       @abs_top_builddir@/gr-gsm-fr-vocoder/src/lib/gsm \
+       @abs_top_builddir@/gr-gsm-fr-vocoder/src/lib/gsm_full_rate.py \ 
+       @abs_top_builddir@/gr-gsm-fr-vocoder/src/python/encdec.py \     
        @abs_top_builddir@/gr-howto-write-a-block \
+       @abs_top_builddir@/gr-msdd6000/src/msdd.py \
+       @abs_top_builddir@/gr-pager/src/pager_swig.py \
        @abs_top_builddir@/gr-qtgui \
+       @abs_top_builddir@/gr-radar-mono/src/python/usrp_radar_mono.py \
+       @abs_top_builddir@/gr-radio-astronomy/src/lib/ra.py \
+       @abs_top_builddir@/gr-radio-astronomy/src/python \
        @abs_top_builddir@/gr-sounder/src/python/usrp_sounder.py \
        @abs_top_builddir@/gr-trellis/doc \
        @abs_top_builddir@/gr-trellis/src/lib/generate_all.py \
        @abs_top_builddir@/gr-trellis/src/lib/generate_trellis.py \
+       @abs_top_builddir@/gr-trellis/src/lib/trellis.py \
+       @abs_top_builddir@/gr-usrp/src/usrp1.py \
+       @abs_top_builddir@/gr-usrp2/src/usrp2.py \
+       @abs_top_builddir@/gr-video-sdl/src/video_sdl.py \
+       @abs_top_builddir@/gr-wxgui/src/python \
+       @abs_top_builddir@/grc \
+       @abs_top_builddir@/omnithread/mach.cc \
+       @abs_top_builddir@/omnithread/nt.cc \
        @abs_top_builddir@/usrp/doc \
        @abs_top_builddir@/usrp/firmware \
        @abs_top_builddir@/usrp/fpga \
@@ -575,34 +590,17 @@
        @abs_top_builddir@/usrp/host/lib/legacy/check_data.py \
        @abs_top_builddir@/usrp/host/lib/legacy/circular_buffer.h \
        @abs_top_builddir@/usrp/host/lib/legacy/circular_linked_list.h \
+       @abs_top_builddir@/usrp/host/lib/legacy/db_wbx.h \
        @abs_top_builddir@/usrp/host/lib/legacy/dump_data.py \
        @abs_top_builddir@/usrp/host/lib/legacy/gen_usrp_dbid.py \
        @abs_top_builddir@/usrp/host/lib/legacy/usrp_dbid.py \
        @abs_top_builddir@/usrp/host/misc \
        @abs_top_builddir@/usrp/host/swig \
-       @abs_top_builddir@/grc \
-       @abs_top_builddir@/gr-wxgui/src/python \
-       @abs_top_builddir@/gr-radio-astronomy/src/python \
-       @abs_top_builddir@/omnithread/nt.cc \
-       @abs_top_builddir@/omnithread/mach.cc \
-       @abs_top_builddir@/gr-audio-alsa/src/audio-alsa.py \
-       @abs_top_builddir@/gr-msdd6000/src/msdd.py \
-       @abs_top_builddir@/gr-usrp2/src/usrp2.py \
-       @abs_top_builddir@/usrp/host/lib/legacy/db_flexrf.h \
-       @abs_top_builddir@/usrp/host/lib/legacy/db_flexrf_mimo.h \
-       @abs_top_builddir@/usrp/host/lib/legacy/db_wbx.h \
-       @abs_top_builddir@/gnuradio-core/doc/other/shared_ptr_docstub.h \
-       @abs_top_builddir@/gnuradio-core/doc/other/vector_docstub.h \
-       @abs_top_builddir@/gnuradio-core/src/lib/missing/getopt.h \
-       @abs_top_builddir@/gnuradio-core/src/lib/filter/gr_altivec.h \
-       @abs_top_builddir@/gnuradio-examples/python/apps/hf_radio/output.py \
-       @abs_top_builddir@/gnuradio-examples/python/apps/hf_radio/ui.py \
-       @abs_top_builddir@/gr-radio-astronomy/src/lib/ra.py \
-       @abs_top_builddir@/gcell/ibm/sync/ppu_source/cond.h \
-       @abs_top_builddir@/gcell/ibm/sync/ppu_source/libsync.h \
-       @abs_top_builddir@/gcell/ibm/sync/spu_source/sync_utils.h
+       @abs_top_builddir@/usrp2/firmware \
+       @abs_top_builddir@/usrp2/fpga
 
 
+
 # The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
 # directories that are symbolic links (a Unix filesystem feature) are excluded 
 # from the input.

Modified: gnuradio/branches/developers/eb/t367/gnuradio-core/Makefile.am
===================================================================
--- gnuradio/branches/developers/eb/t367/gnuradio-core/Makefile.am      
2009-05-13 23:29:24 UTC (rev 11022)
+++ gnuradio/branches/developers/eb/t367/gnuradio-core/Makefile.am      
2009-05-14 02:13:36 UTC (rev 11023)
@@ -1,5 +1,5 @@
 #
-# Copyright 2001,2006 Free Software Foundation, Inc.
+# Copyright 2001,2006,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -24,7 +24,7 @@
 EXTRA_DIST =                           \
        gnuradio-core.pc.in
 
-SUBDIRS = src doc
+SUBDIRS = src
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gnuradio-core.pc