diff options
40 files changed, 105 insertions, 85 deletions
diff --git a/Makefile.common b/Makefile.common index f0f02119ab..390d7e9006 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. diff --git a/config/grc_gr_audio_alsa.m4 b/config/grc_gr_audio_alsa.m4 index c1d88b9e43..32b1e16b59 100644 --- a/config/grc_gr_audio_alsa.m4 +++ b/config/grc_gr_audio_alsa.m4 @@ -29,7 +29,7 @@ AC_DEFUN([GRC_GR_AUDIO_ALSA],[ succeeded=yes PKG_CHECK_MODULES(ALSA, alsa >= 0.9,[],[succeeded=no]) if test $succeeded = yes; then - LIBS="$LIBS $ALSA_LIBS" + AC_SUBST(ALSA_LIBS) dnl run_tests is created from run_tests.in. Make it executable. AC_CONFIG_COMMANDS([run_tests_alsa], [chmod +x gr-audio-alsa/src/run_tests]) diff --git a/config/grc_gr_audio_jack.m4 b/config/grc_gr_audio_jack.m4 index 0aa44e063e..d84313097e 100644 --- a/config/grc_gr_audio_jack.m4 +++ b/config/grc_gr_audio_jack.m4 @@ -29,7 +29,7 @@ AC_DEFUN([GRC_GR_AUDIO_JACK],[ succeeded=yes PKG_CHECK_MODULES(JACK, jack >= 0.8,[],[succeeded=no]) if test $succeeded = yes; then - LIBS="$LIBS $JACK_LIBS" + AC_SUBST(JACK_LIBS) dnl run_tests is created from run_tests.in. Make it executable. AC_CONFIG_COMMANDS([run_tests_jack], [chmod +x gr-audio-jack/src/run_tests]) diff --git a/config/grc_gr_audio_portaudio.m4 b/config/grc_gr_audio_portaudio.m4 index a461466041..19dfaa2a96 100644 --- a/config/grc_gr_audio_portaudio.m4 +++ b/config/grc_gr_audio_portaudio.m4 @@ -28,9 +28,9 @@ AC_DEFUN([GRC_GR_AUDIO_PORTAUDIO],[ succeeded=yes PKG_CHECK_MODULES(PORTAUDIO, portaudio-2.0 >= 19,[],[succeeded=no]) - #AC_HAVE_LIBRARY([portaudio], [], [succeeded=no]) - #AC_CHECK_HEADER([portaudio.h], [], [succeeded=no]) + if test $succeeded = yes; then + AC_SUBST(PORTAUDIO_LIBS) dnl run_tests is created from run_tests.in. Make it executable. AC_CONFIG_COMMANDS([run_tests_portaudio], [chmod +x gr-audio-portaudio/src/run_tests]) subdirs="$subdirs gr-audio-portaudio" diff --git a/config/grc_gr_audio_windows.m4 b/config/grc_gr_audio_windows.m4 index 5c66b33608..64d482e814 100644 --- a/config/grc_gr_audio_windows.m4 +++ b/config/grc_gr_audio_windows.m4 @@ -30,6 +30,9 @@ AC_DEFUN([GRC_GR_AUDIO_WINDOWS],[ AC_HAVE_LIBRARY(winmm,[],[succeeded=no]) if test $succeeded = yes; then + WINAUDIO_LIBS=-lwinmm + AC_SUBST(WINAUDIO_LIBS) + dnl run_tests is created from run_tests.in. Make it executable. AC_CONFIG_COMMANDS([run_tests_windows], [chmod +x gr-audio-windows/src/run_tests]) subdirs="$subdirs gr-audio-windows" diff --git a/config/grc_gr_comedi.m4 b/config/grc_gr_comedi.m4 index 0800bdec63..22e98cd646 100644 --- a/config/grc_gr_comedi.m4 +++ b/config/grc_gr_comedi.m4 @@ -29,7 +29,7 @@ AC_DEFUN([GRC_GR_COMEDI],[ succeeded=yes PKG_CHECK_MODULES(COMEDI, comedilib >= 0.7,[],[succeeded=no]) if test $succeeded = yes; then - LIBS="$LIBS $COMEDI_LIBS" + AC_SUBST(COMEDI_LIBS) dnl run_tests is created from run_tests.in. Make it executable. AC_CONFIG_COMMANDS([run_tests_comedi], [chmod +x gr-comedi/src/run_tests]) diff --git a/config/grc_gr_video_sdl.m4 b/config/grc_gr_video_sdl.m4 index c161b5f3e8..b0ca943494 100644 --- a/config/grc_gr_video_sdl.m4 +++ b/config/grc_gr_video_sdl.m4 @@ -32,8 +32,11 @@ AC_DEFUN([GRC_GR_VIDEO_SDL],[ AM_PATH_SDL($SDL_VERSION,[],[succeeded=no]) if test $succeeded = yes; then - AM_CFLAGS="$AM_CFLAGS $SDL_CFLAGS" - AM_LDFLAGS="$AM_LDFLAGS $SDL_LIBS" + #AM_CFLAGS="$AM_CFLAGS $SDL_CFLAGS" + #AM_LDFLAGS="$AM_LDFLAGS $SDL_LIBS" + AC_SUBST(SDL_CFLAGS) + AC_SUBST(SDL_LIBS) + dnl run_tests is created from run_tests.in. Make it executable. AC_CONFIG_COMMANDS([run_tests_sdl], [chmod +x gr-video-sdl/src/run_tests]) subdirs="$subdirs gr-video-sdl" diff --git a/config/grc_gr_wxgui.m4 b/config/grc_gr_wxgui.m4 index 8f3c8f8ee9..2713f9b080 100644 --- a/config/grc_gr_wxgui.m4 +++ b/config/grc_gr_wxgui.m4 @@ -22,7 +22,9 @@ AC_DEFUN([GRC_GR_WXGUI],[ # FIXME: Should we actually check for wxPython, even though # this is a runtime requirement, not a compile/install time one? - + # + # This is logged as ticket 17 + AC_CONFIG_FILES([ \ gr-wxgui/Makefile \ gr-wxgui/src/Makefile \ diff --git a/config/grc_gr_pmt.m4 b/config/grc_pmt.m4 index 951d640566..7484b74537 100644 --- a/config/grc_gr_pmt.m4 +++ b/config/grc_pmt.m4 @@ -17,7 +17,7 @@ dnl along with GNU Radio; see the file COPYING. If not, write to dnl the Free Software Foundation, Inc., 59 Temple Place - Suite 330, dnl Boston, MA 02111-1307, USA. -AC_DEFUN([GRC_GR_PMT],[ +AC_DEFUN([GRC_PMT],[ AC_CONFIG_SRCDIR([pmt/src/lib/pmt.h]) AC_CONFIG_FILES([\ diff --git a/configure.ac b/configure.ac index c29203a7c5..0affeb019f 100644 --- a/configure.ac +++ b/configure.ac @@ -162,9 +162,9 @@ GRC_GR_ERROR_CORRECTING_CODES GRC_GR_GSM_FR_VOCODER GRC_GR_RADAR GRC_GR_RADIO_ASTRONOMY -GRC_GR_PMT GRC_GR_VIDEO_SDL GRC_GR_WXGUI +GRC_PMT dnl Has list of successfully configured components AC_SUBST([subdirs],$subdirs) diff --git a/gr-atsc/src/lib/Makefile.am b/gr-atsc/src/lib/Makefile.am index d5ae6ed53d..b625aaabe7 100644 --- a/gr-atsc/src/lib/Makefile.am +++ b/gr-atsc/src/lib/Makefile.am @@ -218,7 +218,7 @@ ALL_IFILES = \ $(NON_LOCAL_IFILES) NON_LOCAL_IFILES = \ - $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i + $(GNURADIO_I) LOCAL_IFILES = \ atsc.i diff --git a/gr-atsc/src/python/run_tests.in b/gr-atsc/src/python/run_tests.in index b83d85bfbe..a13c393aed 100644 --- a/gr-atsc/src/python/run_tests.in +++ b/gr-atsc/src/python/run_tests.in @@ -18,9 +18,9 @@ libsrc=@abs_top_srcdir@/gr-atsc/src/lib py=@abs_top_srcdir@/gr-atsc/src/python # Where to look for GNU Radio python modules in current build tree -# FIXME this is wrong on a distcheck. We really need to ask gnuradio-core -# where it put its python files. -grpythonbld=@abs_top_builddir@/gnuradio-core/src/python/:@abs_top_builddir@/gnuradio-core/src/lib/swig/:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs +grpythonbld=@abs_top_srcdir@/gnuradio-core/src/python +grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig +grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH" export PYTHONPATH diff --git a/gr-audio-alsa/src/Makefile.am b/gr-audio-alsa/src/Makefile.am index e06fef9ae6..b6a8ef388b 100644 --- a/gr-audio-alsa/src/Makefile.am +++ b/gr-audio-alsa/src/Makefile.am @@ -28,8 +28,6 @@ include $(top_srcdir)/Makefile.common ourpythondir = $(grpythondir) ourlibdir = $(grpyexecdir) -LIBS += $(GNURADIO_CORE_LIBS) - EXTRA_DIST = run_tests.in TESTS = run_tests @@ -38,7 +36,7 @@ LOCAL_IFILES = \ audio_alsa.i NON_LOCAL_IFILES = \ - $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i + $(GNURADIO_I) ALL_IFILES = \ $(LOCAL_IFILES) \ @@ -76,6 +74,8 @@ swiginclude_HEADERS = \ _audio_alsa_la_LIBADD = \ $(PYTHON_LDFLAGS) \ + $(GNURADIO_CORE_LIBS) \ + $(ALSA_LIBS) \ -lstdc++ _audio_alsa_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version diff --git a/gr-audio-alsa/src/run_tests.in b/gr-audio-alsa/src/run_tests.in index 4bfb076e8e..99d6ffd9b7 100644 --- a/gr-audio-alsa/src/run_tests.in +++ b/gr-audio-alsa/src/run_tests.in @@ -18,9 +18,9 @@ libsrc=@abs_top_srcdir@/gr-audio-alsa/src py=@abs_top_srcdir@/gr-audio-alsa/src # Where to look for GNU Radio python modules in current build tree -# FIXME this is wrong on a distcheck. We really need to ask gnuradio-core -# where it put its python files. -grpythonbld=@abs_top_builddir@/gnuradio-core/src/python/:@abs_top_builddir@/gnuradio-core/src/lib/swig/:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs +grpythonbld=@abs_top_srcdir@/gnuradio-core/src/python +grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig +grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH" export PYTHONPATH diff --git a/gr-audio-jack/src/Makefile.am b/gr-audio-jack/src/Makefile.am index a00e574c2e..488939a31b 100644 --- a/gr-audio-jack/src/Makefile.am +++ b/gr-audio-jack/src/Makefile.am @@ -21,8 +21,6 @@ include $(top_srcdir)/Makefile.common -LIBS += $(GNURADIO_CORE_LIBS) - # Install this stuff so that it ends up as the gnuradio.audio_jack module # This usually ends up at: # ${prefix}/lib/python${python_version}/site-packages/gnuradio @@ -38,7 +36,7 @@ LOCAL_IFILES = \ audio_jack.i NON_LOCAL_IFILES = \ - $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i + $(GNURADIO_I) ALL_IFILES = \ $(LOCAL_IFILES) \ @@ -78,6 +76,8 @@ swiginclude_HEADERS = \ _audio_jack_la_LIBADD = \ $(PYTHON_LDFLAGS) \ + $(GNURADIO_CORE_LIBS) \ + $(JACK_LIBS) \ -lstdc++ _audio_jack_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version diff --git a/gr-audio-jack/src/run_tests.in b/gr-audio-jack/src/run_tests.in index 3e589894e2..c90640a7e6 100644 --- a/gr-audio-jack/src/run_tests.in +++ b/gr-audio-jack/src/run_tests.in @@ -18,9 +18,9 @@ libsrc=@abs_top_srcdir@/gr-audio-jack/src py=@abs_top_srcdir@/gr-audio-jack/src # Where to look for GNU Radio python modules in current build tree -# FIXME this is wrong on a distcheck. We really need to ask gnuradio-core -# where it put its python files. -grpythonbld=@abs_top_builddir@/gnuradio-core/src/python/:@abs_top_builddir@/gnuradio-core/src/lib/swig/:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs +grpythonbld=@abs_top_srcdir@/gnuradio-core/src/python +grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig +grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH" export PYTHONPATH diff --git a/gr-audio-oss/src/Makefile.am b/gr-audio-oss/src/Makefile.am index 1a73d8d4c0..319db7a8ce 100644 --- a/gr-audio-oss/src/Makefile.am +++ b/gr-audio-oss/src/Makefile.am @@ -21,8 +21,6 @@ include $(top_srcdir)/Makefile.common -LIBS += $(GNURADIO_CORE_LIBS) - # Install this stuff so that it ends up as the gnuradio.audio_oss module # This usually ends up at: # ${prefix}/lib/python${python_version}/site-packages/gnuradio @@ -37,7 +35,7 @@ LOCAL_IFILES = \ audio_oss.i NON_LOCAL_IFILES = \ - $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i + $(GNURADIO_I) ALL_IFILES = \ $(LOCAL_IFILES) \ @@ -71,6 +69,7 @@ swiginclude_HEADERS = \ _audio_oss_la_LIBADD = \ $(PYTHON_LDFLAGS) \ + $(GNURADIO_CORE_LIBS) \ $(OSS_LIBS) \ -lstdc++ diff --git a/gr-audio-oss/src/run_tests.in b/gr-audio-oss/src/run_tests.in index ec252d5084..402a8c4445 100644 --- a/gr-audio-oss/src/run_tests.in +++ b/gr-audio-oss/src/run_tests.in @@ -18,9 +18,9 @@ libsrc=@abs_top_srcdir@/gr-audio-oss/src py=@abs_top_srcdir@/gr-audio-oss/src # Where to look for GNU Radio python modules in current build tree -# FIXME this is wrong on a distcheck. We really need to ask gnuradio-core -# where it put its python files. -grpythonbld=@abs_top_builddir@/gnuradio-core/src/python/:@abs_top_builddir@/gnuradio-core/src/lib/swig/:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs +grpythonbld=@abs_top_srcdir@/gnuradio-core/src/python +grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig +grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH" export PYTHONPATH diff --git a/gr-audio-osx/src/Makefile.am b/gr-audio-osx/src/Makefile.am index 54cc327205..3c2d908996 100644 --- a/gr-audio-osx/src/Makefile.am +++ b/gr-audio-osx/src/Makefile.am @@ -35,7 +35,7 @@ LOCAL_IFILES = \ audio_osx.i NON_LOCAL_IFILES = \ - $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i + $(GNURADIO_I) ALL_IFILES = \ $(LOCAL_IFILES) \ diff --git a/gr-audio-osx/src/run_tests.in b/gr-audio-osx/src/run_tests.in index 52de4dd13a..bc756b13c2 100644 --- a/gr-audio-osx/src/run_tests.in +++ b/gr-audio-osx/src/run_tests.in @@ -20,7 +20,9 @@ py=@abs_top_srcdir@/gr-audio-osx/src # Where to look for GNU Radio python modules in current build tree # FIXME this is wrong on a distcheck. We really need to ask gnuradio-core # where it put its python files. -grpythonbld=@abs_top_builddir@/gnuradio-core/src/python/:@abs_top_builddir@/gnuradio-core/src/lib/swig/:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs +grpythonbld=@abs_top_srcdir@/gnuradio-core/src/python +grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig +grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH" export PYTHONPATH diff --git a/gr-audio-portaudio/src/Makefile.am b/gr-audio-portaudio/src/Makefile.am index cf024c2631..9b59adbb4d 100644 --- a/gr-audio-portaudio/src/Makefile.am +++ b/gr-audio-portaudio/src/Makefile.am @@ -21,8 +21,6 @@ include $(top_srcdir)/Makefile.common -LIBS += $(GNURADIO_CORE_LIBS) - # Install this stuff so that it ends up as the gnuradio.audio_portaudio module # This usually ends up at: # ${prefix}/lib/python${python_version}/site-packages/gnuradio @@ -38,14 +36,14 @@ LOCAL_IFILES = \ audio_portaudio.i NON_LOCAL_IFILES = \ - $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i + $(GNURADIO_I) ALL_IFILES = \ $(LOCAL_IFILES) \ $(NON_LOCAL_IFILES) BUILT_SOURCES = \ - audio_portaudio.cc \ + audio_portaudio.cc \ audio_portaudio.py ourpython_PYTHON = \ @@ -77,6 +75,7 @@ swiginclude_HEADERS = \ _audio_portaudio_la_LIBADD = \ $(PYTHON_LDFLAGS) \ + $(GNURADIO_CORE_LIBS) \ $(PORTAUDIO_LIBS) \ -lstdc++ diff --git a/gr-audio-portaudio/src/run_tests.in b/gr-audio-portaudio/src/run_tests.in index 2f2f40e82e..d9f56ba984 100644 --- a/gr-audio-portaudio/src/run_tests.in +++ b/gr-audio-portaudio/src/run_tests.in @@ -18,9 +18,9 @@ libsrc=@abs_top_srcdir@/gr-audio-portaudio/src py=@abs_top_srcdir@/gr-audio-portaudio/src # Where to look for GNU Radio python modules in current build tree -# FIXME this is wrong on a distcheck. We really need to ask gnuradio-core -# where it put its python files. -grpythonbld=@abs_top_builddir@/gnuradio-core/src/python/:@abs_top_builddir@/gnuradio-core/src/lib/swig/:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs +grpythonbld=@abs_top_srcdir@/gnuradio-core/src/python +grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig +grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH" export PYTHONPATH diff --git a/gr-audio-windows/src/Makefile.am b/gr-audio-windows/src/Makefile.am index 3d9446d3ec..33129b7ac3 100644 --- a/gr-audio-windows/src/Makefile.am +++ b/gr-audio-windows/src/Makefile.am @@ -35,7 +35,7 @@ LOCAL_IFILES = \ audio_windows.i NON_LOCAL_IFILES = \ - $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i + $(GNURADIO_I) ALL_IFILES = \ $(LOCAL_IFILES) \ @@ -50,8 +50,7 @@ ourpython_PYTHON = \ INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) -SWIGCPPPYTHONARGS = -python $(PYTHON_CPPFLAGS) \ - -I$(swigincludedir) -I$(grincludedir) +SWIGCPPPYTHONARGS = -python $(PYTHON_CPPFLAGS) $(STD_DEFINES_AND_INCLUDES) ourlib_LTLIBRARIES = _audio_windows.la @@ -71,7 +70,7 @@ swiginclude_HEADERS = \ _audio_windows_la_LIBADD = \ $(PYTHON_LDFLAGS) \ $(GNURADIO_CORE_LIBS) \ - -lwinmm \ + $(WINAUDIO_LIBS) \ -lstdc++ _audio_windows_la_LDFLAGS = -no-undefined -module -avoid-version \ diff --git a/gr-audio-windows/src/run_tests.in b/gr-audio-windows/src/run_tests.in index 6eb5963837..da4a03be54 100755 --- a/gr-audio-windows/src/run_tests.in +++ b/gr-audio-windows/src/run_tests.in @@ -18,9 +18,9 @@ libsrc=@abs_top_srcdir@/gr-audio-windows/src py=@abs_top_srcdir@/gr-audio-windows/src # Where to look for GNU Radio python modules in current build tree -# FIXME this is wrong on a distcheck. We really need to ask gnuradio-core -# where it put its python files. -grpythonbld=@abs_top_builddir@/gnuradio-core/src/python/:@abs_top_builddir@/gnuradio-core/src/lib/swig/:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs +grpythonbld=@abs_top_srcdir@/gnuradio-core/src/python +grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig +grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH" export PYTHONPATH diff --git a/gr-comedi/src/Makefile.am b/gr-comedi/src/Makefile.am index 3311cd569e..b14a7361de 100644 --- a/gr-comedi/src/Makefile.am +++ b/gr-comedi/src/Makefile.am @@ -36,7 +36,7 @@ LOCAL_IFILES = \ comedi.i NON_LOCAL_IFILES = \ - $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i + $(GNURADIO_I) ALL_IFILES = \ $(LOCAL_IFILES) \ @@ -76,6 +76,7 @@ swiginclude_HEADERS = \ _comedi_la_LIBADD = \ $(PYTHON_LDFLAGS) \ $(GNURADIO_CORE_LIBS) \ + $(COMEDI_LIBS) \ -lstdc++ _comedi_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version diff --git a/gr-comedi/src/run_tests.in b/gr-comedi/src/run_tests.in index 6c0ba9d18c..facf62add5 100644 --- a/gr-comedi/src/run_tests.in +++ b/gr-comedi/src/run_tests.in @@ -20,7 +20,9 @@ py=@abs_top_srcdir@/gr-comedi/src # Where to look for GNU Radio python modules in current build tree # FIXME this is wrong on a distcheck. We really need to ask gnuradio-core # where it put its python files. -grpythonbld=@abs_top_builddir@/gnuradio-core/src/python/:@abs_top_builddir@/gnuradio-core/src/lib/swig/:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs +grpythonbld=@abs_top_srcdir@/gnuradio-core/src/python +grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig +grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH" export PYTHONPATH diff --git a/gr-error-correcting-codes/src/lib/Makefile.am b/gr-error-correcting-codes/src/lib/Makefile.am index 602c560a0c..75559527b0 100644 --- a/gr-error-correcting-codes/src/lib/Makefile.am +++ b/gr-error-correcting-codes/src/lib/Makefile.am @@ -39,7 +39,7 @@ ALL_IFILES = \ $(NON_LOCAL_IFILES) NON_LOCAL_IFILES = \ - $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i + $(GNURADIO_I) LOCAL_IFILES = \ ecc_syms_to_metrics.i \ diff --git a/gr-error-correcting-codes/src/lib/libecc/Makefile.am b/gr-error-correcting-codes/src/lib/libecc/Makefile.am index 95e7602532..65a9ff4149 100644 --- a/gr-error-correcting-codes/src/lib/libecc/Makefile.am +++ b/gr-error-correcting-codes/src/lib/libecc/Makefile.am @@ -23,7 +23,8 @@ include $(top_srcdir)/Makefile.common SUBDIRS = mld . tests -INCLUDES = $(STD_DEFINES_AND_INCLUDES) -I$(top_srcdir)/gr-error-correcting-codes/src/lib +INCLUDES = $(STD_DEFINES_AND_INCLUDES) \ + -I$(top_srcdir)/gr-error-correcting-codes/src/lib noinst_LTLIBRARIES = libecc.la @@ -49,6 +50,7 @@ noinst_HEADERS = \ libecc_la_LIBADD = \ mld/libmld.la \ $(PYTHON_LDFLAGS) \ + $(GNURADIO_CORE_LIBS) \ -lstdc++ MOSTLYCLEANFILES = *.loT *~ diff --git a/gr-error-correcting-codes/src/python/Makefile.am b/gr-error-correcting-codes/src/python/Makefile.am index 2c435fe053..61d9fe0a48 100644 --- a/gr-error-correcting-codes/src/python/Makefile.am +++ b/gr-error-correcting-codes/src/python/Makefile.am @@ -24,7 +24,7 @@ include $(top_srcdir)/Makefile.common EXTRA_DIST = run_tests.in # Disable qa checks due to non-standard directory structure (eb) -#TESTS = run_tests +# TESTS = run_tests noinst_PYTHON = qa_test_coding_1.py qa_test_coding_2.py diff --git a/gr-error-correcting-codes/src/python/run_tests.in b/gr-error-correcting-codes/src/python/run_tests.in index 4618f76c43..845ea3a197 100644 --- a/gr-error-correcting-codes/src/python/run_tests.in +++ b/gr-error-correcting-codes/src/python/run_tests.in @@ -20,7 +20,9 @@ py=@abs_top_srcdir@/gr-error-correcting-codes/src/python # Where to look for GNU Radio python modules in current build tree # FIXME this is wrong on a distcheck. We really need to ask gnuradio-core # where it put its python files. -grpythonbld=@abs_top_builddir@/gnuradio-core/src/python/:@abs_top_builddir@/gnuradio-core/src/lib/swig/:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs +grpythonbld=@abs_top_srcdir@/gnuradio-core/src/python +grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig +grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH" export PYTHONPATH diff --git a/gr-gsm-fr-vocoder/src/lib/Makefile.am b/gr-gsm-fr-vocoder/src/lib/Makefile.am index 974604d927..06ab5caab9 100644 --- a/gr-gsm-fr-vocoder/src/lib/Makefile.am +++ b/gr-gsm-fr-vocoder/src/lib/Makefile.am @@ -23,8 +23,6 @@ include $(top_srcdir)/Makefile.common SUBDIRS = gsm . -LIBS += $(GNURADIO_CORE_LIBS) - # Install this stuff so that it ends up as the gnuradio.vocoder module # This usually ends up at: # ${prefix}/lib/python${python_version}/site-packages/gnuradio/vocoder @@ -42,7 +40,7 @@ ALL_IFILES = \ $(NON_LOCAL_IFILES) NON_LOCAL_IFILES = \ - $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i + $(GNURADIO_I) LOCAL_IFILES = \ @@ -78,6 +76,7 @@ _gsm_full_rate_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version _gsm_full_rate_la_LIBADD = \ gsm/libgsm.la \ $(PYTHON_LDFLAGS) \ + $(GNURADIO_CORE_LIBS) \ -lstdc++ gsm_full_rate.cc gsm_full_rate.py: gsm_full_rate.i $(ALL_IFILES) diff --git a/gr-gsm-fr-vocoder/src/python/run_tests.in b/gr-gsm-fr-vocoder/src/python/run_tests.in index 2c3be9078c..a06faeb6d3 100644 --- a/gr-gsm-fr-vocoder/src/python/run_tests.in +++ b/gr-gsm-fr-vocoder/src/python/run_tests.in @@ -18,9 +18,9 @@ libsrc=@abs_top_srcdir@/gr-gsm-fr-vocoder/src/lib py=@abs_top_srcdir@/gr-gsm-fr-vocoder/src/python # Where to look for GNU Radio python modules in current build tree -# FIXME this is wrong on a distcheck. We really need to ask gnuradio-core -# where it put its python files. -grpythonbld=@abs_top_builddir@/gnuradio-core/src/python/:@abs_top_builddir@/gnuradio-core/src/lib/swig/:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs +grpythonbld=@abs_top_srcdir@/gnuradio-core/src/python +grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig +grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH" export PYTHONPATH diff --git a/gr-radar/src/lib/Makefile.am b/gr-radar/src/lib/Makefile.am index 8ea52aab42..be4b50379b 100644 --- a/gr-radar/src/lib/Makefile.am +++ b/gr-radar/src/lib/Makefile.am @@ -21,8 +21,6 @@ include $(top_srcdir)/Makefile.common -LIBS += $(GNURADIO_CORE_LIBS) - # Install this stuff so that it ends up as the gnuradio.radar module # This usually ends up at: # ${prefix}/lib/python${python_version}/site-packages/gnuradio @@ -39,7 +37,7 @@ ALL_IFILES = \ $(NON_LOCAL_IFILES) NON_LOCAL_IFILES = \ - $(top_srcdr)/gnuradio-core/src/lib/swig/gnuradio.i + $(GNURADIO_I) LOCAL_IFILES = @@ -66,16 +64,16 @@ bin_PROGRAMS = \ sim-airplane2 xambi_SOURCES = xambi.cc -xambi_LDADD = libradar.la +xambi_LDADD = libradar.la $(GNURADIO_CORE_LIBS) eb_xambi_SOURCES = eb-xambi.cc -eb_xambi_LDADD = libradar.la +eb_xambi_LDADD = libradar.la $(GNURADIO_CORE_LIBS) sim_airplane_SOURCES = sim-airplane.cc -sim_airplane_LDADD = libradar.la +sim_airplane_LDADD = libradar.la $(GNURADIO_CORE_LIBS) sim_airplane2_SOURCES = sim-airplane2.cc -sim_airplane2_LDADD = libradar.la +sim_airplane2_LDADD = libradar.la $(GNURADIO_CORE_LIBS) # This gets howto.py installed in the right place # ourpython_PYTHON = diff --git a/gr-radar/src/python/run_tests.in b/gr-radar/src/python/run_tests.in index fd0a43ab2a..d3519f4d1f 100644 --- a/gr-radar/src/python/run_tests.in +++ b/gr-radar/src/python/run_tests.in @@ -18,9 +18,9 @@ libsrc=@abs_top_srcdir@/gr-radar/src/lib py=@abs_top_srcdir@/gr-radar/src/python # Where to look for GNU Radio python modules in current build tree -# FIXME this is wrong on a distcheck. We really need to ask gnuradio-core -# where it put its python files. -grpythonbld=@abs_top_builddir@/gnuradio-core/src/python/:@abs_top_builddir@/gnuradio-core/src/lib/swig/:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs +grpythonbld=@abs_top_srcdir@/gnuradio-core/src/python +grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig +grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH" export PYTHONPATH diff --git a/gr-radio-astronomy/src/lib/Makefile.am b/gr-radio-astronomy/src/lib/Makefile.am index b1d0173857..375c169ae0 100644 --- a/gr-radio-astronomy/src/lib/Makefile.am +++ b/gr-radio-astronomy/src/lib/Makefile.am @@ -37,8 +37,7 @@ ALL_IFILES = \ $(NON_LOCAL_IFILES) NON_LOCAL_IFILES = \ - $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i - + $(GNURADIO_I) LOCAL_IFILES = \ ra.i diff --git a/gr-radio-astronomy/src/python/run_tests.in b/gr-radio-astronomy/src/python/run_tests.in index 51568827c0..e78f4329c3 100644 --- a/gr-radio-astronomy/src/python/run_tests.in +++ b/gr-radio-astronomy/src/python/run_tests.in @@ -18,9 +18,9 @@ libsrc=@abs_top_srcdir@/gr-radio-astronomy/src/lib py=@abs_top_srcdir@/gr-radio-astronomy/src/python # Where to look for GNU Radio python modules in current build tree -# FIXME this is wrong on a distcheck. We really need to ask gnuradio-core -# where it put its python files. -grpythonbld=@abs_top_builddir@/gnuradio-core/src/python/:@abs_top_builddir@/gnuradio-core/src/lib/swig/:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs +grpythonbld=@abs_top_srcdir@/gnuradio-core/src/python +grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig +grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH" export PYTHONPATH diff --git a/gr-usrp/src/run_tests.in b/gr-usrp/src/run_tests.in index 39a158ba0b..4a67ab5178 100644 --- a/gr-usrp/src/run_tests.in +++ b/gr-usrp/src/run_tests.in @@ -18,10 +18,12 @@ libsrc=@abs_top_srcdir@/gr-usrp/src py=@abs_top_srcdir@/gr-usrp/src # Where to look for GNU Radio python modules in current build tree -grbld=@abs_top_builddir@/gnuradio-core/src/python/:@abs_top_builddir@/gnuradio-core/src/lib/swig/:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs +grbld=@abs_top_srcdir@/gnuradio-core/src/python +grbld=$grbld:@abs_top_builddir@/gnuradio-core/src/lib/swig +grbld=$grbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs # Where to look for USRP lib in current build tree -usrpbld=@abs_top_builddir@/usrp/host/lib/.libs +usrpbld=@abs_top_builddir@/usrp/host/lib PYTHONPATH="$grbld:$libbld:$libbld/.libs:$libsrc:$py:$usrpbld:$PYTHONPATH" export PYTHONPATH diff --git a/gr-video-sdl/src/Makefile.am b/gr-video-sdl/src/Makefile.am index 0a28e0cef4..4b8723291c 100644 --- a/gr-video-sdl/src/Makefile.am +++ b/gr-video-sdl/src/Makefile.am @@ -35,7 +35,7 @@ LOCAL_IFILES = \ video_sdl.i NON_LOCAL_IFILES = \ - $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i + $(GNURADIO_I) ALL_IFILES = \ $(LOCAL_IFILES) \ diff --git a/gr-video-sdl/src/run_tests.in b/gr-video-sdl/src/run_tests.in index 2f84c37867..d3097d6d83 100644 --- a/gr-video-sdl/src/run_tests.in +++ b/gr-video-sdl/src/run_tests.in @@ -18,9 +18,9 @@ libsrc=@abs_top_srcdir@/gr-video-sdl/src py=@abs_top_srcdir@/gr-video-sdl/src # Where to look for GNU Radio python modules in current build tree -# FIXME this is wrong on a distcheck. We really need to ask gnuradio-core -# where it put its python files. -grpythonbld=@abs_top_builddir@/gnuradio-core/src/python/:@abs_top_builddir@/gnuradio-core/src/lib/swig/:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs +grpythonbld=@abs_top_srcdir@/gnuradio-core/src/python +grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig +grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH" export PYTHONPATH diff --git a/usrp/firmware/src/usrp2/Makefile.am b/usrp/firmware/src/usrp2/Makefile.am index e708312d94..41664a2da2 100644 --- a/usrp/firmware/src/usrp2/Makefile.am +++ b/usrp/firmware/src/usrp2/Makefile.am @@ -54,7 +54,10 @@ EXTRA_DIST = \ DEFINES=-DHAVE_USRP2 -INCLUDES=-I$(top_srcdir)/usrp/firmware/include -I$(top_srcdir)/usrp/firmware/src/usrp2 -I$(top_srcdir)/usrp/firmware/src/common -I./ -I../common +INCLUDES=-I$(top_srcdir)/usrp/firmware/include \ + -I$(top_srcdir)/usrp/firmware/src/usrp2 \ + -I$(top_srcdir)/usrp/firmware/src/common \ + -I$(top_builddir)/usrp/firmware/src/common # with EA = 0, the FX2 implements a portion of the 8051 "external memory" # on chip. This memory is mapped like this: |