diff options
| author | eb <eb@221aa14e-8319-0410-a670-987f0aec2ac5> | 2007-05-02 04:08:47 +0000 |
|---|---|---|
| committer | eb <eb@221aa14e-8319-0410-a670-987f0aec2ac5> | 2007-05-02 04:08:47 +0000 |
| commit | 0bf2128a621ae84099f43744e1b81800f2b9d2d7 (patch) | |
| tree | 1345b44ae9060e99ff236f983dd272c6d35a012e /Makefile.common | |
| parent | 28259329a829f157fd877a1c14139eaf0117dabd (diff) | |
Merged features/inband -r4812:5218 into trunk. This group of changes
includes:
* working stand-alone mblock code
* work-in-progress on usrp inband signaling
usrp now depends on mblock, and guile is a dependency.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@5221 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'Makefile.common')
| -rw-r--r-- | Makefile.common | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/Makefile.common b/Makefile.common index 35ff203954..3906542b5a 100644 --- a/Makefile.common +++ b/Makefile.common @@ -73,14 +73,19 @@ GNURADIO_CORE_LA = $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i # How to link in the USRP library from inside the tree -USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ +USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib/legacy \ + -I$(top_srcdir)/usrp/host/lib/inband \ -I$(top_srcdir)/usrp/firmware/include -USRP_LA = $(top_builddir)/usrp/host/lib/libusrp.la +USRP_LA = $(top_builddir)/usrp/host/lib/legacy/libusrp.la # How to link the PMT library from inside the tree PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib PMT_LA = $(top_builddir)/pmt/src/lib/libpmt.la +# How to link the mblock library from inside the tree +MBLOCK_INCLUDES = -I$(top_srcdir)/mblock/src/lib +MBLOCK_LA = $(top_builddir)/mblock/src/lib/libmblock.la + # This used to be set in configure.ac but is now defined here for all # Makefiles when this fragment is included. STD_DEFINES_AND_INCLUDES=$(DEFINES) $(OMNITHREAD_INCLUDES) $(GNURADIO_INCLUDES) $(BOOST_CFLAGS) @@ -88,3 +93,6 @@ STD_DEFINES_AND_INCLUDES=$(DEFINES) $(OMNITHREAD_INCLUDES) $(GNURADIO_INCLUDES) # Fix for BSD make not defining $(RM). We define it now in configure.ac # using AM_PATH_PROG, but now here have to add a -f to be like GNU make RM=$(RM_PROG) -f + +RUN_GUILE = GUILE_LOAD_PATH="@abs_top_srcdir@/pmt/src/scheme:@abs_top_srcdir@/mblock/src/scheme" @GUILE@ -e main -s +COMPILE_MBH = $(RUN_GUILE) $(top_srcdir)/mblock/src/scheme/gnuradio/compile-mbh.scm |