diff options
| author | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2006-08-06 04:31:17 +0000 |
|---|---|---|
| committer | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2006-08-06 04:31:17 +0000 |
| commit | 951966ca64fc1ddd24889f6318c8c8794657cfba (patch) | |
| tree | 610eb170a28db4cc195354594ad510bd7423593d /Makefile.common | |
| parent | db1b2f7c85600ffd108bd69a381505e0e7223a8a (diff) | |
Partial fix for ticket 10 merged into trunk from
branches/developers/jcorgan/ticket-10
As of this merge the trunk and the above branch are identical.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3182 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'Makefile.common')
| -rw-r--r-- | Makefile.common | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/Makefile.common b/Makefile.common index 089519438f..786e8e5a8e 100644 --- a/Makefile.common +++ b/Makefile.common @@ -36,5 +36,27 @@ grpyexecdir = $(pyexecdir)/gnuradio # swig flags SWIGPYTHONFLAGS = -fvirtual -python -modern -# gnuradio-core library link command -GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib -lgnuradio-core -lfftw3f -lm +GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ + -I$(top_srcdir)/gnuradio-core/src/lib/general \ + -I$(top_srcdir)/gnuradio-core/src/lib/filter \ + -I$(top_srcdir)/gnuradio-core/src/lib/reed-solomon \ + -I$(top_srcdir)/gnuradio-core/src/lib/io \ + -I$(top_srcdir)/gnuradio-core/src/lib/g72x \ + -I$(top_srcdir)/gnuradio-core/src/lib/atsc \ + -I$(top_srcdir)/gnuradio-core/src/lib/omnithread \ + -I$(top_srcdir)/gnuradio-core/src/lib/swig \ + -I$(top_builddir)/gnuradio-core/src/lib/swig \ + $(FFTW3F_CFLAGS) + +GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \ + -lgnuradio-core -lfftw3f -lm + +GNURADIO_I = $(top_builddir)/gnuradio-core/src/lib/swig/gnuradio.i + +USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \ + -I$(top_srcdir)/usrp/firmware/include + +USRP_LIBS = -L$(top_builddir)/usrp/host/lib \ + -lusrp + +STD_DEFINES_AND_INCLUDES=$(DEFINES) $(GNURADIO_INCLUDES) $(BOOST_CFLAGS) |