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-trellis/grc | |
| 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-trellis/grc')
| -rw-r--r-- | gr-trellis/grc/.gitignore | 23 | ||||
| -rw-r--r-- | gr-trellis/grc/Makefile.am | 39 |
2 files changed, 0 insertions, 62 deletions
diff --git a/gr-trellis/grc/.gitignore b/gr-trellis/grc/.gitignore deleted file mode 100644 index f3462d009..000000000 --- a/gr-trellis/grc/.gitignore +++ /dev/null @@ -1,23 +0,0 @@ -/Makefile -/Makefile.in -/aclocal.m4 -/configure -/config.h.in -/stamp-h.in -/libtool -/config.log -/config.h -/config.cache -/config.status -/missing -/stamp-h -/stamp-h1 -/.deps -/.libs -/*.la -/*.lo -/autom4te.cache -/*.cache -/missing -/make.log -/*.pc diff --git a/gr-trellis/grc/Makefile.am b/gr-trellis/grc/Makefile.am deleted file mode 100644 index 518c7f055..000000000 --- a/gr-trellis/grc/Makefile.am +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright 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 - -grcblocksdir = $(grc_blocksdir) - -dist_grcblocks_DATA = \ - trellis_encoder_xx.xml \ - trellis_siso_combined_f.xml \ - trellis_viterbi_x.xml \ - trellis_metrics_x.xml \ - trellis_siso_f.xml \ - trellis_permutation.xml \ - trellis_viterbi_combined_xx.xml \ - trellis_sccc_encoder_xx.xml \ - trellis_sccc_decoder_x.xml \ - trellis_sccc_decoder_combined_xx.xml \ - trellis_pccc_encoder_xx.xml \ - trellis_pccc_decoder_x.xml \ - trellis_pccc_decoder_combined_xx.xml |