X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=usrp%2Fhost%2Fapps%2FMakefile.am;h=8aa361b22fcb397cbe7f173e9437f9d89bacde29;hb=HEAD;hp=8e0768e844665092e9afc827dc4280064e75d46f;hpb=18a684bf3dc144c48fc4cc6cc72f5070febd8074;p=debian%2Fgnuradio

diff --git a/usrp/host/apps/Makefile.am b/usrp/host/apps/Makefile.am
index 8e0768e8..8aa361b2 100644
--- a/usrp/host/apps/Makefile.am
+++ b/usrp/host/apps/Makefile.am
@@ -1,11 +1,11 @@
 #
-# Copyright 2003,2006 Free Software Foundation, Inc.
+# Copyright 2003,2006,2008,2009 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
 # GNU Radio is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 # 
 # GNU Radio is distributed in the hope that it will be useful,
@@ -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) \
+	   $(USB_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)