diff options
| author | Johnathan Corgan | 2012-04-07 19:32:10 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2012-04-07 19:32:10 -0700 |
| commit | 9bef26c9271a7b9253075bda3c1fc7c8078c0343 (patch) | |
| tree | a6c1329bb902c95c8ab9970f38ec5fb46d79167c /gr-audio/examples/python | |
| parent | f621a52f779381cfe550b4278b83e701a747944c (diff) | |
| parent | ef72dc714840dfb8fe3f918dda243f74453b6cc7 (diff) | |
| download | gnuradio-9bef26c9271a7b9253075bda3c1fc7c8078c0343.tar.gz gnuradio-9bef26c9271a7b9253075bda3c1fc7c8078c0343.tar.bz2 gnuradio-9bef26c9271a7b9253075bda3c1fc7c8078c0343.zip | |
Merge branch 'next'
Diffstat (limited to 'gr-audio/examples/python')
| -rw-r--r-- | gr-audio/examples/python/.gitignore | 4 | ||||
| -rw-r--r-- | gr-audio/examples/python/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-audio/examples/python/Makefile.am | 38 |
3 files changed, 1 insertions, 43 deletions
diff --git a/gr-audio/examples/python/.gitignore b/gr-audio/examples/python/.gitignore deleted file mode 100644 index b4813f3c8..000000000 --- a/gr-audio/examples/python/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/Makefile -/Makefile.in -/*.pyc -/*.pyo diff --git a/gr-audio/examples/python/CMakeLists.txt b/gr-audio/examples/python/CMakeLists.txt index 86ba86ac0..24e29e234 100644 --- a/gr-audio/examples/python/CMakeLists.txt +++ b/gr-audio/examples/python/CMakeLists.txt @@ -32,6 +32,6 @@ GR_PYTHON_INSTALL(PROGRAMS noise.py spectrum_inversion.py test_resampler.py - DESTINATION ${GR_PKG_DATA_DIR}/examples/audio + DESTINATION ${GR_PKG_AUDIO_EXAMPLES_DIR} COMPONENT "audio_python" ) diff --git a/gr-audio/examples/python/Makefile.am b/gr-audio/examples/python/Makefile.am deleted file mode 100644 index 356b51559..000000000 --- a/gr-audio/examples/python/Makefile.am +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright 2004,2009 Free Software Foundation, Inc. -# -# This file is part of GNU Radio -# -# GNU Radio is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. -# -# GNU Radio is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. -# - -include $(top_srcdir)/Makefile.common - -ourdatadir = $(exampledir)/audio - -dist_ourdata_SCRIPTS = \ - audio_copy.py \ - audio_fft.py \ - audio_play.py \ - audio_to_file.py \ - dial_tone.py \ - dial_tone_daemon.py \ - dial_tone_wav.py \ - mono_tone.py \ - multi_tone.py \ - noise.py \ - spectrum_inversion.py \ - test_resampler.py |