Merged r7478:7608 from michaelld/t186 into trunk. Adds ability to compile GNU Radio modules individually, using already installed dependent libraries and include files. New functionality is enabled using --with-* on configure command line; existing build options should remain unchanged. Nice work by Michael Dickens, still needs documentation update on wiki.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@7617 221aa14e-8319-0410-a670-987f0aec2ac5
2008-02-08 23:32:10 +00:00 · 2008-02-08 23:32:10 +00:00 · 5c0e77db8e
parent df946735f9
commit 5c0e77db8e
17 changed files with 24 additions and 43 deletions
--- a/host/apps-inband/Makefile.am
+++ b/host/apps-inband/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
 # 
@ -23,7 +23,8 @@ include $(top_srcdir)/Makefile.common

 INCLUDES = 	\
 	$(DEFINES) $(OMNITHREAD_INCLUDES) $(PMT_INCLUDES) $(MBLOCK_INCLUDES) \
-	$(USRP_INCLUDES) $(USRP_INBAND_INCLUDES) $(BOOST_CFLAGS) $(CPPUNIT_INCLUDES)
+	$(USRP_INCLUDES) $(USRP_INBAND_INCLUDES) $(BOOST_CFLAGS) \
+	$(CPPUNIT_INCLUDES) $(WITH_INCLUDES)


 bin_PROGRAMS =				
--- a/host/apps-inband/gmac.cc
+++ b/host/apps-inband/gmac.cc
@ -31,7 +31,6 @@
 #include <mb_exception.h>
 #include <mb_msg_queue.h>
 #include <mb_message.h>
-#include <mb_mblock_impl.h>
 #include <mb_msg_accepter.h>
 #include <mb_class_registry.h>
 #include <pmt.h>
--- a/host/apps-inband/test_gmac_tx.cc
+++ b/host/apps-inband/test_gmac_tx.cc
@ -25,12 +25,10 @@

 #include <mb_mblock.h>
 #include <mb_runtime.h>
-#include <mb_runtime_nop.h>		// QA only
 #include <mb_protocol_class.h>
 #include <mb_exception.h>
 #include <mb_msg_queue.h>
 #include <mb_message.h>
-#include <mb_mblock_impl.h>
 #include <mb_msg_accepter.h>
 #include <mb_class_registry.h>
 #include <pmt.h>
--- a/host/apps-inband/test_usrp_inband_cs.cc
+++ b/host/apps-inband/test_usrp_inband_cs.cc
@ -25,12 +25,10 @@

 #include <mb_mblock.h>
 #include <mb_runtime.h>
-#include <mb_runtime_nop.h>		// QA only
 #include <mb_protocol_class.h>
 #include <mb_exception.h>
 #include <mb_msg_queue.h>
 #include <mb_message.h>
-#include <mb_mblock_impl.h>
 #include <mb_msg_accepter.h>
 #include <mb_class_registry.h>
 #include <pmt.h>
--- a/host/apps-inband/test_usrp_inband_overrun.cc
+++ b/host/apps-inband/test_usrp_inband_overrun.cc
@ -25,12 +25,10 @@

 #include <mb_mblock.h>
 #include <mb_runtime.h>
-#include <mb_runtime_nop.h>		// QA only
 #include <mb_protocol_class.h>
 #include <mb_exception.h>
 #include <mb_msg_queue.h>
 #include <mb_message.h>
-#include <mb_mblock_impl.h>
 #include <mb_msg_accepter.h>
 #include <mb_class_registry.h>
 #include <pmt.h>
--- a/host/apps-inband/test_usrp_inband_ping.cc
+++ b/host/apps-inband/test_usrp_inband_ping.cc
@ -25,12 +25,10 @@

 #include <mb_mblock.h>
 #include <mb_runtime.h>
-#include <mb_runtime_nop.h>		// QA only
 #include <mb_protocol_class.h>
 #include <mb_exception.h>
 #include <mb_msg_queue.h>
 #include <mb_message.h>
-#include <mb_mblock_impl.h>
 #include <mb_msg_accepter.h>
 #include <mb_class_registry.h>
 #include <pmt.h>
--- a/host/apps-inband/test_usrp_inband_registers.cc
+++ b/host/apps-inband/test_usrp_inband_registers.cc
@ -25,12 +25,11 @@

 #include <mb_mblock.h>
 #include <mb_runtime.h>
-#include <mb_runtime_nop.h>		// QA only
 #include <mb_protocol_class.h>
 #include <mb_exception.h>
 #include <mb_msg_queue.h>
 #include <mb_message.h>
-#include <mb_mblock_impl.h>
+//#include <mb_mblock_impl.h>
 #include <mb_msg_accepter.h>
 #include <mb_class_registry.h>
 #include <pmt.h>
--- a/host/apps-inband/test_usrp_inband_rx.cc
+++ b/host/apps-inband/test_usrp_inband_rx.cc
@ -25,12 +25,10 @@

 #include <mb_mblock.h>
 #include <mb_runtime.h>
-#include <mb_runtime_nop.h>		// QA only
 #include <mb_protocol_class.h>
 #include <mb_exception.h>
 #include <mb_msg_queue.h>
 #include <mb_message.h>
-#include <mb_mblock_impl.h>
 #include <mb_msg_accepter.h>
 #include <mb_class_registry.h>
 #include <pmt.h>
--- a/host/apps-inband/test_usrp_inband_timestamps.cc
+++ b/host/apps-inband/test_usrp_inband_timestamps.cc
@ -25,12 +25,10 @@

 #include <mb_mblock.h>
 #include <mb_runtime.h>
-#include <mb_runtime_nop.h>		// QA only
 #include <mb_protocol_class.h>
 #include <mb_exception.h>
 #include <mb_msg_queue.h>
 #include <mb_message.h>
-#include <mb_mblock_impl.h>
 #include <mb_msg_accepter.h>
 #include <mb_class_registry.h>
 #include <pmt.h>
--- a/host/apps-inband/test_usrp_inband_tx.cc
+++ b/host/apps-inband/test_usrp_inband_tx.cc
@ -25,12 +25,10 @@

 #include <mb_mblock.h>
 #include <mb_runtime.h>
-#include <mb_runtime_nop.h>		// QA only
 #include <mb_protocol_class.h>
 #include <mb_exception.h>
 #include <mb_msg_queue.h>
 #include <mb_message.h>
-#include <mb_mblock_impl.h>
 #include <mb_msg_accepter.h>
 #include <mb_class_registry.h>
 #include <pmt.h>
--- a/host/apps-inband/test_usrp_inband_underrun.cc
+++ b/host/apps-inband/test_usrp_inband_underrun.cc
@ -25,12 +25,10 @@

 #include <mb_mblock.h>
 #include <mb_runtime.h>
-#include <mb_runtime_nop.h>		// QA only
 #include <mb_protocol_class.h>
 #include <mb_exception.h>
 #include <mb_msg_queue.h>
 #include <mb_message.h>
-#include <mb_mblock_impl.h>
 #include <mb_msg_accepter.h>
 #include <mb_class_registry.h>
 #include <pmt.h>
--- a/host/apps/Makefile.am
+++ b/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,8 +21,8 @@

 include $(top_srcdir)/Makefile.common

-INCLUDES = $(USRP_INCLUDES) $(BOOST_CFLAGS) $(CPPUNIT_INCLUDES)
-
+INCLUDES = $(USRP_INCLUDES) $(BOOST_CFLAGS) $(CPPUNIT_INCLUDES) \
+	   $(WITH_INCLUDES)

 bin_PROGRAMS =				\
 	usrper				\
--- a/host/lib/inband/Makefile.am
+++ b/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
 # 
@ -23,7 +23,7 @@ include $(top_srcdir)/Makefile.common
 INCLUDES = 	\
 	$(DEFINES) $(OMNITHREAD_INCLUDES) $(PMT_INCLUDES) $(MBLOCK_INCLUDES) \
 	$(USRP_INCLUDES) $(BOOST_CFLAGS) $(CPPUNIT_INCLUDES) \
-	-I$(srcdir)/../../apps-inband
+	-I$(srcdir)/../../apps-inband $(WITH_INCLUDES)

 TESTS = test_inband

@ -31,12 +31,10 @@ EXTRA_DIST =				\
 	usrp_server.mbh			\
 	usrp_interface.mbh 

-
 lib_LTLIBRARIES = 			\
 	libusrp_inband.la		\
 	libusrp_inband-qa.la

-
 # ------------------------------------------------------------------------
 # Build the inband library

@ -75,7 +73,7 @@ include_HEADERS =			\
 	usrp_server.h			\
 	usrp_tx.h			\
 	usrp_tx_stub.h			\
-	usrp_usb_interface.h 		
+	usrp_usb_interface.h

 noinst_HEADERS =      			\
 	fake_usrp.h			\
@ -89,8 +87,7 @@ 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

 # ------------------------------------------------------------------------
 # Build the qa code in its own library
@ -98,7 +95,7 @@ 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
@ -121,6 +118,5 @@ test_inband_LDADD   = libusrp_inband-qa.la
 test_usrp_inband_SOURCES = test_usrp_inband.cc
 test_usrp_inband_LDADD = libusrp_inband-qa.la

-
 MOSTLYCLEANFILES = \
 	$(BUILT_SOURCES) *~ *.pyc
--- a/host/lib/legacy/Makefile.am
+++ b/host/lib/legacy/Makefile.am
@ -1,7 +1,7 @@
 #
 #  USRP - Universal Software Radio Peripheral
 # 
-#  Copyright (C) 2003,2004,2006,2007 Free Software Foundation, Inc.
+#  Copyright (C) 2003,2004,2006,2007,2008 Free Software Foundation, Inc.
 # 
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@ -32,10 +32,10 @@ libusrp_la_common_LIBADD = 		\

 # darwin fusb requires omnithreads
 if FUSB_TECH_darwin
-INCLUDES = $(common_INCLUDES) $(OMNITHREAD_INCLUDES)
+INCLUDES = $(common_INCLUDES) $(OMNITHREAD_INCLUDES) $(WITH_INCLUDES)
 libusrp_la_LIBADD = $(libusrp_la_common_LIBADD) $(OMNITHREAD_LA)
 else
-INCLUDES = $(common_INCLUDES)
+INCLUDES = $(common_INCLUDES) $(WITH_INCLUDES)
 libusrp_la_LIBADD = $(libusrp_la_common_LIBADD)
 endif

--- a/host/swig/Makefile.am
+++ b/host/swig/Makefile.am
@ -1,5 +1,5 @@
 #
-# Copyright 2001,2003,2004,2006,2007 Free Software Foundation, Inc.
+# Copyright 2001,2003,2004,2006,2007,2008 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@ -27,7 +27,8 @@ ourlibdir    = $(usrppyexecdir)

 INCLUDES = $(USRP_INCLUDES) 		\
 	   $(PYTHON_CPPFLAGS) 		\
-	   -I$(srcdir)
+	   -I$(srcdir)			\
+	   $(WITH_INCLUDES)

 LOCAL_IFILES =				\
 	prims.i
@ -52,7 +53,8 @@ ourpython_PYTHON = 			\
 	usrp_prims.py			


-SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(INCLUDES)
+SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(INCLUDES) $(WITH_SWIG_INCLUDES) \
+	$(WITH_INCLUDES)


 ourlib_LTLIBRARIES = 			\
--- a/usrp-inband.pc.in
+++ b/usrp-inband.pc.in
@ -5,7 +5,7 @@ includedir=@includedir@

 Name: usrp
 Description: USRP C++ Interface with in-band signaling
-Requires:
+Requires: libusb mblock pmt usrp gnuradio-omnithread
 Version: @VERSION@
-Libs: -L${libdir} -lusrp-inband -lusrp -lmblock -lgromnithread -lpmt -lusb
+Libs: -L${libdir} -lusrp-inband -lusrp -lmblock -lpmt -lgromnithread -lusb
 Cflags: -I${includedir} @DEFINES@
--- a/usrp.pc.in
+++ b/usrp.pc.in
@ -5,7 +5,7 @@ includedir=@includedir@

 Name: usrp
 Description: USRP Client Side C++ interface
-Requires:
+Requires: libusb @usrp_darwin_omnithread_pc_requires@
 Version: @VERSION@
-Libs: -L${libdir} -lusrp -lusb
+Libs: -L${libdir} -lusrp -lusb @usrp_darwin_omnithread_pc_la@
 Cflags: -I${includedir} @DEFINES@