Merged r9481:9518 on jblum/grc_reorganize into trunk. Reorganized grc source under...

[debian/gnuradio] / Makefile.common

diff --git a/Makefile.common b/Makefile.common
index 0ee6f2bf3affe5b1b9b563cfd4e8d0afdad4ca0a..eb7390811bd50a800518d91f67bbacd5b6ab5036 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -72,6 +72,10 @@ GNURADIO_CORE_LA = @gnuradio_core_LA@
 # This is a dependency for many swig operations
 GNURADIO_I = @gnuradio_core_I@
 
+# How to link in the USRP library from inside the tree
+GRUEL_INCLUDES = @gruel_INCLUDES@
+GRUEL_LA = @gruel_LA@
+
 # How to link in the USRP library from inside the tree
 USRP_INCLUDES = @usrp_INCLUDES@
 USRP_LA = @usrp_LA@
@@ -101,7 +105,7 @@ GCELL_EMBEDSPU_LIBTOOL = @abs_top_srcdir@/gcell/src/lib/runtime/gcell-embedspu-l
 
 # 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)
+STD_DEFINES_AND_INCLUDES=$(DEFINES) $(BOOST_CPPFLAGS) $(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
@@ -112,3 +116,6 @@ COMPILE_MBH = $(RUN_GUILE) $(top_srcdir)/mblock/src/scheme/gnuradio/compile-mbh.
 
 # Base directory for example applications
 exampledir = $(datadir)/gnuradio/examples
+
+# Base directory for documentation
+gr_docdir = $(docdir)-$(VERSION)