From 00420d32081d8252bb37142b2be19a8a7c4dc4c4 Mon Sep 17 00:00:00 2001 From: Johnathan Corgan Date: Thu, 8 Dec 2011 13:48:48 -0800 Subject: Removed autotools, gr-waveform, some cleanup Nick Foster owes Nick Corgan a six-pack of beer! --- gr-atsc/.gitignore | 23 ---- gr-atsc/Makefile.am | 28 ----- gr-atsc/doc/.gitignore | 10 -- gr-atsc/doc/Makefile.am | 0 gr-atsc/src/.gitignore | 10 -- gr-atsc/src/Makefile.am | 26 ---- gr-atsc/src/lib/.gitignore | 17 --- gr-atsc/src/lib/Makefile.am | 254 -------------------------------------- gr-atsc/src/lib/Makefile.swig.gen | 145 ---------------------- gr-atsc/src/python/.gitignore | 9 -- gr-atsc/src/python/Makefile.am | 43 ------- gr-atsc/src/python/run_tests.in | 10 -- 12 files changed, 575 deletions(-) delete mode 100644 gr-atsc/.gitignore delete mode 100644 gr-atsc/Makefile.am delete mode 100644 gr-atsc/doc/.gitignore delete mode 100644 gr-atsc/doc/Makefile.am delete mode 100644 gr-atsc/src/.gitignore delete mode 100644 gr-atsc/src/Makefile.am delete mode 100644 gr-atsc/src/lib/.gitignore delete mode 100644 gr-atsc/src/lib/Makefile.am delete mode 100644 gr-atsc/src/lib/Makefile.swig.gen delete mode 100644 gr-atsc/src/python/.gitignore delete mode 100644 gr-atsc/src/python/Makefile.am delete mode 100644 gr-atsc/src/python/run_tests.in (limited to 'gr-atsc') diff --git a/gr-atsc/.gitignore b/gr-atsc/.gitignore deleted file mode 100644 index 16905156d..000000000 --- a/gr-atsc/.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 -/gnuradio-atsc.pc diff --git a/gr-atsc/Makefile.am b/gr-atsc/Makefile.am deleted file mode 100644 index ffb37f7ec..000000000 --- a/gr-atsc/Makefile.am +++ /dev/null @@ -1,28 +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 - -SUBDIRS = src -DIST_SUBDIRS = src doc - -pkgconfigdir = $(libdir)/pkgconfig -dist_pkgconfig_DATA = gnuradio-atsc.pc diff --git a/gr-atsc/doc/.gitignore b/gr-atsc/doc/.gitignore deleted file mode 100644 index bb3f27777..000000000 --- a/gr-atsc/doc/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -/Makefile -/Makefile.in -/.la -/.lo -/.deps -/.libs -/*.la -/*.lo -/howto.cc -/howto.py diff --git a/gr-atsc/doc/Makefile.am b/gr-atsc/doc/Makefile.am deleted file mode 100644 index e69de29bb..000000000 diff --git a/gr-atsc/src/.gitignore b/gr-atsc/src/.gitignore deleted file mode 100644 index bb3f27777..000000000 --- a/gr-atsc/src/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -/Makefile -/Makefile.in -/.la -/.lo -/.deps -/.libs -/*.la -/*.lo -/howto.cc -/howto.py diff --git a/gr-atsc/src/Makefile.am b/gr-atsc/src/Makefile.am deleted file mode 100644 index 78e03f580..000000000 --- a/gr-atsc/src/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -# -# Copyright 2004 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. -# - -SUBDIRS = lib -if PYTHON -SUBDIRS += python -endif - diff --git a/gr-atsc/src/lib/.gitignore b/gr-atsc/src/lib/.gitignore deleted file mode 100644 index 7cd5d520b..000000000 --- a/gr-atsc/src/lib/.gitignore +++ /dev/null @@ -1,17 +0,0 @@ -/Makefile -/Makefile.in -/.la -/.lo -/.deps -/.libs -/*.la -/*.lo -/atsc.cc -/atsc.py -/atsci_viterbi_gen -/atsci_viterbi_mux.cc -/test_atsci -/*.pyc -/gnuradio -/guile -/python diff --git a/gr-atsc/src/lib/Makefile.am b/gr-atsc/src/lib/Makefile.am deleted file mode 100644 index 30f408c02..000000000 --- a/gr-atsc/src/lib/Makefile.am +++ /dev/null @@ -1,254 +0,0 @@ -# -# Copyright 2001,2004,2005,2006,2008,2009,2010 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 -include $(top_srcdir)/Makefile.swig - -AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \ - $(CPPUNIT_INCLUDES) $(WITH_INCLUDES) - -EXTRA_DIST += \ - atsci_viterbi_gen.cc \ - gen_encoder.py \ - qa_atsci_trellis_encoder_t1_input.dat \ - qa_atsci_trellis_encoder_t1_output.dat \ - qa_atsci_viterbi_decoder_t1_input.dat \ - qa_atsci_viterbi_decoder_t1_output.dat - - -TESTS = test_atsci - -lib_LTLIBRARIES = libgnuradio-atsc.la - -# FIXME -# atsci_exp2_lp.cc \ -# atsci_root_raised_cosine.cc \ -# atsci_root_raised_cosine_bandpass.cc \ -# atsci_vsbtx_lp.cc \ -# - -libgnuradio_atsc_la_SOURCES = \ - atsc_derandomizer.cc \ - atsc_randomizer.cc \ - atsc_rs_decoder.cc \ - atsc_rs_encoder.cc \ - atsc_interleaver.cc \ - atsc_deinterleaver.cc \ - atsc_trellis_encoder.cc \ - atsc_viterbi_decoder.cc \ - atsc_ds_to_softds.cc \ - atsc_field_sync_mux.cc \ - atsc_field_sync_demux.cc \ - atsc_equalizer.cc \ - atsc_fs_checker.cc \ - atsc_bit_timing_loop.cc \ - atsc_fpll.cc \ - atsc_depad.cc \ - atsc_pad.cc \ - atsci_basic_trellis_encoder.cc \ - atsci_data_interleaver.cc \ - atsci_equalizer.cc \ - atsci_equalizer_lms.cc \ - atsci_equalizer_lms2.cc \ - atsci_equalizer_nop.cc \ - atsci_fake_single_viterbi.cc \ - atsci_fs_checker.cc \ - atsci_fs_checker_naive.cc \ - atsci_fs_correlator.cc \ - atsci_fs_correlator_naive.cc \ - atsci_single_viterbi.cc \ - atsci_sssr.cc \ - atsci_pnXXX.cc \ - atsci_randomizer.cc \ - atsci_reed_solomon.cc \ - atsci_sliding_correlator.cc \ - atsci_trellis_encoder.cc \ - atsci_viterbi_decoder.cc \ - create_atsci_equalizer.cc \ - create_atsci_fs_checker.cc \ - create_atsci_fs_correlator.cc \ - plinfo.cc - - -BUILT_SOURCES += \ - atsci_viterbi_mux.cc - -libgnuradio_atsc_la_LIBADD = \ - $(GNURADIO_CORE_LA) - -libgnuradio_atsc_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) - -noinst_LTLIBRARIES = libgnuradio-atsc-qa.la - -libgnuradio_atsc_qa_la_SOURCES = \ - qa_atsci_basic_trellis_encoder.cc \ - qa_atsci_data_interleaver.cc \ - qa_atsci_equalizer_nop.cc \ - qa_atsci_fake_single_viterbi.cc \ - qa_atsci_fs_correlator.cc \ - qa_atsci_single_viterbi.cc \ - qa_atsci_randomizer.cc \ - qa_atsci_reed_solomon.cc \ - qa_atsci_sliding_correlator.cc \ - qa_atsci_trellis_encoder.cc \ - qa_atsci_viterbi_decoder.cc \ - qa_convolutional_interleaver.cc \ - qa_atsci.cc \ - qa_interleaver_fifo.cc - -libgnuradio_atsc_qa_la_LIBADD = \ - $(GNURADIO_CORE_LA) - -libgnuradio_atsc_qa_la_LDFLAGS = \ - $(NO_UNDEFINED) - - -# These headers get installed in ${prefix}/include/gnuradio -grinclude_HEADERS = \ - atsc_api.h \ - atsc_consts.h \ - atsc_derandomizer.h \ - atsc_randomizer.h \ - atsc_rs_decoder.h \ - atsc_rs_encoder.h \ - atsc_interleaver.h \ - atsc_deinterleaver.h \ - atsc_trellis_encoder.h \ - atsc_viterbi_decoder.h \ - atsc_ds_to_softds.h \ - atsc_field_sync_mux.h \ - atsc_field_sync_demux.h \ - atsc_equalizer.h \ - atsc_fs_checker.h \ - atsc_bit_timing_loop.h \ - atsc_fpll.h \ - atsc_depad.h \ - atsc_pad.h \ - atsc_types.h \ - atsci_basic_trellis_encoder.h \ - atsci_data_interleaver.h \ - atsci_diag_output.h \ - atsci_equalizer.h \ - atsci_equalizer_lms.h \ - atsci_equalizer_lms2.h \ - atsci_equalizer_nop.h \ - atsci_exp2_lp.h \ - atsci_fake_single_viterbi.h \ - atsci_fs_checker.h \ - atsci_fs_checker_naive.h \ - atsci_fs_correlator.h \ - atsci_fs_correlator_naive.h \ - atsci_pnXXX.h \ - atsci_randomizer.h \ - atsci_reed_solomon.h \ - atsci_root_raised_cosine.h \ - atsci_root_raised_cosine_bandpass.h \ - atsci_single_viterbi.h \ - atsci_slicer_agc.h \ - atsci_sliding_correlator.h \ - atsci_sssr.h \ - atsci_syminfo.h \ - atsci_sync_tag.h \ - atsci_trellis_encoder.h \ - atsci_viterbi_decoder.h \ - atsci_vsbtx_lp.h \ - convolutional_interleaver.h \ - create_atsci_equalizer.h \ - create_atsci_fs_checker.h \ - create_atsci_fs_correlator.h \ - fpll_btloop_coupling.h \ - interleaver_fifo.h - -noinst_HEADERS = \ - qa_atsci.h \ - qa_atsci_basic_trellis_encoder.h \ - qa_atsci_data_interleaver.h \ - qa_atsci_equalizer_nop.h \ - qa_atsci_fake_single_viterbi.h \ - qa_atsci_fs_correlator.h \ - qa_atsci_randomizer.h \ - qa_atsci_reed_solomon.h \ - qa_atsci_single_viterbi.h \ - qa_atsci_sliding_correlator.h \ - qa_atsci_trellis_encoder.h \ - qa_atsci_viterbi_decoder.h \ - qa_convolutional_interleaver.h \ - qa_interleaver_fifo.h - - -# programs we build but don't install -# FIXME add test_atsc -noinst_PROGRAMS = \ - test_atsci - -atsci_viterbi_gen$(EXEEXT): $(srcdir)/atsci_viterbi_gen.cc - $(CXX_FOR_BUILD) -O2 $(srcdir)/atsci_viterbi_gen.cc -o atsci_viterbi_gen$(EXEEXT) - -atsci_viterbi_mux.cc: atsci_viterbi_gen$(EXEEXT) - ./atsci_viterbi_gen$(EXEEXT) -o atsci_viterbi_mux.cc - -test_atsci_SOURCES = test_atsci.cc -test_atsci_LDADD = \ - libgnuradio-atsc-qa.la \ - libgnuradio-atsc.la \ - $(CPPUNIT_LIBS) - -# ------------------------------------------------------------------------ -# Cleanup -# ------------------------------------------------------------------------ - -CLEANFILES += atsci_viterbi_mux.cc atsci_viterbi_gen$(EXEEXT) - -# ------------------------------------------------------------------------ -# This is the swig-ish part of the Makefile. -# It builds the atsc modules which we'll load into python or guile -# ------------------------------------------------------------------------ - -TOP_SWIG_DOC_IFILES = \ - atsc_swig_doc.i - -TOP_SWIG_IFILES = \ - $(TOP_SWIG_DOC_IFILES) \ - atsc.i - -BUILT_SOURCES += \ - $(TOP_SWIG_DOC_IFILES) - -EXTRA_DIST += \ - $(TOP_SWIG_DOC_IFILES) - -$(TOP_SWIG_DOC_IFILES): - `echo "" > $@` - -# Install so that they end up available as: -# import gnuradio -# This ends up at: -# ${prefix}/lib/python${python_version}/site-packages/gnuradio -atsc_pythondir_category = \ - gnuradio - -# additional libraries for linking with the SWIG-generated library -atsc_la_swig_libadd = \ - libgnuradio-atsc.la - -# additional SWIG files to be installed -atsc_swig_swiginclude_headers = \ - $(TOP_SWIG_DOC_IFILES) diff --git a/gr-atsc/src/lib/Makefile.swig.gen b/gr-atsc/src/lib/Makefile.swig.gen deleted file mode 100644 index 67f9c094a..000000000 --- a/gr-atsc/src/lib/Makefile.swig.gen +++ /dev/null @@ -1,145 +0,0 @@ -# -*- Makefile -*- -# -# 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. -# - -# Makefile.swig.gen for atsc.i - -## Default install locations for these files: -## -## Default location for the Python directory is: -## ${prefix}/lib/python${python_version}/site-packages/[category]/atsc -## Default location for the Python exec directory is: -## ${exec_prefix}/lib/python${python_version}/site-packages/[category]/atsc -## -## The following can be overloaded to change the install location, but -## this has to be done in the including Makefile.am -before- -## Makefile.swig is included. - -atsc_pythondir_category ?= gnuradio/atsc -atsc_pylibdir_category ?= $(atsc_pythondir_category) -atsc_pythondir = $(pythondir)/$(atsc_pythondir_category) -atsc_pylibdir = $(pyexecdir)/$(atsc_pylibdir_category) - -# The .so libraries for the guile modules get installed whereever guile -# is installed, usually /usr/lib/guile/gnuradio/ -# FIXME: determince whether these should be installed with gnuradio. -atsc_scmlibdir = $(libdir) - -# The scm files for the guile modules get installed where ever guile -# is installed, usually /usr/share/guile/site/atsc -# FIXME: determince whether these should be installed with gnuradio. -atsc_scmdir = $(guiledir) - -## SWIG headers are always installed into the same directory. - -atsc_swigincludedir = $(swigincludedir) - -## This is a template file for a "generated" Makefile addition (in -## this case, "Makefile.swig.gen"). By including the top-level -## Makefile.swig, this file will be used to generate the SWIG -## dependencies. Assign the variable TOP_SWIG_FILES to be the list of -## SWIG .i files to generated wrappings for; there can be more than 1 -## so long as the names are unique (no sorting is done on the -## TOP_SWIG_FILES list). This file explicitly assumes that a SWIG .i -## file will generate .cc, .py, and possibly .h files -- meaning that -## all of these files will have the same base name (that provided for -## the SWIG .i file). -## -## This code is setup to ensure parallel MAKE ("-j" or "-jN") does the -## right thing. For more info, see < -## http://sources.redhat.com/automake/automake.html#Multiple-Outputs > - -## Other cleaned files: dependency files generated by SWIG or this Makefile - -MOSTLYCLEANFILES += $(DEPDIR)/*.S* - -## Various SWIG variables. These can be overloaded in the including -## Makefile.am by setting the variable value there, then including -## Makefile.swig . - -atsc_swiginclude_HEADERS = \ - atsc.i \ - $(atsc_swiginclude_headers) - -if PYTHON -atsc_pylib_LTLIBRARIES = \ - _atsc.la - -_atsc_la_SOURCES = \ - python/atsc.cc \ - $(atsc_la_swig_sources) - -atsc_python_PYTHON = \ - atsc.py \ - $(atsc_python) - -_atsc_la_LIBADD = \ - $(STD_SWIG_LA_LIB_ADD) \ - $(atsc_la_swig_libadd) - -_atsc_la_LDFLAGS = \ - $(STD_SWIG_LA_LD_FLAGS) \ - $(atsc_la_swig_ldflags) - -_atsc_la_CXXFLAGS = \ - $(STD_SWIG_CXX_FLAGS) \ - -I$(top_builddir) \ - $(atsc_la_swig_cxxflags) - -python/atsc.cc: atsc.py -atsc.py: atsc.i - -# Include the python dependencies for this file --include python/atsc.d - -endif # end of if python - -if GUILE - -atsc_scmlib_LTLIBRARIES = \ - libguile-gnuradio-atsc.la -libguile_gnuradio_atsc_la_SOURCES = \ - guile/atsc.cc \ - $(atsc_la_swig_sources) -nobase_atsc_scm_DATA = \ - gnuradio/atsc.scm \ - gnuradio/atsc-primitive.scm -libguile_gnuradio_atsc_la_LIBADD = \ - $(STD_SWIG_LA_LIB_ADD) \ - $(atsc_la_swig_libadd) -libguile_gnuradio_atsc_la_LDFLAGS = \ - $(STD_SWIG_LA_LD_FLAGS) \ - $(atsc_la_swig_ldflags) -libguile_gnuradio_atsc_la_CXXFLAGS = \ - $(STD_SWIG_CXX_FLAGS) \ - -I$(top_builddir) \ - $(atsc_la_swig_cxxflags) - -guile/atsc.cc: gnuradio/atsc.scm -gnuradio/atsc.scm: atsc.i -gnuradio/atsc-primitive.scm: gnuradio/atsc.scm - -# Include the guile dependencies for this file --include guile/atsc.d - -endif # end of GUILE - - diff --git a/gr-atsc/src/python/.gitignore b/gr-atsc/src/python/.gitignore deleted file mode 100644 index bf03975bb..000000000 --- a/gr-atsc/src/python/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -/Makefile -/Makefile.in -/.deps -/.libs -/*.la -/*.lo -/*.pyc -/*.pyo -/run_tests diff --git a/gr-atsc/src/python/Makefile.am b/gr-atsc/src/python/Makefile.am deleted file mode 100644 index 7b2f5c871..000000000 --- a/gr-atsc/src/python/Makefile.am +++ /dev/null @@ -1,43 +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 - -EXTRA_DIST += \ - run_tests.in - -ourdatadir = $(exampledir)/atsc - -dist_ourdata_DATA = \ - README - -dist_ourdata_SCRIPTS = \ - btl-fsd.py \ - fpll.py \ - interp.py \ - xlate.py \ - viterbi-out.py - -TESTS = run_tests - -noinst_PYTHON = \ - atsc_utils.py \ - qa_atsc.py diff --git a/gr-atsc/src/python/run_tests.in b/gr-atsc/src/python/run_tests.in deleted file mode 100644 index 561917fed..000000000 --- a/gr-atsc/src/python/run_tests.in +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -# 1st parameter is absolute path to component source directory -# 2nd parameter is absolute path to component build directory -# 3rd parameter is path to Python QA directory - -@top_builddir@/run_tests.sh \ - @abs_top_srcdir@/gr-atsc \ - @abs_top_builddir@/gr-atsc \ - @srcdir@ -- cgit