diff --git a/Transceiver52M/device/ipc/Makefile.am b/Transceiver52M/device/ipc/Makefile.am
index 16536636..c08621f2 100644
--- a/Transceiver52M/device/ipc/Makefile.am
+++ b/Transceiver52M/device/ipc/Makefile.am
@@ -1,9 +1,8 @@
 include $(top_srcdir)/Makefile.common
 
-AM_CPPFLAGS = -Wall $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/../common
-AM_CFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS)
-AM_CXXFLAGS = -lpthread $(LIBOSMOCORE_CFLAGS)
-AM_LDFLAGS = -lpthread -lrt
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) -I${srcdir}/../common
+AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(UHD_CFLAGS)
+AM_CXXFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(UHD_CFLAGS)
 
 noinst_HEADERS = IPCDevice.h shm.h ipc_shm.h ipc_chan.h ipc_sock.h
 
@@ -14,22 +13,22 @@ endif
 noinst_LTLIBRARIES = libdevice.la
 
 libdevice_la_SOURCES = IPCDevice.cpp shm.c ipc_shm.c ipc_chan.c ipc_sock.c
-libdevice_la_LIBADD = $(top_builddir)/Transceiver52M/device/common/libdevice_common.la
-libdevice_la_CXXFLAGS = $(AM_CXXFLAGS) -DIPCMAGIC
+libdevice_la_CPPFLAGS = $(AM_CPPFLAGS) -DIPCMAGIC
+libdevice_la_LIBADD = \
+	$(top_builddir)/Transceiver52M/device/common/libdevice_common.la \
+	-lpthread \
+	-lrt \
+	$(NULL)
 
 if DEVICE_UHD
 
 bin_PROGRAMS = ipc-driver-test
 #ipc_driver_test_SHORTNAME = drvt
-ipc_driver_test_SOURCES = ipc-driver-test.c uhdwrap.cpp ipc_shm.c ipc_chan.c ipc_sock.c ../uhd/UHDDevice.cpp
+ipc_driver_test_SOURCES = ipc-driver-test.c uhdwrap.cpp ../uhd/UHDDevice.cpp
 ipc_driver_test_LDADD = \
-        shm.lo \
-	$(top_builddir)/Transceiver52M/device/common/libdevice_common.la \
-	$(COMMON_LA)
+	libdevice.la \
+	$(COMMON_LA) \
 	$(LIBOSMOCORE_LIBS) \
+	$(UHD_LIBS) \
 	$(NULL)
-ipc_driver_test_CXXFLAGS = $(AM_CXXFLAGS) $(UHD_CFLAGS)
-ipc_driver_test_CPPFLAGS  = $(AM_CPPFLAGS) $(UHD_CFLAGS)
-ipc_driver_test_CFLAGS  = $(AM_CFLAGS) $(UHD_CFLAGS)
-ipc_driver_test_LDFLAGS  = $(AM_LDFLAGS) $(UHD_LIBS)
 endif