diff options
| author | Don Ward | 2010-04-30 17:00:33 -0400 |
|---|---|---|
| committer | Don Ward | 2010-04-30 17:00:33 -0400 |
| commit | dda6ed353551d3493983bd56e0ca8ee8ed4407c5 (patch) | |
| tree | ad6e304c1843953ca88dd944bda4498b5fe62570 /Makefile.common | |
| parent | 04d3f1954b589656b34298b98e36b8667700d89a (diff) | |
| parent | 9038b3530d0ec746f401f3c443e2f862fff5a18e (diff) | |
| download | gnuradio-dda6ed353551d3493983bd56e0ca8ee8ed4407c5.tar.gz gnuradio-dda6ed353551d3493983bd56e0ca8ee8ed4407c5.tar.bz2 gnuradio-dda6ed353551d3493983bd56e0ca8ee8ed4407c5.zip | |
Merge branch 'master' into udp
Diffstat (limited to 'Makefile.common')
| -rw-r--r-- | Makefile.common | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/Makefile.common b/Makefile.common index 64891345b..aafe85fe7 100644 --- a/Makefile.common +++ b/Makefile.common @@ -1,6 +1,6 @@ # -*- Makefile -*- # -# Copyright 2004,2006,2007,2008,2009 Free Software Foundation, Inc. +# Copyright 2004,2006,2007,2008,2009,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -55,17 +55,13 @@ 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) $(BOOST_CPPFLAGS) \ - $(OMNITHREAD_INCLUDES) $(GNURADIO_INCLUDES) $(GRUEL_INCLUDES) + $(GNURADIO_INCLUDES) $(GRUEL_INCLUDES) # when including for compilation from pre-installed libraries and such, # need to make sure those are put last on the compile command WITH_INCLUDES = @with_INCLUDES@ WITH_SWIG_INCLUDES = @with_SWIG_INCLUDES@ -# How to link in the top-level omnithreads library from inside the tree -OMNITHREAD_INCLUDES = @omnithread_INCLUDES@ -OMNITHREAD_LA = @omnithread_LA@ - # Where to find gnuradio include files in the current build tree # top_srcdir for original stuff, top_builddir for generated files GNURADIO_INCLUDES = @gnuradio_core_INCLUDES@ @@ -81,10 +77,6 @@ GRUEL_LA = @gruel_LA@ USRP_INCLUDES = @usrp_INCLUDES@ USRP_LA = @usrp_LA@ -# How to link the mblock library from inside the tree -MBLOCK_INCLUDES = @mblock_INCLUDES@ -MBLOCK_LA = @mblock_LA@ - # How to link the gcell library from inside the tree (the PPU part) GCELL_INCLUDES = @gcell_INCLUDES@ GCELL_LA = @gcell_LA@ @@ -100,8 +92,7 @@ GCELL_EMBEDSPU_LIBTOOL = @abs_top_srcdir@/gcell/lib/runtime/gcell-embedspu-libto # 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@/gruel/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 +RUN_GUILE = GUILE_LOAD_PATH="@abs_top_srcdir@/gruel/src/scheme" @GUILE@ -e main -s # Base directory for example applications exampledir = $(datadir)/gnuradio/examples |