usrp: Cleanup of usrp_basic

[debian/gnuradio] / usrp / host / lib / Makefile.am

diff --git a/usrp/host/lib/Makefile.am b/usrp/host/lib/Makefile.am
index 72312ebbb37b8a8d2f8b70c558d06f4d2d17cc19..e80f27112d3a346f76bcc935e5e7d8ebaea1bc7b 100644 (file)
--- a/usrp/host/lib/Makefile.am
+++ b/usrp/host/lib/Makefile.am
@@ -61,8 +61,7 @@ BUILT_SOURCES += usrp_dbid.cc \
 generic_CODE =                                 \
        fusb_generic.cc                 \
        fusb_sysconfig_generic.cc       \
-       usrp_prims_libusb0.cc           \
-       usrp_basic_libusb0.cc
+       usrp_prims_libusb0.cc           
 
 darwin_CODE =                          \
        fusb_darwin.cc                  \
@@ -72,34 +71,29 @@ darwin_CODE =                               \
        circular_linked_list.h          \
        darwin_libusb.h                 \
        mld_threads.h                   \
-       usrp_prims_libusb0.cc           \
-       usrp_basic_libusb0.cc
+       usrp_prims_libusb0.cc           
 
 
 win32_CODE =                           \
        fusb_win32.cc                   \
        fusb_sysconfig_win32.cc         \
-       usrp_prims_libusb0.cc           \
-       usrp_basic_libusb0.cc
+       usrp_prims_libusb0.cc           
 
 
 linux_CODE =                           \
        fusb_linux.cc                   \
        fusb_sysconfig_linux.cc         \
-       usrp_prims_libusb0.cc           \
-       usrp_basic_libusb0.cc
+       usrp_prims_libusb0.cc           
 
 ra_wb_CODE =                           \
        fusb_ra_wb.cc                   \
        fusb_sysconfig_ra_wb.cc         \
-       usrp_prims_libusb0.cc           \
-       usrp_basic_libusb0.cc
+       usrp_prims_libusb0.cc           
 
 libusb1_CODE =                         \
        fusb_libusb1.cc                 \
        fusb_sysconfig_libusb1.cc       \
-       usrp_prims_libusb1.cc           \
-       usrp_basic_libusb1.cc
+       usrp_prims_libusb1.cc           
 
 #
 # include each <foo>_CODE entry here...
@@ -116,14 +110,14 @@ EXTRA_libusrp_la_SOURCES =                \
 libusrp_la_common_SOURCES =            \
        fusb.cc                         \
        md5.c                           \
-       usrp_basic_common.cc            \
+       usrp_basic.cc                   \
        usrp_config.cc                  \
        usrp_dbid.cc                    \
        usrp_local_sighandler.cc        \
        usrp_prims_common.cc            \
        usrp_standard.cc                \
-       db_wbxng_adf4350.cc                     \
-       db_wbxng_adf4350_regs.cc                        \
+       db_wbxng_adf4350.cc             \
+       db_wbxng_adf4350_regs.cc        \
        db_boards.cc                    \
        db_base.cc                      \
        db_basic.cc                     \