Partial fix for ticket 10 merged into trunk from

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

diff --git a/usrp/host/apps/Makefile.am b/usrp/host/apps/Makefile.am
index b08e325277f2e069cf31a97116d89d860aba8c2f..87a3774a08986b396ee87f310a816987bb664b47 100644 (file)
--- a/usrp/host/apps/Makefile.am
+++ b/usrp/host/apps/Makefile.am
@@ -19,7 +19,11 @@
 # Boston, MA 02111-1307, USA.
 # 
 
-INCLUDES = -I../lib -I$(top_srcdir)/usrp/firmware/include
+include $(top_srcdir)/Makefile.common
+
+INCLUDES = $(USRP_INCLUDES)
+
+USRP_LIB = $(top_builddir)/usrp/host/lib/libusrp.la
 
 bin_PROGRAMS =                         \
        usrper                          \
@@ -41,13 +45,13 @@ noinst_PYTHON =                             \
 check_order_quickly_SOURCES    = check_order_quickly.cc
 
 test_usrp_standard_rx_SOURCES  = test_usrp_standard_rx.cc time_stuff.c
-test_usrp_standard_rx_LDADD    = $(top_builddir)/usrp/host/lib/libusrp.la
+test_usrp_standard_rx_LDADD    = $(USRP_LIB)
 
 test_usrp_standard_tx_SOURCES  = test_usrp_standard_tx.cc time_stuff.c
-test_usrp_standard_tx_LDADD    = $(top_builddir)/usrp/host/lib/libusrp.la
+test_usrp_standard_tx_LDADD    = $(USRP_LIB)
 
 usrper_SOURCES                 = usrper.cc
-usrper_LDADD                   = $(top_builddir)/usrp/host/lib/libusrp.la
+usrper_LDADD                   = $(USRP_LIB)
 
 usrp_cal_dc_offset_SOURCES     = usrp_cal_dc_offset.cc
-usrp_cal_dc_offset_LDADD       = $(top_builddir)/usrp/host/lib/libusrp.la
+usrp_cal_dc_offset_LDADD       = $(USRP_LIB)