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-jack/src | |
| 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-jack/src')
| -rw-r--r-- | gr-audio-jack/src/Makefile.am | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/gr-audio-jack/src/Makefile.am b/gr-audio-jack/src/Makefile.am index 12bdf08c54..2c13a835fa 100644 --- a/gr-audio-jack/src/Makefile.am +++ b/gr-audio-jack/src/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 # @@ -49,27 +49,25 @@ BUILT_SOURCES = \ ourpython_PYTHON = \ audio_jack.py -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) ourlib_LTLIBRARIES = _audio_jack.la - _audio_jack_la_SOURCES = \ audio_jack.cc \ audio_jack_sink.cc \ audio_jack_source.cc \ - gri_jack.cc + gri_jack.cc grinclude_HEADERS = \ audio_jack_sink.h \ - audio_jack_source.h + audio_jack_source.h noinst_HEADERS = \ - gri_jack.h - + gri_jack.h swiginclude_HEADERS = \ $(LOCAL_IFILES) @@ -78,7 +76,7 @@ _audio_jack_la_LIBADD = \ $(PYTHON_LDFLAGS) \ $(GNURADIO_CORE_LA) \ $(JACK_LIBS) \ - -lstdc++ + -lstdc++ _audio_jack_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version @@ -86,7 +84,7 @@ audio_jack.cc audio_jack.py: $(LOCAL_IFILES) $(NON_LOCAL_IFILES) $(SWIG) $(SWIGPYTHONARGS) -module audio_jack -o audio_jack.cc $(LOCAL_IFILES) noinst_PYTHON = \ - qa_jack.py + qa_jack.py MOSTLYCLEANFILES = \ $(BUILT_SOURCES) *~ *.pyc |