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

diff --git a/Makefile.common b/Makefile.common
index f0f02119abd5227b9662b6feeb59a1497f83735b..390d7e90067db4827bf6f7b48efaf6436c1f5a0f 100644 (file)
--- 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 c1d88b9e43df706b68c19cf10ec78638a745b583..32b1e16b59124b88781a07fdc72ea43135d8049a 100644 (file)
--- 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 0aa44e063eb1d4bba6fba1020607ec69b3b198a2..d84313097eea1f36ec7483d382a64fa488572b61 100644 (file)
--- 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 a4614660415f58dfe60e3708530f85843918972a..19dfaa2a9634442a7ecf8b4715628b70b1e0db11 100644 (file)
--- 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 5c66b336081799e1378d1a678a21cef6299f8b0d..64d482e814b91c2a5f917501b25112d427ca7f3b 100644 (file)
--- 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 0800bdec630e429e890bbe9dbee7876a8349ec74..22e98cd64643851c5cf72d8d0b8204923a934b06 100644 (file)
--- 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_pmt.m4 b/config/grc_gr_pmt.m4
deleted file mode 100644 (file)
index 951d640..0000000
--- a/config/grc_gr_pmt.m4
+++ /dev/null
@@ -1,34 +0,0 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006 Free Software Foundation, Inc.
-dnl 
-dnl This file is part of GNU Radio
-dnl 
-dnl GNU Radio is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 2, or (at your option)
-dnl any later version.
-dnl 
-dnl GNU Radio is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
-dnl 
-dnl You should have received a copy of the GNU General Public License
-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_CONFIG_SRCDIR([pmt/src/lib/pmt.h])
-
-    AC_CONFIG_FILES([\
-       pmt/Makefile \
-       pmt/doc/Makefile \
-       pmt/src/Makefile \
-       pmt/src/lib/Makefile
-    ])
-
-    dnl run_tests is created from run_tests.in.  Make it executable.
-    dnl AC_CONFIG_COMMANDS([run_tests_pmt], [chmod +x pmt/src/python/run_tests])
-
-    subdirs="$subdirs pmt"
-])

diff --git a/config/grc_gr_video_sdl.m4 b/config/grc_gr_video_sdl.m4
index c161b5f3e84ff69aeafda47dc78f22d6cc7eec67..b0ca94349471c0cd0bf695ae08bae324b8d9ba44 100644 (file)
--- 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 8f3c8f8ee9ea3b3bd344e029a0e0f2bc1ec59045..2713f9b0801afe0d262a1c1124bdaf7422e750a4 100644 (file)
--- 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_pmt.m4 b/config/grc_pmt.m4
new file mode 100644 (file)
index 0000000..7484b74
--- /dev/null
+++ b/config/grc_pmt.m4
@@ -0,0 +1,34 @@
+dnl Copyright 2001,2002,2003,2004,2005,2006 Free Software Foundation, Inc.
+dnl 
+dnl This file is part of GNU Radio
+dnl 
+dnl GNU Radio is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2, or (at your option)
+dnl any later version.
+dnl 
+dnl GNU Radio is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+dnl GNU General Public License for more details.
+dnl 
+dnl You should have received a copy of the GNU General Public License
+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_PMT],[
+    AC_CONFIG_SRCDIR([pmt/src/lib/pmt.h])
+
+    AC_CONFIG_FILES([\
+       pmt/Makefile \
+       pmt/doc/Makefile \
+       pmt/src/Makefile \
+       pmt/src/lib/Makefile
+    ])
+
+    dnl run_tests is created from run_tests.in.  Make it executable.
+    dnl AC_CONFIG_COMMANDS([run_tests_pmt], [chmod +x pmt/src/python/run_tests])
+
+    subdirs="$subdirs pmt"
+])

diff --git a/configure.ac b/configure.ac
index c29203a7c53976be7bb327e7ec604f610e0a3101..0affeb019f497b46da0668d327c65759ebd6f6ab 100644 (file)
--- 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 d5ae6ed53d01488279f428aaaaf7774e901c7881..b625aaabe7ed3e8fb20907d413031a4282f28031 100644 (file)
--- 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 b83d85bfbea1080432818147e4b64f6957e7318f..a13c393aed3a33dc72aebbdc82048e9fd38dc8fb 100644 (file)
--- 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 e06fef9ae6121e86bc7591709cefbd3080d5f1a4..b6a8ef388b6af830205f71a456e274063414fb11 100644 (file)
--- 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 4bfb076e8ebb2a95ade13b4af699fb798c7e1c22..99d6ffd9b7cb87d7570999ff8888a6d28af3fa07 100644 (file)
--- 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 a00e574c2edf79309792af5a53bdcf4e9145e3e8..488939a31b0453129817a63cfa64790a2541e408 100644 (file)
--- 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 3e589894e2444d6bb09ab0e00b2ef31b79aa92f0..c90640a7e6f3b72c84aa73cec506dde0b841d0c4 100644 (file)
--- 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 1a73d8d4c02df7bce115d5131886c82c8737b4d4..319db7a8ce5aeffe08f7d1f7dac187940c886aac 100644 (file)
--- 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 ec252d50849ce38d952fc6f0245ea0a4e929b8f4..402a8c4445692965ce94d7e93720258abaac238c 100644 (file)
--- 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 54cc3272051f04f4c748bd191b9e4113ad962ead..3c2d908996c5eebdc89fb3ca67138c0dd563b796 100644 (file)
--- 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 52de4dd13a0094ae57f598fb36c618cd561d336b..bc756b13c27740bba9dcee898c04541e37dd6406 100644 (file)
--- 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 cf024c263111d1ebeb4cb2e872cd7bd4a6d38827..9b59adbb4dc760991e28ea9d15288bd7cf299435 100644 (file)
--- 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 2f2f40e82e38b200019ced292f3d1b942e612c01..d9f56ba98414a0c0afc9bfdccac8c7181638bb2b 100644 (file)
--- 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 3d9446d3ec64babca00b5c15ff16c1a670675892..33129b7ac377dcfaf29774edfaafeea9db55d986 100644 (file)
--- 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 6eb5963837cff5f2f0fa6581f707e045f31a905c..da4a03be549341159aa2e62e9808ddc54ff289fd 100755 (executable)
--- 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 3311cd569e499be702a106687a44a9cc409871e3..b14a7361de8f07663ace0bf6bdef8b6b5d0499da 100644 (file)
--- 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 6c0ba9d18c5657ff6f87ab5458ab9b8fd5d8b898..facf62add5054d16b73d3fed22307fc6cf7a1e6f 100644 (file)
--- 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 602c560a0cea0bc4b95648fc21661e4dbf59b78f..75559527b0828ddca5836d756b061fc15ce0ef30 100644 (file)
--- 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 95e760253288f4f642173083805ab8e927ee5c0f..65a9ff414975dc20dc484e79fc9a6fb3874b715e 100644 (file)
--- 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 2c435fe053a46f6fcf8c1a677a04975c963604cc..61d9fe0a48bede952df8cf49bdeac9e21cb8335c 100644 (file)
--- 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 4618f76c436a8adf6ec26e9c2578d8caba370170..845ea3a19714fea6ece02f57cc4bb3cd419c721c 100644 (file)
--- 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 974604d9278525105839095cdc507305a2a6d29e..06ab5caab95ece4df9411a7f5c09ff1e342df523 100644 (file)
--- 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 2c3be9078c4933e8b066b2775ab7b2ee9e92f6ee..a06faeb6d31459d68aeda0ca5ad97c34d0a70d37 100644 (file)
--- 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 8ea52aab42549a953e18e8fb5f6dea7dd058491a..be4b50379b06b79902b30efc555c7cffcc40c82c 100644 (file)
--- 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 fd0a43ab2a21eecadf3d83505d2c254760620f4a..d3519f4d1f2f0dba7ca12d4aaac665488c577371 100644 (file)
--- 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 b1d0173857f12c14299582cee0991546edec9c77..375c169ae0e18d5cdfcaa1f60571084cdd7cd7aa 100644 (file)
--- 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 51568827c0eb0f2a4088bb7654f286c03700094e..e78f4329c3298090ab40dd7fd120e388a2d160ee 100644 (file)
--- 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 39a158ba0b18a232668661804a4967a0c1c410e4..4a67ab51782bc2b42753d49c4e4ce045c92180d8 100644 (file)
--- 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 0a28e0cef4bf08f7417b2ae138e41eb6d1e8ac39..4b8723291c07cc647aed0a1d2bda5852d4e71a5d 100644 (file)
--- 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 2f84c37867f0b189e7cf29a10934958f5ecfb5d0..d3097d6d831164ae59dcb883b184843973350566 100644 (file)
--- 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 e708312d9445e58598c0a83976a63505c0158f46..41664a2da29d8db38c1ffd9305eb311496e89a9b 100644 (file)
--- 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: