diff options
| author | Tom Rondeau | 2011-09-09 18:03:45 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2011-09-09 18:03:45 -0400 |
| commit | 27941c31a357492ad901f260c32cd73d258f4d1b (patch) | |
| tree | 4b768452adeee5841c596a8a25fa0a0e2c086ac2 /gr-gsm-fr-vocoder | |
| parent | 34d725a16b695be59f04f2b4eb503532d1cbfe2f (diff) | |
| parent | b540fb4fccc03b1699809d7b74e4a211f5417524 (diff) | |
| download | gnuradio-27941c31a357492ad901f260c32cd73d258f4d1b.tar.gz gnuradio-27941c31a357492ad901f260c32cd73d258f4d1b.tar.bz2 gnuradio-27941c31a357492ad901f260c32cd73d258f4d1b.zip | |
Merge branch 'master' into next
Fixed some strange conflicts where a Makefile.am and .gitignore were disappeared.
Diffstat (limited to 'gr-gsm-fr-vocoder')
| -rw-r--r-- | gr-gsm-fr-vocoder/Makefile.am | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/gr-gsm-fr-vocoder/Makefile.am b/gr-gsm-fr-vocoder/Makefile.am new file mode 100644 index 000000000..968ce327c --- /dev/null +++ b/gr-gsm-fr-vocoder/Makefile.am @@ -0,0 +1,27 @@ +# +# 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 + +SUBDIRS = src + +pkgconfigdir = $(libdir)/pkgconfig +dist_pkgconfig_DATA = gnuradio-gsm-fr-vocoder.pc |