diff options
| author | jcorgan | 2006-08-07 15:41:19 +0000 |
|---|---|---|
| committer | jcorgan | 2006-08-07 15:41:19 +0000 |
| commit | e27ba9aebfddf88cd245636d2f652a4ee4e289ec (patch) | |
| tree | 01f44251578419823c34f140ee58d8fc6016a1c2 /Makefile.common | |
| parent | 37bee553f670da9c82b5a438fe06df3a1ca8b2aa (diff) | |
| download | gnuradio-e27ba9aebfddf88cd245636d2f652a4ee4e289ec.tar.gz gnuradio-e27ba9aebfddf88cd245636d2f652a4ee4e289ec.tar.bz2 gnuradio-e27ba9aebfddf88cd245636d2f652a4ee4e289ec.zip | |
Fixes for ticket:10, ticket:18, and ticket:19. Merged r3194:3215 from
/gnuradio/branches/developers/jcorgan/ticket-10. 'make distcheck' now
successfully completes on a machine that has never had gnuradio installed
before. In addition, several cleanups and refactoring of build system
code have been applied. NOTE: gr-audio-portaudio, gr-audio-osx, and
gr-audio-windows have not been fully tested and will need verification
by the maintainers of these components.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3216 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'Makefile.common')
| -rw-r--r-- | Makefile.common | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Makefile.common b/Makefile.common index f0f02119a..390d7e900 100644 --- a/Makefile.common +++ b/Makefile.common @@ -37,23 +37,28 @@ grpyexecdir = $(pyexecdir)/gnuradio SWIGPYTHONFLAGS = -fvirtual -python -modern # Where to find gnuradio include files in the current build tree +# top_srcdir for original stuff, top_builddir for generated files GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \ -I$(top_srcdir)/gnuradio-core/src/lib/general \ + -I$(top_builddir)/gnuradio-core/src/lib/general \ -I$(top_srcdir)/gnuradio-core/src/lib/filter \ - -I$(top_srcdir)/gnuradio-core/src/lib/reed-solomon \ + -I$(top_builddir)/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/omnithread \ -I$(top_srcdir)/gnuradio-core/src/lib/swig \ - -I$(top_builddir)/gnuradio-core/src/lib/swig \ + -I$(top_builddir)/gnuradio-core/src/lib/swig \ $(FFTW3F_CFLAGS) + # These used to be set in PKGCONFIG but now point to the current # build tree. 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 +# This is a dependency for many swig operations +GNURADIO_I = $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i # The below used to be set in PKGCONFIG but now point to the current # build tree. |