[Commit-gnuradio] r9976 - gnuradio/branches/features/cppdb/gr-usrp/src

[jcorgan]

Author: jcorgan
Date: 2008-11-12 10:09:25 -0700 (Wed, 12 Nov 2008)
New Revision: 9976

Added:
   gnuradio/branches/features/cppdb/gr-usrp/src/__init__.py
Modified:
   gnuradio/branches/features/cppdb/gr-usrp/src/Makefile.am
Log:
Reorganizae Makefile.am to separate C++ and Python sections, install usrp 
module in subdirectory

Modified: gnuradio/branches/features/cppdb/gr-usrp/src/Makefile.am
===================================================================
--- gnuradio/branches/features/cppdb/gr-usrp/src/Makefile.am    2008-11-12 
08:26:05 UTC (rev 9975)
+++ gnuradio/branches/features/cppdb/gr-usrp/src/Makefile.am    2008-11-12 
17:09:25 UTC (rev 9976)
@@ -21,62 +21,17 @@
 
 include $(top_srcdir)/Makefile.common
 
-# Install this stuff so that it ends up as the gnuradio.usrp module
-# This usually ends up at:
-#   ${prefix}/lib/python${python_version}/site-packages/gnuradio
-
-ourpythondir = $(grpythondir)
-ourlibdir    = $(grpyexecdir)
-
-EXTRA_DIST = run_tests.in
-TESTS = run_tests
-
-LOCAL_IFILES =                                 \
-       $(top_srcdir)/gr-usrp/src/usrp.i                                
-
-NON_LOCAL_IFILES = $(GNURADIO_I)
-
-ALL_IFILES =                           \
-       $(LOCAL_IFILES)                 \
-       $(NON_LOCAL_IFILES)             
-
-BUILT_SOURCES =                        \
-       usrp_swig.cc                    \
-       usrp_swig.py                    
-
-ourpython_PYTHON =
-
-
-AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES)  \
-          $(PYTHON_CPPFLAGS)           \
-          $(USRP_INCLUDES)             \
-          $(WITH_INCLUDES)
-
-SWIGPYTHONARGS = $(SWIGPYTHONFLAGS)         \
-                $(STD_DEFINES_AND_INCLUDES) \
-                $(USRP_INCLUDES)            \
-                $(WITH_INCLUDES)            \
-                $(WITH_SWIG_INCLUDES)
-
-grinclude_HEADERS =                    \
-       usrp_base.h                     \
-       usrp_sink_base.h                \
-       usrp_sink_c.h                   \
-       usrp_sink_s.h                   \
-       usrp_source_base.h              \
-       usrp_source_c.h                 \
-       usrp_source_s.h         
-
-swiginclude_HEADERS =                  \
-       $(LOCAL_IFILES)
-
-
 # ----------------------------------------------------------------
 # The straight C++ library
 
+AM_CPPFLAGS = \
+       $(STD_DEFINES_AND_INCLUDES) \
+       $(PYTHON_CPPFLAGS) \
+       $(USRP_INCLUDES) \
+       $(WITH_INCLUDES)
+
 lib_LTLIBRARIES = \
        libgnuradio-usrp.la
-#      libgnuradio-usrp-qa.la
 
 libgnuradio_usrp_la_SOURCES = \
        usrp_base.cc \
@@ -91,20 +46,51 @@
        $(GNURADIO_CORE_LA) \
        $(USRP_LA)                      
 
-
 libgnuradio_usrp_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0
 
+grinclude_HEADERS = \
+       usrp_base.h \
+       usrp_sink_base.h \
+       usrp_sink_c.h \
+       usrp_sink_s.h \
+       usrp_source_base.h \
+       usrp_source_c.h \
+       usrp_source_s.h         
 
 # ----------------------------------------------------------------
-# The SWIG library
+# The SWIG library and Python modules
+#
+# Install this stuff so that it ends up as the gnuradio.usrp module
+# This usually ends up at:
+#   ${prefix}/lib/python${python_version}/site-packages/gnuradio/usrp
 
-ourlib_LTLIBRARIES = _usrp_swig.la
+ourpythondir = $(grpythondir)/usrp
+ourlibdir    = $(grpyexecdir)/usrp
 
+BUILT_SOURCES = \
+       usrp_swig.cc \
+       usrp_swig.py            
 
+LOCAL_IFILES = \
+       $(top_srcdir)/gr-usrp/src/usrp.i                                
+
+NON_LOCAL_IFILES = \
+       $(GNURADIO_I)
+
+ALL_IFILES = \
+       $(LOCAL_IFILES) \
+       $(NON_LOCAL_IFILES)             
+
+ourlib_LTLIBRARIES = \
+       _usrp_swig.la
+
+ourlib_PYTHON = \
+       __init__.py \
+       usrp_swig.py
+
 _usrp_swig_la_SOURCES =        \
        usrp_swig.cc                    
 
-
 _usrp_swig_la_LIBADD = \
        $(PYTHON_LDFLAGS) \
        libgnuradio-usrp.la
@@ -113,18 +99,30 @@
 
 _usrp_swig_la_CXXFLAGS = @swig_CXXFLAGS@
 
+SWIGPYTHONARGS = \
+       $(SWIGPYTHONFLAGS) \
+       $(STD_DEFINES_AND_INCLUDES) \
+       $(USRP_INCLUDES) \
+       $(WITH_INCLUDES) \
+       $(WITH_SWIG_INCLUDES)
+
 usrp_swig.cc usrp_swig.py: usrp.i $(NON_LOCAL_IFILES) $(LOCAL_IFILES)
        $(SWIG) $(SWIGPYTHONARGS) -module usrp_swig -o usrp_swig.cc 
$(LOCAL_IFILES)
 
-
-noinst_PYTHON =                                \
+noinst_PYTHON =        \
        qa_usrp.py                      
 
-MOSTLYCLEANFILES = \
-       $(BUILT_SOURCES) *~ *.pyc
+swiginclude_HEADERS = \
+       $(LOCAL_IFILES)
 
-
 # Don't distribute output of swig
 dist-hook:
        @for file in $(BUILT_SOURCES); do echo $(RM) $(distdir)/$$file; done
        @for file in $(BUILT_SOURCES); do $(RM) $(distdir)/$$file; done
+
+# ----------------------------------------------------------------
+# Misc. build/installation activities
+
+MOSTLYCLEANFILES = $(BUILT_SOURCES) *~ *.pyc
+EXTRA_DIST = run_tests.in
+TESTS = run_tests

Added: gnuradio/branches/features/cppdb/gr-usrp/src/__init__.py
===================================================================
--- gnuradio/branches/features/cppdb/gr-usrp/src/__init__.py                    
        (rev 0)
+++ gnuradio/branches/features/cppdb/gr-usrp/src/__init__.py    2008-11-12 
17:09:25 UTC (rev 9976)
@@ -0,0 +1,27 @@
+#
+# 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.
+# 
+
+# The presence of this file turns this directory into a Python package
+
+# Add SWIG generated code to this namespace
+from usrp_swig import *
+
+# Add other content from pure-Python modules here