diff options
| author | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2008-02-08 23:32:10 +0000 |
|---|---|---|
| committer | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2008-02-08 23:32:10 +0000 |
| commit | 42d9c6f495503d3d9d2db47a9979036c9233f976 (patch) | |
| tree | b4d2be737c3ad6836e62dc35c861e987ea3729e0 /gr-audio-portaudio | |
| parent | 6bf2c048d94e1c673c06c058b23213cd28292520 (diff) | |
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-audio-portaudio')
| -rw-r--r-- | gr-audio-portaudio/src/Makefile.am | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/gr-audio-portaudio/src/Makefile.am b/gr-audio-portaudio/src/Makefile.am index b6d443ae6d..3b55969a38 100644 --- a/gr-audio-portaudio/src/Makefile.am +++ b/gr-audio-portaudio/src/Makefile.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 # @@ -49,13 +49,14 @@ BUILT_SOURCES = \ ourpython_PYTHON = \ audio_portaudio.py -INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(PORTAUDIO_CFLAGS) +INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \ + $(PORTAUDIO_CFLAGS) $(WITH_INCLUDES) -SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) -I/usr/include +SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES) \ + -I/usr/include $(WITH_SWIG_INCLUDES) $(WITH_INCLUDES) ourlib_LTLIBRARIES = _audio_portaudio.la - _audio_portaudio_la_SOURCES = \ audio_portaudio.cc \ audio_portaudio_sink.cc \ @@ -67,8 +68,7 @@ grinclude_HEADERS = \ audio_portaudio_source.h noinst_HEADERS = \ - gri_portaudio.h - + gri_portaudio.h swiginclude_HEADERS = \ $(LOCAL_IFILES) @@ -77,16 +77,15 @@ _audio_portaudio_la_LIBADD = \ $(PYTHON_LDFLAGS) \ $(GNURADIO_CORE_LA) \ $(PORTAUDIO_LIBS) \ - -lstdc++ + -lstdc++ _audio_portaudio_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version audio_portaudio.cc audio_portaudio.py: $(ALL_IFILES) audio_portaudio_sink.h audio_portaudio_source.h $(SWIG) $(SWIGPYTHONARGS) -module audio_portaudio -o audio_portaudio.cc $(LOCAL_IFILES) - noinst_PYTHON = \ - qa_portaudio.py + qa_portaudio.py MOSTLYCLEANFILES = \ $(BUILT_SOURCES) *~ *.pyc |