diff options
| author | Josh Blum <josh@joshknows.com> | 2011-10-11 21:35:35 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-10-11 21:35:35 -0700 |
| commit | 1259a01a9479071bd1729a9c9496444f0a72509b (patch) | |
| tree | 55350454454a119fb230cdbaadfb27d361f191ec /Makefile.common | |
| parent | 71c0f14a46f85027b95f2f5f6d3d219cc9e3783e (diff) | |
| parent | 06860c309153890a6a42babfbedf230eb24f0042 (diff) | |
Merge branch 'next' of http://gnuradio.org/git/gnuradio into next
Conflicts:
gr-digital/include/digital_constellation.h
Diffstat (limited to 'Makefile.common')
| -rw-r--r-- | Makefile.common | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/Makefile.common b/Makefile.common index 2a5addd65b..8faf645869 100644 --- a/Makefile.common +++ b/Makefile.common @@ -63,13 +63,6 @@ grpyexecdir = $(pyexecdir)/gnuradio usrppythondir = $(pythondir)/usrpm usrppyexecdir = $(pyexecdir)/usrpm -# gcell includes -gcellincludedir = $(includedir)/gcell -gcellspuincludedir = $(includedir)/gcell/spu - -# Cell spu libs -libspudir = $(libdir)spu - # 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) $(GNURADIO_INCLUDES) \ @@ -99,21 +92,14 @@ VOLK_LA = @volk_LA@ USRP_INCLUDES = @usrp_INCLUDES@ USRP_LA = @usrp_LA@ -# How to link the gcell library from inside the tree (the PPU part) -GCELL_INCLUDES = @gcell_INCLUDES@ -GCELL_LA = @gcell_LA@ - -# How to link the gcell library from inside the tree (the SPU part) -GCELL_SPU_INCLUDES = @gcell_spu_INCLUDES@ -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@ +# GR-QTGUI includes and libraries +GR_QTGUI_INCLUDES = @gr_qtgui_INCLUDES@ +GR_QTGUI_LA = @gr_qtgui_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 |