Imported Upstream version 3.2.2

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

diff --git a/usrp/host/apps/Makefile.am b/usrp/host/apps/Makefile.am
index 2085fd1cebdccf2d78fe09f63be16034c77cf439..b0c21d55fee6941f69f1776a23e808f511312c21 100644 (file)
--- a/usrp/host/apps/Makefile.am
+++ b/usrp/host/apps/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2003,2006 Free Software Foundation, Inc.
+# Copyright 2003,2006,2008 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -21,9 +21,8 @@
 
 include $(top_srcdir)/Makefile.common
 
-INCLUDES = $(USRP_INCLUDES) $(BOOST_CFLAGS)
-
-USRP_LIB = $(top_builddir)/usrp/host/lib/libusrp.la
+AM_CPPFLAGS = $(USRP_INCLUDES) $(BOOST_CPPFLAGS) $(CPPUNIT_INCLUDES) \
+          $(WITH_INCLUDES)
 
 bin_PROGRAMS =                         \
        usrper                          \
@@ -35,7 +34,7 @@ noinst_PROGRAMS =                     \
        test_usrp_standard_tx           
 
 noinst_HEADERS =                       \
-       time_stuff.h
+       time_stuff.h                    
 
 noinst_PYTHON =                                \
        burn-db-eeprom                  \
@@ -45,13 +44,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    = $(USRP_LIB)
+test_usrp_standard_rx_LDADD    = $(USRP_LA)
 
 test_usrp_standard_tx_SOURCES  = test_usrp_standard_tx.cc time_stuff.c
-test_usrp_standard_tx_LDADD    = $(USRP_LIB)
+test_usrp_standard_tx_LDADD    = $(USRP_LA) $(BOOST_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LIB)
 
 usrper_SOURCES                 = usrper.cc
-usrper_LDADD                   = $(USRP_LIB)
+usrper_LDADD                   = $(USRP_LA)
 
 usrp_cal_dc_offset_SOURCES     = usrp_cal_dc_offset.cc
-usrp_cal_dc_offset_LDADD       = $(USRP_LIB)
+usrp_cal_dc_offset_LDADD       = $(USRP_LA)