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 9f6a7ab62d364c0a6a38c15ab600735c48cf1ebb..b08ef01e3f9c63e4610dd103aa4964967ed9b698 100644 (file)
--- a/usrp/host/lib/inband/Makefile.am
+++ b/usrp/host/lib/inband/Makefile.am
@@ -1,11 +1,11 @@
 #
-# Copyright 2007 Free Software Foundation, Inc.
+# Copyright 2007,2008 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,
@@ -20,46 +20,73 @@
 
 include $(top_srcdir)/Makefile.common
 
-INCLUDES =     \
+AM_CPPFLAGS =  \
        $(DEFINES) $(OMNITHREAD_INCLUDES) $(PMT_INCLUDES) $(MBLOCK_INCLUDES) \
-       $(USRP_INCLUDES) $(BOOST_CFLAGS) $(CPPUNIT_INCLUDES)
+       $(USRP_INCLUDES) $(BOOST_CPPFLAGS) $(CPPUNIT_INCLUDES) \
+       -I$(srcdir)/../../apps-inband $(WITH_INCLUDES)
 
 TESTS = test_inband
 
-EXTRA_DIST =                           
+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
 
 BUILT_SOURCES =                                \
-       usrp_server_mbh.cc
+       usrp_server_mbh.cc              \
+       usrp_interface_mbh.cc 
 
 usrp_server_mbh.cc : usrp_server.mbh
-       $(COMPILE_MBH) usrp_server.mbh usrp_server_mbh.cc
+       $(COMPILE_MBH) $(srcdir)/usrp_server.mbh usrp_server_mbh.cc
+
+usrp_interface_mbh.cc : usrp_interface.mbh
+       $(COMPILE_MBH) $(srcdir)/usrp_interface.mbh usrp_interface_mbh.cc
 
 libusrp_inband_la_SOURCES =            \
        $(BUILT_SOURCES)                \
-       usrp_server.cc
+       $(srcdir)/../../apps-inband/ui_sincos.c \
+       usrp_inband_usb_packet.cc       \
+       usrp_rx.cc                      \
+       usrp_rx_stub.cc                 \
+       usrp_server.cc                  \
+       usrp_tx.cc                      \
+       usrp_tx_stub.cc                 \
+       usrp_usb_interface.cc           
 
 libusrp_inband_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0
 
 libusrp_inband_la_LIBADD =             \
        $(MBLOCK_LA)                    \
+       $(USRP_LA)                      \
        -lstdc++
 
-
 include_HEADERS =                      \
-       usrp_server.h                   
+       usrp_inband_usb_packet.h        \
+       usrp_rx.h                       \
+       usrp_rx_stub.h                  \
+       usrp_server.h                   \
+       usrp_tx.h                       \
+       usrp_tx_stub.h                  \
+       usrp_usb_interface.h \
+       symbols_usrp_channel.h          \
+       symbols_usrp_interface_cs.h     \
+       symbols_usrp_low_level_cs.h     \
+       symbols_usrp_rx.h               \
+       symbols_usrp_rx_cs.h            \
+       symbols_usrp_server_cs.h        \
+       symbols_usrp_tx.h               \
+       symbols_usrp_tx_cs.h
 
 noinst_HEADERS =                       \
        qa_inband.h                     \
        qa_inband_packet_prims.h        \
-       qa_inband_usrp_server.h
+       qa_inband_usrp_server.h         
 
 # ------------------------------------------------------------------------
 # Build the qa code in its own library
@@ -67,14 +94,14 @@ 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
 
-# link against c++ standard library
 libusrp_inband_qa_la_LIBADD =          \
-       libusrp_inband.la               \
+       libusrp-inband.la               \
+       $(PMT_LA)                       \
        $(CPPUNIT_LIBS)                 \
        -lstdc++
 
@@ -84,9 +111,7 @@ noinst_PROGRAMS =                    \
        test_inband
 
 test_inband_SOURCES = test_inband.cc
-test_inband_LDADD   = libusrp_inband-qa.la
-
+test_inband_LDADD   = libusrp-inband-qa.la
 
 MOSTLYCLEANFILES = \
        $(BUILT_SOURCES) *~ *.pyc
-