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-gsm-fr-vocoder | |
| 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-gsm-fr-vocoder')
| -rw-r--r-- | gr-gsm-fr-vocoder/src/lib/Makefile.am | 11 | ||||
| -rw-r--r-- | gr-gsm-fr-vocoder/src/lib/gsm/Makefile.am | 5 |
2 files changed, 8 insertions, 8 deletions
diff --git a/gr-gsm-fr-vocoder/src/lib/Makefile.am b/gr-gsm-fr-vocoder/src/lib/Makefile.am index 254855bce..bbfbf8f80 100644 --- a/gr-gsm-fr-vocoder/src/lib/Makefile.am +++ b/gr-gsm-fr-vocoder/src/lib/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2004,2005 Free Software Foundation, Inc. +# Copyright 2004,2005,2008 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -30,10 +30,10 @@ SUBDIRS = gsm . ourpythondir = $(grpythondir)/vocoder ourlibdir = $(grpyexecdir)/vocoder -INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) - -SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) +INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) +SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \ + $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES) ALL_IFILES = \ $(LOCAL_IFILES) \ @@ -42,9 +42,8 @@ ALL_IFILES = \ NON_LOCAL_IFILES = \ $(GNURADIO_I) - LOCAL_IFILES = \ - $(top_srcdir)/gr-gsm-fr-vocoder/src/lib/gsm_full_rate.i + $(top_srcdir)/gr-gsm-fr-vocoder/src/lib/gsm_full_rate.i # These files are built by SWIG. The first is the C++ glue. # The second is the python wrapper that loads the _howto shared library diff --git a/gr-gsm-fr-vocoder/src/lib/gsm/Makefile.am b/gr-gsm-fr-vocoder/src/lib/gsm/Makefile.am index b8c946c90..d72eb896e 100644 --- a/gr-gsm-fr-vocoder/src/lib/gsm/Makefile.am +++ b/gr-gsm-fr-vocoder/src/lib/gsm/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2005 Free Software Foundation, Inc. +# Copyright 2005,2008 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -43,7 +43,8 @@ LTP_CUT = OPTIONS = $(SASR) $(MULHACK) $(FAST) $(LTP_CUT) -INCLUDES = $(STD_DEFINES_AND_INCLUDES) -DNeedFunctionPrototypes=1 $(OPTIONS) +INCLUDES = $(STD_DEFINES_AND_INCLUDES) -DNeedFunctionPrototypes=1 \ + $(OPTIONS) $(WITH_INCLUDES) noinst_LTLIBRARIES = libgsm.la |