merging r10246:10247 from developer branch to fix manual frequency setting problem

[debian/gnuradio] / usrp / host / lib / inband / Makefile.am

diff --git a/usrp/host/lib/inband/Makefile.am b/usrp/host/lib/inband/Makefile.am
index fab64b8301df90e513c9ef542bd8bdfbeb2b2aad..b08ef01e3f9c63e4610dd103aa4964967ed9b698 100644 (file)
--- a/usrp/host/lib/inband/Makefile.am
+++ b/usrp/host/lib/inband/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2007 Free Software Foundation, Inc.
+# Copyright 2007,2008 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -20,10 +20,10 @@
 
 include $(top_srcdir)/Makefile.common
 
-INCLUDES =     \
+AM_CPPFLAGS =  \
        $(DEFINES) $(OMNITHREAD_INCLUDES) $(PMT_INCLUDES) $(MBLOCK_INCLUDES) \
-       $(USRP_INCLUDES) $(BOOST_CFLAGS) $(CPPUNIT_INCLUDES) \
-       -I$(srcdir)/../../apps-inband
+       $(USRP_INCLUDES) $(BOOST_CPPFLAGS) $(CPPUNIT_INCLUDES) \
+       -I$(srcdir)/../../apps-inband $(WITH_INCLUDES)
 
 TESTS = test_inband
 
@@ -31,11 +31,9 @@ EXTRA_DIST =                         \
        usrp_server.mbh                 \
        usrp_interface.mbh 
 
-
 lib_LTLIBRARIES =                      \
-       libusrp_inband.la               \
-       libusrp_inband-qa.la
-
+       libusrp-inband.la               \
+       libusrp-inband-qa.la
 
 # ------------------------------------------------------------------------
 # Build the inband library
@@ -75,13 +73,7 @@ include_HEADERS =                    \
        usrp_server.h                   \
        usrp_tx.h                       \
        usrp_tx_stub.h                  \
-       usrp_usb_interface.h            
-
-noinst_HEADERS =                       \
-       fake_usrp.h                     \
-       qa_inband.h                     \
-       qa_inband_packet_prims.h        \
-       qa_inband_usrp_server.h         \
+       usrp_usb_interface.h \
        symbols_usrp_channel.h          \
        symbols_usrp_interface_cs.h     \
        symbols_usrp_low_level_cs.h     \
@@ -89,8 +81,12 @@ noinst_HEADERS =                             \
        symbols_usrp_rx_cs.h            \
        symbols_usrp_server_cs.h        \
        symbols_usrp_tx.h               \
-       symbols_usrp_tx_cs.h            
+       symbols_usrp_tx_cs.h
 
+noinst_HEADERS =                       \
+       qa_inband.h                     \
+       qa_inband_packet_prims.h        \
+       qa_inband_usrp_server.h         
 
 # ------------------------------------------------------------------------
 # Build the qa code in its own library
@@ -98,28 +94,24 @@ noinst_HEADERS =                            \
 libusrp_inband_qa_la_SOURCES =         \
        qa_inband.cc                    \
        qa_inband_packet_prims.cc       \
-       qa_inband_usrp_server.cc        
+       qa_inband_usrp_server.cc
 
 # magic flags
 libusrp_inband_qa_la_LDFLAGS = $(NO_UNDEFINED) -avoid-version
 
 libusrp_inband_qa_la_LIBADD =          \
-       libusrp_inband.la               \
+       libusrp-inband.la               \
+       $(PMT_LA)                       \
        $(CPPUNIT_LIBS)                 \
        -lstdc++
 
 # ------------------------------------------------------------------------
 
 noinst_PROGRAMS =                      \
-       test_inband                     \
-       test_usrp_inband
+       test_inband
 
 test_inband_SOURCES = test_inband.cc
-test_inband_LDADD   = libusrp_inband-qa.la
-
-test_usrp_inband_SOURCES = test_usrp_inband.cc
-test_usrp_inband_LDADD = libusrp_inband-qa.la
-
+test_inband_LDADD   = libusrp-inband-qa.la
 
 MOSTLYCLEANFILES = \
        $(BUILT_SOURCES) *~ *.pyc