diff options
author | Johnathan Corgan | 2011-12-08 13:48:48 -0800 |
---|---|---|
committer | Johnathan Corgan | 2011-12-08 13:48:48 -0800 |
commit | 00420d32081d8252bb37142b2be19a8a7c4dc4c4 (patch) | |
tree | 12c6bf83f01ffc4eff010102090bb687a1233558 /gr-qtgui | |
parent | f52be4a8f0fa203ed206d0e0afc099856eb5bd03 (diff) | |
download | gnuradio-00420d32081d8252bb37142b2be19a8a7c4dc4c4.tar.gz gnuradio-00420d32081d8252bb37142b2be19a8a7c4dc4c4.tar.bz2 gnuradio-00420d32081d8252bb37142b2be19a8a7c4dc4c4.zip |
Removed autotools, gr-waveform, some cleanup
Nick Foster owes Nick Corgan a six-pack of beer!
Diffstat (limited to 'gr-qtgui')
-rw-r--r-- | gr-qtgui/.gitignore | 3 | ||||
-rw-r--r-- | gr-qtgui/Makefile.am | 31 | ||||
-rw-r--r-- | gr-qtgui/apps/.gitignore | 3 | ||||
-rw-r--r-- | gr-qtgui/apps/Makefile.am | 38 | ||||
-rw-r--r-- | gr-qtgui/doc/.gitignore | 2 | ||||
-rw-r--r-- | gr-qtgui/doc/Makefile.am | 27 | ||||
-rw-r--r-- | gr-qtgui/examples/.gitignore | 2 | ||||
-rw-r--r-- | gr-qtgui/examples/Makefile.am | 34 | ||||
-rw-r--r-- | gr-qtgui/grc/.gitignore | 2 | ||||
-rw-r--r-- | gr-qtgui/grc/Makefile.am | 34 | ||||
-rw-r--r-- | gr-qtgui/include/.gitignore | 2 | ||||
-rw-r--r-- | gr-qtgui/include/Makefile.am | 33 | ||||
-rw-r--r-- | gr-qtgui/lib/.gitignore | 16 | ||||
-rw-r--r-- | gr-qtgui/lib/Makefile.am | 95 | ||||
-rw-r--r-- | gr-qtgui/python/.gitignore | 3 | ||||
-rw-r--r-- | gr-qtgui/python/Makefile.am | 38 | ||||
-rw-r--r-- | gr-qtgui/python/run_tests.in | 10 | ||||
-rw-r--r-- | gr-qtgui/swig/.gitignore | 4 | ||||
-rw-r--r-- | gr-qtgui/swig/Makefile.am | 73 |
19 files changed, 0 insertions, 450 deletions
diff --git a/gr-qtgui/.gitignore b/gr-qtgui/.gitignore deleted file mode 100644 index a37fc0c1a..000000000 --- a/gr-qtgui/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/Makefile -/Makefile.in -/*.pc diff --git a/gr-qtgui/Makefile.am b/gr-qtgui/Makefile.am deleted file mode 100644 index e850567cc..000000000 --- a/gr-qtgui/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -# -# Copyright 2008-2011 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 = include lib doc - -if PYTHON -SUBDIRS += swig python apps grc examples -endif - -pkgconfigdir = $(libdir)/pkgconfig -dist_pkgconfig_DATA = gnuradio-qtgui.pc diff --git a/gr-qtgui/apps/.gitignore b/gr-qtgui/apps/.gitignore deleted file mode 100644 index 943275d5c..000000000 --- a/gr-qtgui/apps/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -Makefile -Makefile.in -grc_qt_example.py diff --git a/gr-qtgui/apps/Makefile.am b/gr-qtgui/apps/Makefile.am deleted file mode 100644 index ba799bbee..000000000 --- a/gr-qtgui/apps/Makefile.am +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright 2011 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 - -if PYTHON - -noinst_PYTHON = \ - qt_digital.py \ - qt_digital_window.py \ - uhd_display.py \ - qt_digital_window.py \ - usrp_display_qtgui.py - -EXTRA_DIST += \ - qt_digital_window.ui \ - usrp_display_qtgui.ui -endif - -EXTRA_DIST += diff --git a/gr-qtgui/doc/.gitignore b/gr-qtgui/doc/.gitignore deleted file mode 100644 index b336cc7ce..000000000 --- a/gr-qtgui/doc/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/Makefile -/Makefile.in diff --git a/gr-qtgui/doc/Makefile.am b/gr-qtgui/doc/Makefile.am deleted file mode 100644 index b65eb062f..000000000 --- a/gr-qtgui/doc/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -# -# Copyright 2011 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 = - -dist_gr_doc_DATA = \ - README.qtgui diff --git a/gr-qtgui/examples/.gitignore b/gr-qtgui/examples/.gitignore deleted file mode 100644 index b336cc7ce..000000000 --- a/gr-qtgui/examples/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/Makefile -/Makefile.in diff --git a/gr-qtgui/examples/Makefile.am b/gr-qtgui/examples/Makefile.am deleted file mode 100644 index a204d1fcc..000000000 --- a/gr-qtgui/examples/Makefile.am +++ /dev/null @@ -1,34 +0,0 @@ -# -# Copyright 2008-2011 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 - -if PYTHON -ourdatadir = $(exampledir)/qt-gui - -dist_ourdata_SCRIPTS = \ - pyqt_example_c.py \ - pyqt_example_f.py \ - pyqt_time_c.py \ - pyqt_time_f.py -endif - -EXTRA_DIST += diff --git a/gr-qtgui/grc/.gitignore b/gr-qtgui/grc/.gitignore deleted file mode 100644 index b336cc7ce..000000000 --- a/gr-qtgui/grc/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/Makefile -/Makefile.in diff --git a/gr-qtgui/grc/Makefile.am b/gr-qtgui/grc/Makefile.am deleted file mode 100644 index ccd459a13..000000000 --- a/gr-qtgui/grc/Makefile.am +++ /dev/null @@ -1,34 +0,0 @@ -# -# Copyright 2010-2011 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 = \ - qtgui_check_box.xml \ - qtgui_entry.xml \ - qtgui_label.xml \ - qtgui_range.xml \ - qtgui_sink_x.xml \ - qtgui_time_sink_x.xml \ - qtgui_tab_widget.xml \ - qtgui_chooser.xml diff --git a/gr-qtgui/include/.gitignore b/gr-qtgui/include/.gitignore deleted file mode 100644 index b336cc7ce..000000000 --- a/gr-qtgui/include/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/Makefile -/Makefile.in diff --git a/gr-qtgui/include/Makefile.am b/gr-qtgui/include/Makefile.am deleted file mode 100644 index 59a030854..000000000 --- a/gr-qtgui/include/Makefile.am +++ /dev/null @@ -1,33 +0,0 @@ -# -# Copyright 2011 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 - -# These headers get installed in ${prefix}/include/gnuradio -grinclude_HEADERS = \ - gr_qtgui_api.h \ - qtgui_time_sink_c.h \ - qtgui_time_sink_f.h \ - qtgui_sink_c.h \ - qtgui_sink_f.h \ - qtgui_util.h - -libgnuradio_digital_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) diff --git a/gr-qtgui/lib/.gitignore b/gr-qtgui/lib/.gitignore deleted file mode 100644 index 7754ad227..000000000 --- a/gr-qtgui/lib/.gitignore +++ /dev/null @@ -1,16 +0,0 @@ -/Makefile -/Makefile.in -/.libs -/.deps -/qtgui.cc -/qtgui.py -/WaterfallDisplayPlot.moc.cc -/TimeDomainDisplayPlot.moc.cc -/spectrumdisplayform.moc.cc -/spectrumdisplayform.ui.h -/FrequencyDisplayPlot.moc.cc -/ConstellationDisplayPlot.moc.cc -/timedisplayform.moc.cc -/gnuradio -/guile -/python diff --git a/gr-qtgui/lib/Makefile.am b/gr-qtgui/lib/Makefile.am deleted file mode 100644 index aba311297..000000000 --- a/gr-qtgui/lib/Makefile.am +++ /dev/null @@ -1,95 +0,0 @@ -# -# Copyright 2008-2011 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 += spectrumdisplayform.ui - -AM_CPPFLAGS = -I. $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \ - $(QT_INCLUDES) $(BOOST_CPPFLAGS) $(GR_QTGUI_INCLUDES) \ - $(WITH_INCLUDES) -Dlibgnuradio_qtgui_EXPORTS - -# Only include these files in the build if qtgui passes configure checks -# This is mostly to help make distcheck pass -QMAKE_SOURCES = \ - spectrumdisplayform.moc.cc \ - timedisplayform.moc.cc \ - FrequencyDisplayPlot.moc.cc \ - TimeDomainDisplayPlot.moc.cc \ - WaterfallDisplayPlot.moc.cc \ - ConstellationDisplayPlot.moc.cc \ - spectrumdisplayform.ui.h - -BUILT_SOURCES += $(QMAKE_SOURCES) - -# Build the normal library for C++ apps to link against -lib_LTLIBRARIES = libgnuradio-qtgui.la - -# These are the source files that go into the shared library -libgnuradio_qtgui_la_SOURCES = \ - FrequencyDisplayPlot.cc \ - TimeDomainDisplayPlot.cc \ - WaterfallDisplayPlot.cc \ - waterfallGlobalData.cc \ - ConstellationDisplayPlot.cc \ - spectrumdisplayform.cc \ - timedisplayform.cc \ - SpectrumGUIClass.cc \ - spectrumUpdateEvents.cc \ - plot_waterfall.cc \ - qtgui_sink_c.cc \ - qtgui_sink_f.cc \ - qtgui_time_sink_c.cc \ - qtgui_time_sink_f.cc \ - qtgui_util.cc - -nodist_libgnuradio_qtgui_la_SOURCES=$(QMAKE_SOURCES) - -# These headers get installed in ${prefix}/include/gnuradio -grinclude_HEADERS = \ - FrequencyDisplayPlot.h \ - TimeDomainDisplayPlot.h \ - WaterfallDisplayPlot.h \ - waterfallGlobalData.h \ - ConstellationDisplayPlot.h \ - spectrumdisplayform.h \ - timedisplayform.h \ - SpectrumGUIClass.h \ - plot_waterfall.h \ - spectrumUpdateEvents.h - -#QT_MOC_FLAGS=-DQT_SHARED -DQT_NO_DEBUG -DQT_OPENGL_LIB -DQT_GUI_LIB -DQT_CORE_LIB -QT_MOC_FLAGS=-DQT_SHARED -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -%.moc.cc : %.h - $(QT_MOC_EXEC) $(QT_MOC_FLAGS) -p $(srcdir) $< -o $@ - -%.ui.h : %.ui - $(QT_UIC_EXEC) $< -o $@ - -# magic flags -libgnuradio_qtgui_la_LDFLAGS = $(NO_UNDEFINED) $(BOOST_LDFLAGS) $(LTVERSIONFLAGS) - -libgnuradio_qtgui_la_LIBADD = \ - $(GNURADIO_CORE_LA) \ - $(BOOST_THREAD_LIB) \ - $(BOOST_DATE_TIME_LIB) \ - -lstdc++ \ - $(QT_LIBS) diff --git a/gr-qtgui/python/.gitignore b/gr-qtgui/python/.gitignore deleted file mode 100644 index 604b402c5..000000000 --- a/gr-qtgui/python/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/Makefile -/Makefile.in -/run_tests diff --git a/gr-qtgui/python/Makefile.am b/gr-qtgui/python/Makefile.am deleted file mode 100644 index f1bdf359b..000000000 --- a/gr-qtgui/python/Makefile.am +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright 2008,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 - -TESTS = -EXTRA_DIST += run_tests.in - -if PYTHON -TESTS += run_tests -DISTCLEANFILES += run_tests - -qtguipythondir = $(grpythondir)/qtgui - -noinst_PYTHON = \ - qa_qtgui.py - -qtguipython_PYTHON = \ - __init__.py -endif diff --git a/gr-qtgui/python/run_tests.in b/gr-qtgui/python/run_tests.in deleted file mode 100644 index 909194752..000000000 --- a/gr-qtgui/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-qtgui \ - @abs_top_builddir@/gr-qtgui \ - @srcdir@ diff --git a/gr-qtgui/swig/.gitignore b/gr-qtgui/swig/.gitignore deleted file mode 100644 index 26647d4c1..000000000 --- a/gr-qtgui/swig/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -Makefile -Makefile.in -/qtgui_swig.py -/python diff --git a/gr-qtgui/swig/Makefile.am b/gr-qtgui/swig/Makefile.am deleted file mode 100644 index cda2620b5..000000000 --- a/gr-qtgui/swig/Makefile.am +++ /dev/null @@ -1,73 +0,0 @@ -# -# Copyright 2004-2006,2008-2011 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 - -TESTS = -EXTRA_DIST += $(nobase_guile_DATA) - -AM_CPPFLAGS = \ - -I$(top_srcdir)/gr-qtgui/lib \ - -I$(top_builddir)/gr-qtgui/lib \ - $(STD_DEFINES_AND_INCLUDES) \ - $(PYTHON_CPPFLAGS) \ - $(QT_INCLUDES) \ - $(GR_QTGUI_INCLUDES) \ - $(WITH_INCLUDES) - -############################## -# SWIG interface and library - -TOP_SWIG_DOC_IFILES = \ - qtgui_swig_doc.i - -TOP_SWIG_IFILES = \ - $(TOP_SWIG_DOC_IFILES) \ - qtgui_swig.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.qtgui -# This ends up at: -# ${prefix}/lib/python${python_version}/site-packages/gnuradio/qtgui -qtgui_swig_pythondir_category = \ - gnuradio/qtgui - -# additional libraries for linking with the SWIG-generated library -qtgui_swig_la_swig_libadd = \ - $(abs_top_builddir)/gr-qtgui/lib/libgnuradio-qtgui.la - -# additional SWIG files to be installed -qtgui_swig_swiginclude_headers = \ - qtgui_sink_c.i \ - qtgui_sink_f.i \ - qtgui_time_sink_c.i \ - qtgui_time_sink_f.i \ - $(TOP_SWIG_DOC_IFILES) |