[Commit-gnuradio] r5664 - in gnuradio/branches/developers/gnychis/inband/usrp/host: apps lib/inband

[eb]

Author: eb
Date: 2007-06-04 10:59:10 -0600 (Mon, 04 Jun 2007)
New Revision: 5664

Modified:
   gnuradio/branches/developers/gnychis/inband/usrp/host/apps/Makefile.am
   gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/Makefile.am
Log:
fix for parallel make and distcheck

Modified: gnuradio/branches/developers/gnychis/inband/usrp/host/apps/Makefile.am
===================================================================
--- gnuradio/branches/developers/gnychis/inband/usrp/host/apps/Makefile.am      
2007-06-04 16:11:19 UTC (rev 5663)
+++ gnuradio/branches/developers/gnychis/inband/usrp/host/apps/Makefile.am      
2007-06-04 16:59:10 UTC (rev 5664)
@@ -37,7 +37,9 @@
        test_usrp_standard_tx           
 
 noinst_HEADERS =                       \
-       time_stuff.h
+       time_stuff.h                    \
+       ui_nco.h                        \
+       ui_sincos.h                     
 
 noinst_PYTHON =                                \
        burn-db-eeprom                  \

Modified: 
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/Makefile.am    
    2007-06-04 16:11:19 UTC (rev 5663)
+++ 
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/Makefile.am    
    2007-06-04 16:59:10 UTC (rev 5664)
@@ -27,20 +27,24 @@
 TESTS = test_inband
 
 EXTRA_DIST =                           \
-       usrp_server.mbh         \
+       usrp_server.mbh                 \
        usrp_interface.mbh 
 
 
 lib_LTLIBRARIES =                      \
-       libusrp_inband.la                       \
+       libusrp_inband.la               \
        libusrp_inband-qa.la
 
+# FIXME, we've got a parallel make problem (make -j3):
+# make[6]: *** No rule to make target 
+# `../../../../usrp/host/lib/inband/libusrp_inband.la', needed by 
`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
@@ -52,20 +56,20 @@
 libusrp_inband_la_SOURCES =            \
        $(BUILT_SOURCES)                \
        usrp_server.cc                  \
-       usrp_usb_interface.cc   \
+       usrp_usb_interface.cc           \
        usrp_usb_interface_stub.cc
 
 libusrp_inband_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0
 
 libusrp_inband_la_LIBADD =                                     \
        $(MBLOCK_LA)                                            \
-       $(top_builddir)/usrp/host/lib/legacy/libusrp.la         \
+       ../legacy/libusrp.la                                    \
        -lstdc++
 
 include_HEADERS =                      \
-       usrp_server.h                           \
-       usrp_usb_interface.h \
-       usrp_inband_usb_packet.h \
+       usrp_server.h                   \
+       usrp_usb_interface.h            \
+       usrp_inband_usb_packet.h        \
        usrp_usb_interface_stub.h
 
 noinst_HEADERS =                       \
@@ -90,13 +94,14 @@
 libusrp_inband_qa_la_LIBADD =          \
        libusrp_inband.la               \
        $(CPPUNIT_LIBS)                 \
-       $(USRP_LA)                                      \
+       ../legacy/libusrp.la            \
+       libusrp_inband.la               \
        -lstdc++
 
 # ------------------------------------------------------------------------
 
 noinst_PROGRAMS =                      \
-       test_inband                                     \
+       test_inband                     \
        test_usrp_inband
 
 test_inband_SOURCES = test_inband.cc