diff options
| author | jcorgan | 2008-02-08 23:32:10 +0000 |
|---|---|---|
| committer | jcorgan | 2008-02-08 23:32:10 +0000 |
| commit | 42d9c6f495503d3d9d2db47a9979036c9233f976 (patch) | |
| tree | b4d2be737c3ad6836e62dc35c861e987ea3729e0 /gnuradio-core/src/lib/swig | |
| parent | 6bf2c048d94e1c673c06c058b23213cd28292520 (diff) | |
| download | gnuradio-42d9c6f495503d3d9d2db47a9979036c9233f976.tar.gz gnuradio-42d9c6f495503d3d9d2db47a9979036c9233f976.tar.bz2 gnuradio-42d9c6f495503d3d9d2db47a9979036c9233f976.zip | |
Merged r7478:7608 from michaelld/t186 into trunk. Adds ability to compile GNU Radio modules individually, using already installed dependent libraries and include files. New functionality is enabled using --with-* on configure command line; existing build options should remain unchanged. Nice work by Michael Dickens, still needs documentation update on wiki.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@7617 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gnuradio-core/src/lib/swig')
| -rw-r--r-- | gnuradio-core/src/lib/swig/Makefile.am | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am index 2c3494cc1..8c77d39b2 100644 --- a/gnuradio-core/src/lib/swig/Makefile.am +++ b/gnuradio-core/src/lib/swig/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2001,2003,2004,2005,2006,2007 Free Software Foundation, Inc. +# Copyright 2001,2003,2004,2005,2006,2007,2008 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -28,27 +28,21 @@ include $(top_srcdir)/Makefile.common grgrpythondir = $(grpythondir)/gr grgrlibdir = $(grpyexecdir)/gr - -INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) -I$(srcdir) - +INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) -I$(srcdir) \ + $(WITH_INCLUDES) EXTRA_DIST = gen-swig-bug-fix - LOCAL_IFILES = \ gnuradio.i \ shared_ptr.i \ sw_general.i \ sw_gengen.i \ sw_filter.i \ - sw_io.i - + sw_io.i ALL_IFILES = \ - $(LOCAL_IFILES) - - - + $(LOCAL_IFILES) # ---------------------------------------------------------------- # We've split the previously monstrous gnuradio_swig_python into @@ -75,8 +69,8 @@ BUILT_SOURCES = \ gnuradio_swig_py_io.h \ gnuradio_swig_bug_workaround.h - -SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(INCLUDES) +SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(INCLUDES) $(WITH_SWIG_INCLUDES) \ + $(WITH_INCLUDES) # ---------------------------------------------------------------- # We break this up into 5 libraries... |