Merged r10071:10164 from features/cppdb-test into trunk. Implements the fully native C++ API for the USRP.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10165 221aa14e-8319-0410-a670-987f0aec2ac5

1 files changed, 94 insertions, 85 deletions

diff --git a/gr-usrp/src/Makefile.am b/gr-usrp/src/Makefile.am
index 03ca34db0..122f977be 100644
--- a/gr-usrp/src/Makefile.am
+++ b/gr-usrp/src/Makefile.am
@@ -21,107 +21,116 @@
 
 include $(top_srcdir)/Makefile.common
 
+# ----------------------------------------------------------------
+# The straight C++ library
+
+AM_CPPFLAGS = \
+	$(STD_DEFINES_AND_INCLUDES) \
+	$(PYTHON_CPPFLAGS) \
+	$(USRP_INCLUDES) \
+	$(WITH_INCLUDES)
+
+lib_LTLIBRARIES = \
+	libgnuradio-usrp.la
+
+libgnuradio_usrp_la_SOURCES = \
+	usrp_base.cc \
+	usrp_sink_base.cc \
+	usrp_sink_c.cc \
+	usrp_sink_s.cc \
+	usrp_source_base.cc \
+	usrp_source_c.cc \
+	usrp_source_s.cc
+
+libgnuradio_usrp_la_LIBADD = \
+	$(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 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
-
-ourpythondir = $(grpythondir)
-ourlibdir    = $(grpyexecdir)
-
-EXTRA_DIST = run_tests.in
-TESTS = run_tests
-
-LOCAL_IFILES = 				\
-	$(top_srcdir)/gr-usrp/src/usrp1.i				
-
-NON_LOCAL_IFILES = $(GNURADIO_I)
-
-ALL_IFILES = 				\
-	$(LOCAL_IFILES)			\
+#   ${prefix}/lib/python${python_version}/site-packages/gnuradio/usrp
+
+ourpythondir = $(grpythondir)/usrp
+ourlibdir    = $(grpyexecdir)/usrp
+
+BUILT_SOURCES = \
+	usrp_swig.cc \
+	usrp_swig.py		
+
+LOCAL_IFILES = \
+	$(srcdir)/usrp.i \
+	$(srcdir)/usrp_base.i \
+	$(srcdir)/usrp_source_base.i \
+	$(srcdir)/usrp_source_c.i \
+	$(srcdir)/usrp_source_s.i \
+	$(srcdir)/usrp_sink_base.i \
+	$(srcdir)/usrp_sink_c.i \
+	$(srcdir)/usrp_sink_s.i \
+	$(srcdir)/usrp_standard.i
+
+NON_LOCAL_IFILES = \
+	$(GNURADIO_I)
+
+ALL_IFILES = \
+	$(LOCAL_IFILES)	\
 	$(NON_LOCAL_IFILES)		
 
-BUILT_SOURCES = 			\
-	usrp1.cc			\
-	usrp1.py			
-
-ourpython_PYTHON =			\
-	db_base.py			\
-	db_basic.py			\
-	db_dbs_rx.py			\
-	db_flexrf.py			\
-	db_flexrf_mimo.py		\
-	db_wbx.py			\
-	db_xcvr2450.py			\
-	db_instantiator.py		\
-	db_tv_rx.py			\
-	db_dtt754.py			\
-	db_dtt768.py			\
-	flexrf_debug_gui.py		\
-	tx_debug_gui.py			\
-	usrp.py				\
-	usrp1.py			\
-        usrp_multi.py			
-
-
-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 =			\
-	usrp1_sink_base.h		\
-	usrp1_sink_c.h			\
-	usrp1_sink_s.h			\
-	usrp1_source_base.h		\
-	usrp1_source_c.h		\
-	usrp1_source_s.h		
-
-swiginclude_HEADERS = 			\
-	$(LOCAL_IFILES)
-
+ourlib_LTLIBRARIES = \
+	_usrp_swig.la
 
-ourlib_LTLIBRARIES = _usrp1.la
+ourlib_PYTHON = \
+	__init__.py \
+	usrp_swig.py
 
+_usrp_swig_la_SOURCES =	\
+	usrp_swig.cc			
 
-_usrp1_la_SOURCES = 			\
-	usrp1.cc			\
-	usrp1_sink_base.cc		\
-	usrp1_sink_c.cc			\
-	usrp1_sink_s.cc			\
-	usrp1_source_base.cc		\
-	usrp1_source_c.cc		\
-	usrp1_source_s.cc		
+_usrp_swig_la_LIBADD = \
+	$(PYTHON_LDFLAGS) \
+	libgnuradio-usrp.la
 
+_usrp_swig_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
 
-_usrp1_la_LIBADD = 			\
-	$(PYTHON_LDFLAGS)		\
-	$(GNURADIO_CORE_LA)		\
-	$(USRP_LA)			\
-	-lstdc++
+_usrp_swig_la_CXXFLAGS = @swig_CXXFLAGS@
 
+SWIGPYTHONARGS = \
+	$(SWIGPYTHONFLAGS) \
+	$(STD_DEFINES_AND_INCLUDES) \
+	$(USRP_INCLUDES) \
+	$(WITH_INCLUDES) \
+	$(WITH_SWIG_INCLUDES)
 
-_usrp1_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
+usrp_swig.cc usrp_swig.py: $(ALL_IFILES)
+	$(SWIG) $(SWIGPYTHONARGS) -module usrp_swig -o usrp_swig.cc $(srcdir)/usrp.i
 
-_usrp1_la_CXXFLAGS = @swig_CXXFLAGS@
-
-usrp1.cc usrp1.py: usrp1.i $(NON_LOCAL_IFILES) $(LOCAL_IFILES)
-	$(SWIG) $(SWIGPYTHONARGS) -module usrp1 -o usrp1.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