diff --git a/Transceiver52M/Makefile.am b/Transceiver52M/Makefile.am
index 652663b..aae7310 100644
--- a/Transceiver52M/Makefile.am
+++ b/Transceiver52M/Makefile.am
@@ -21,7 +21,11 @@
 
 include $(top_srcdir)/Makefile.common
 
+if UHD
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(UHD_CFLAGS)
+else
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(USRP_CFLAGS)
+endif
 AM_CXXFLAGS = -ldl -lpthread
 
 #rev2dir = $(datadir)/usrp/rev2
@@ -42,12 +46,17 @@
 	radioClock.cpp \
 	sigProcLib.cpp \
 	Transceiver.cpp \
-	USRPDevice.cpp \
 	DummyLoad.cpp
 
+if RESAMPLE
+libtransceiver_la_SOURCES = \
+	$(COMMON_SOURCES) \
+	radioIOResamp.cpp
+else
 libtransceiver_la_SOURCES = \
 	$(COMMON_SOURCES) \
 	radioIO.cpp
+endif
 
 noinst_PROGRAMS = \
 	USRPping \
@@ -68,22 +77,31 @@
 USRPping_SOURCES = USRPping.cpp
 USRPping_LDADD = \
 	libtransceiver.la \
-	$(COMMON_LA) $(SQLITE_LA) \
-	$(USRP_LIBS)
+	$(COMMON_LA) $(SQLITE_LA)
 
 transceiver_SOURCES = runTransceiver.cpp
 transceiver_LDADD = \
 	libtransceiver.la \
 	$(GSM_LA) \
-	$(COMMON_LA) $(SQLITE_LA) \
-	$(USRP_LIBS)
+	$(COMMON_LA) $(SQLITE_LA)
 
 sigProcLibTest_SOURCES = sigProcLibTest.cpp
 sigProcLibTest_LDADD = \
 	libtransceiver.la \
 	$(GSM_LA) \
-	$(COMMON_LA) $(SQLITE_LA) \
-	$(USRP_LIBS)
+	$(COMMON_LA) $(SQLITE_LA)
+
+if UHD
+libtransceiver_la_SOURCES += UHDDevice.cpp
+transceiver_LDADD += $(UHD_LIBS)
+USRPping_LDADD += $(UHD_LIBS)
+sigProcLibTest_LDADD += $(UHD_LIBS)
+else
+libtransceiver_la_SOURCES += USRPDevice.cpp
+transceiver_LDADD += $(USRP_LIBS)
+USRPping_LDADD += $(USRP_LIBS)
+sigProcLibTest_LDADD += $(USRP_LIBS)
+endif
 
 
 MOSTLYCLEANFILES +=