diff options
| author | Josh Blum | 2011-09-05 22:35:52 -0700 |
|---|---|---|
| committer | Josh Blum | 2011-09-05 22:35:52 -0700 |
| commit | 7628cff158a4bddaef5f38dc649ea9047008ed48 (patch) | |
| tree | 18d32766d5dc97be3f24a5cedf38d018194d1f1c /Makefile.common | |
| parent | f535cd0f1fbc7cfc753f5abbe99251a50cd32acb (diff) | |
| parent | 65fbbb8f752ebf522ac2628f850445e66a278e2f (diff) | |
| download | gnuradio-7628cff158a4bddaef5f38dc649ea9047008ed48.tar.gz gnuradio-7628cff158a4bddaef5f38dc649ea9047008ed48.tar.bz2 gnuradio-7628cff158a4bddaef5f38dc649ea9047008ed48.zip | |
Merge branch 'digital' of https://github.com/trondeau/gnuradio into digital
Conflicts:
gnuradio-core/src/lib/general/gr_pll_carriertracking_cc.h
gnuradio-core/src/lib/general/gr_pll_freqdet_cf.h
gr-digital/lib/digital_constellation.h
gr-digital/lib/digital_constellation_receiver_cb.h
gr-digital/lib/digital_fll_band_edge_cc.h
gr-digital/lib/digital_mpsk_receiver_cc.h
Diffstat (limited to 'Makefile.common')
| -rw-r--r-- | Makefile.common | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile.common b/Makefile.common index 20b8a78cf..2a5addd65 100644 --- a/Makefile.common +++ b/Makefile.common @@ -110,6 +110,10 @@ GCELL_SPU_LA = @gcell_spu_LA@ # libtool aware wrapper for ppu-embedspu GCELL_EMBEDSPU_LIBTOOL = @abs_top_srcdir@/gcell/lib/runtime/gcell-embedspu-libtool +# GR-DIGITAL includes and libraries +GR_DIGITAL_INCLUDES = @gr_digital_INCLUDES@ +GR_DIGITAL_LA = @gr_digital_LA@ + # 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 |