[Commit-gnuradio] r8878 - gnuradio/branches/developers/trondeau/dbs/gr-usrp/src

[trondeau]

Author: trondeau
Date: 2008-07-13 11:33:16 -0600 (Sun, 13 Jul 2008)
New Revision: 8878

Modified:
   gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/Makefile.am
Log:
Adding Makefile to build usrp.py and library

Modified: gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/Makefile.am   
2008-07-13 17:32:08 UTC (rev 8877)
+++ gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/Makefile.am   
2008-07-13 17:33:16 UTC (rev 8878)
@@ -28,11 +28,21 @@
 ourpythondir = $(grpythondir)
 ourlibdir    = $(grpyexecdir)
 
+#AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
+#SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \
+#      $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES)
+
+
 EXTRA_DIST = run_tests.in
 TESTS = run_tests
 
-LOCAL_IFILES =                                 \
-       $(top_srcdir)/gr-usrp/src/usrp1.i                               
+LOCAL_IFILES =                 \
+       usrp1.i         \
+       usrp1_source.i  \
+       usrp1_sink.i    \
+       db_base.i       \
+       db_basic.i      \
+       db_tv_rx.i
 
 NON_LOCAL_IFILES = $(GNURADIO_I)
 
@@ -42,27 +52,12 @@
 
 BUILT_SOURCES =                        \
        usrp1.cc                        \
-       usrp1.py                        
+       usrp.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                  
+       usrp.py
 
-
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES)  \
           $(PYTHON_CPPFLAGS)           \
           $(USRP_INCLUDES)             \
@@ -75,45 +70,51 @@
                 $(WITH_SWIG_INCLUDES)
 
 grinclude_HEADERS =                    \
+       usrp1_base.h                    \
        usrp1_sink_base.h               \
        usrp1_sink_c.h                  \
-       usrp1_sink_s.h                  \
        usrp1_source_base.h             \
        usrp1_source_c.h                \
-       usrp1_source_s.h                
+       db_base.h                       \
+       db_basic.h                      \
+       db_tv_rx.h                      \
+       db_boards.h
 
 swiginclude_HEADERS =                  \
        $(LOCAL_IFILES)
 
 
-ourlib_LTLIBRARIES = _usrp1.la
+ourlib_LTLIBRARIES =                   \
+       _usrp.la
 
-
-_usrp1_la_SOURCES =                    \
+_usrp_la_SOURCES =                     \
        usrp1.cc                        \
+       usrp1_base.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               
+       db_base.cc                      \
+       db_basic.cc                     \
+       db_tv_rx.cc                     \
+       db_boards.cc
 
-
-_usrp1_la_LIBADD =                     \
+_usrp_la_LIBADD =                      \
        $(PYTHON_LDFLAGS)               \
        $(GNURADIO_CORE_LA)             \
        $(USRP_LA)                      \
        -lstdc++
 
 
-_usrp1_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
+_usrp_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
 
 
-usrp1.cc usrp1.py: usrp1.i $(NON_LOCAL_IFILES) $(LOCAL_IFILES)
-       $(SWIG) $(SWIGPYTHONARGS) -module usrp1 -o usrp1.cc $(LOCAL_IFILES)
+usrp1.cc usrp.py: $(NON_LOCAL_IFILES) usrp1.i
+       $(SWIG) $(SWIGPYTHONARGS) -module usrp -o usrp1.cc usrp1.i
 
 
-noinst_PYTHON =                                \
+
+noinst_PYTHON =        \
        qa_usrp.py                      
 
 MOSTLYCLEANFILES = \