diff options
| author | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2009-03-14 02:28:41 +0000 |
|---|---|---|
| committer | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2009-03-14 02:28:41 +0000 |
| commit | c3f962a1f0a4132ad643c58774bb69b190dccc49 (patch) | |
| tree | daa59a206d6fde01dc1404197e981927366af0e0 /config | |
| parent | 4eea337c46db44a6ee7560a4552e158421776777 (diff) | |
Merged r10554:10595 from michaelld/am_swig_4 into trunk. Major overhaul of SWIG usage in build system, also fixes ticket:130. Trunk passes distcheck.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10596 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'config')
| -rw-r--r-- | config/grc_gnuradio_core.m4 | 13 | ||||
| -rw-r--r-- | config/grc_gr_gcell.m4 | 8 |
2 files changed, 3 insertions, 18 deletions
diff --git a/config/grc_gnuradio_core.m4 b/config/grc_gnuradio_core.m4 index 43e6d55fe9..29e20c2834 100644 --- a/config/grc_gnuradio_core.m4 +++ b/config/grc_gnuradio_core.m4 @@ -1,4 +1,4 @@ -dnl Copyright 2001,2002,2003,2004,2005,2006,2007,2008 Free Software Foundation, Inc. +dnl Copyright 2001,2002,2003,2004,2005,2006,2007,2008,2009 Free Software Foundation, Inc. dnl dnl This file is part of GNU Radio dnl @@ -65,19 +65,10 @@ AC_DEFUN([GRC_GNURADIO_CORE],[ \$(FFTW3F_CFLAGS) \ \$(GSL_CFLAGS)" gnuradio_core_LA="\${abs_top_builddir}/gnuradio-core/src/lib/libgnuradio-core.la" - gnuradio_core_I="\${abs_top_srcdir}/gnuradio-core/src/lib/swig/gnuradio.i" + dnl gnuradio_core_I="\${abs_top_srcdir}/gnuradio-core/src/lib/swig/gnuradio.i" gnuradio_core_LIBDIRPATH="\${abs_top_builddir}/gnuradio-core/src/lib:\${abs_top_builddir}/gnuradio-core/src/lib/.libs" gnuradio_core_SWIGDIRPATH="\${abs_top_builddir}/gnuradio-core/src/lib/swig:\${abs_top_builddir}/gnuradio-core/src/lib/swig/.libs:\${abs_top_srcdir}/gnuradio-core/src/lib/swig" gnuradio_core_PYDIRPATH="\${abs_top_srcdir}/gnuradio-core/src/python" - - dnl kludge up initial swig dependency files - AC_CONFIG_COMMANDS([swig_deps], [ - touch gnuradio-core/src/lib/swig/gnuradio_swig_py_runtime.d - touch gnuradio-core/src/lib/swig/gnuradio_swig_py_general.d - touch gnuradio-core/src/lib/swig/gnuradio_swig_py_gengen.d - touch gnuradio-core/src/lib/swig/gnuradio_swig_py_filter.d - touch gnuradio-core/src/lib/swig/gnuradio_swig_py_io.d - ]) fi dnl other externally-required gnuradio-core variables diff --git a/config/grc_gr_gcell.m4 b/config/grc_gr_gcell.m4 index 191afdc087..476de364fa 100644 --- a/config/grc_gr_gcell.m4 +++ b/config/grc_gr_gcell.m4 @@ -1,4 +1,4 @@ -dnl Copyright 2001,2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc. +dnl Copyright 2001,2002,2003,2004,2005,2006,2008,2009 Free Software Foundation, Inc. dnl dnl This file is part of GNU Radio dnl @@ -31,12 +31,6 @@ AC_DEFUN([GRC_GR_GCELL],[ gr-gcell/src/run_tests \ ]) - dnl kludge up initial swig dependency files - AC_CONFIG_COMMANDS([swig_gcell_deps], [ - touch gr-gcell/src/gcell.d - ]) - - GRC_BUILD_CONDITIONAL(gr-gcell,[ dnl run_tests is created from run_tests.in. Make it executable. AC_CONFIG_COMMANDS([run_tests_gcell], [chmod +x gr-gcell/src/run_tests]) |