1 files changed, 22 insertions, 79 deletions

diff --git a/usrp2/firmware/lib/Makefile.am b/usrp2/firmware/lib/Makefile.am
index 0a7d5c39b..d6bb4edc3 100644
--- a/usrp2/firmware/lib/Makefile.am
+++ b/usrp2/firmware/lib/Makefile.am
@@ -22,26 +22,19 @@ noinst_LIBRARIES = \
 	libu2fw_wbx.a \
 	libu2fw_xcvr.a
 
-
-libu2fw_a_SOURCES = \
+U2FW_COMMON = \
+	_exit.c \
 	abort.c \
 	ad9510.c \
-	adf4350.c \
-	adf4350_regs.c \
 	ad9777.c \
 	bsm12.c \
 	buffer_pool.c \
 	clocks.c \
 	db_basic.c \
-	db_dbsrx.c \
-	db_rfx.c \
-	db_tvrx.c \
-	db_init.c \
 	dbsm.c \
 	eeprom.c \
-	ethernet.c \
 	eth_mac.c \
-	_exit.c \
+	ethernet.c \
 	exit.c \
 	hal_io.c \
 	hal_uart.c \
@@ -53,88 +46,37 @@ libu2fw_a_SOURCES = \
 	memset_wa.c \
 	nonstdio.c \
 	pic.c \
+	print_buffer.c \
+	print_fxpt.c \
 	print_mac_addr.c \
 	print_rmon_regs.c \
-	print_fxpt.c \
-	print_buffer.c \
 	printf.c \
 	sd.c \
 	spi.c \
-	u2_init.c	
+	u2_init.c
+
+libu2fw_a_SOURCES = \
+	$(U2FW_COMMON) \
+	db_init.c \
+	db_bitshark_rx.c \
+	db_dbsrx.c \
+	db_rfx.c \
+	db_tvrx.c
 
 libu2fw_wbx_a_SOURCES = \
-	abort.c \
-	ad9510.c \
+	$(U2FW_COMMON) \
+	db_init_wbx.c \
 	adf4350.c \
 	adf4350_regs.c \
-	ad9777.c \
-	bsm12.c \
-	buffer_pool.c \
-	clocks.c \
-	db_basic.c \
-	db_wbxng.c \
-	db_init_wbx.c \
-	dbsm.c \
-	eeprom.c \
-	ethernet.c \
-	eth_mac.c \
-	_exit.c \
-	exit.c \
-	hal_io.c \
-	hal_uart.c \
-	i2c.c \
-	lsadc.c \
-	lsdac.c \
-	mdelay.c \
-	memcpy_wa.c \
-	memset_wa.c \
-	nonstdio.c \
-	pic.c \
-	print_mac_addr.c \
-	print_rmon_regs.c \
-	print_fxpt.c \
-	print_buffer.c \
-	printf.c \
-	sd.c \
-	spi.c \
-	u2_init.c	
+	db_wbxng.c 
 
 libu2fw_xcvr_a_SOURCES = \
-	abort.c \
-	ad9510.c \
+	$(U2FW_COMMON) \
+	db_init_xcvr.c \
 	adf4350.c \
 	adf4350_regs.c \
-	ad9777.c \
-	bsm12.c \
-	buffer_pool.c \
-	clocks.c \
-	db_basic.c \
-	db_xcvr2450.c \
-	db_init_xcvr.c \
-	dbsm.c \
-	eeprom.c \
-	ethernet.c \
-	eth_mac.c \
-	_exit.c \
-	exit.c \
-	hal_io.c \
-	hal_uart.c \
-	i2c.c \
-	lsadc.c \
-	lsdac.c \
-	mdelay.c \
-	memcpy_wa.c \
-	memset_wa.c \
-	nonstdio.c \
-	pic.c \
-	print_mac_addr.c \
-	print_rmon_regs.c \
-	print_fxpt.c \
-	print_buffer.c \
-	printf.c \
-	sd.c \
-	spi.c \
-	u2_init.c	
+	db_xcvr2450.c
+
 
 noinst_HEADERS = \
 	ad9510.h \
@@ -149,6 +91,7 @@ noinst_HEADERS = \
 	db.h \
 	db_base.h \
 	db_wbxng.h \
+	db_bitshark_rx.h \
 	dbsm.h \
 	eth_mac.h \
 	eth_mac_regs.h \