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 /gr-howto-write-a-block/doc | |
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 'gr-howto-write-a-block/doc')
-rw-r--r-- | gr-howto-write-a-block/doc/src_lib_Makefile_1.am | 2 | ||||
-rw-r--r-- | gr-howto-write-a-block/doc/src_lib_Makefile_2.am | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/gr-howto-write-a-block/doc/src_lib_Makefile_1.am b/gr-howto-write-a-block/doc/src_lib_Makefile_1.am index 846dd7c69..e97d70d1c 100644 --- a/gr-howto-write-a-block/doc/src_lib_Makefile_1.am +++ b/gr-howto-write-a-block/doc/src_lib_Makefile_1.am @@ -7,7 +7,7 @@ include $(top_srcdir)/Makefile.common ourpythondir = $(grpythondir) ourlibdir = $(grpyexecdir) -INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) +INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) ourlib_LTLIBRARIES = _howto.la diff --git a/gr-howto-write-a-block/doc/src_lib_Makefile_2.am b/gr-howto-write-a-block/doc/src_lib_Makefile_2.am index 5ca24385f..dca236e20 100644 --- a/gr-howto-write-a-block/doc/src_lib_Makefile_2.am +++ b/gr-howto-write-a-block/doc/src_lib_Makefile_2.am @@ -1,5 +1,5 @@ # -# Copyright 2004 Free Software Foundation, Inc. +# Copyright 2004,2008 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -28,10 +28,10 @@ include $(top_srcdir)/Makefile.common ourpythondir = $(grpythondir) ourlibdir = $(grpyexecdir) -INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) +INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) SWIGCPPPYTHONARGS = -noruntime -c++ -python $(PYTHON_CPPFLAGS) \ - -I$(swigincludedir) -I$(grincludedir) + -I$(swigincludedir) -I$(grincludedir) $(WITH_SWIG_INCLUDES) ALL_IFILES = \ $(LOCAL_IFILES) \ |