Merge branch 'master' into constell_obj

Conflicts:
	gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.h
	gr-audio-oss/src/Makefile.swig.gen
	gr-audio/swig/Makefile.swig.gen

1 files changed, 0 insertions, 145 deletions

diff --git a/gr-audio-windows/src/Makefile.swig.gen b/gr-audio-windows/src/Makefile.swig.gen
deleted file mode 100644
index cc21f30bc..000000000
--- a/gr-audio-windows/src/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 audio_windows.i
-
-## Default install locations for these files:
-##
-## Default location for the Python directory is:
-##  ${prefix}/lib/python${python_version}/site-packages/[category]/audio_windows
-## Default location for the Python exec directory is:
-##  ${exec_prefix}/lib/python${python_version}/site-packages/[category]/audio_windows
-##
-## 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.
-
-audio_windows_pythondir_category ?= gnuradio/audio_windows
-audio_windows_pylibdir_category ?= $(audio_windows_pythondir_category)
-audio_windows_pythondir = $(pythondir)/$(audio_windows_pythondir_category)
-audio_windows_pylibdir = $(pyexecdir)/$(audio_windows_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.
-audio_windows_scmlibdir = $(libdir)
-
-# The scm files for the guile modules get installed where ever guile
-# is installed, usually /usr/share/guile/site/audio_windows
-# FIXME: determince whether these should be installed with gnuradio.
-audio_windows_scmdir = $(guiledir)
-
-## SWIG headers are always installed into the same directory.
-
-audio_windows_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 .
-
-audio_windows_swiginclude_HEADERS =		\
-	audio_windows.i			\
-	$(audio_windows_swiginclude_headers)
-
-if PYTHON
-audio_windows_pylib_LTLIBRARIES =		\
-	_audio_windows.la
-
-_audio_windows_la_SOURCES = 			\
-	python/audio_windows.cc		\
-	$(audio_windows_la_swig_sources)
-
-audio_windows_python_PYTHON =			\
-	audio_windows.py			\
-	$(audio_windows_python)
-
-_audio_windows_la_LIBADD =			\
-	$(STD_SWIG_LA_LIB_ADD)		\
-	$(audio_windows_la_swig_libadd)
-
-_audio_windows_la_LDFLAGS =			\
-	$(STD_SWIG_LA_LD_FLAGS)		\
-	$(audio_windows_la_swig_ldflags)
-
-_audio_windows_la_CXXFLAGS =			\
-	$(STD_SWIG_CXX_FLAGS)		\
-	-I$(top_builddir) 		\
-	$(audio_windows_la_swig_cxxflags)
-
-python/audio_windows.cc: audio_windows.py
-audio_windows.py: audio_windows.i
-
-# Include the python dependencies for this file
--include python/audio_windows.d
-
-endif		# end of if python
-
-if GUILE
-
-audio_windows_scmlib_LTLIBRARIES = 		\
-	libguile-gnuradio-audio_windows.la
-libguile_gnuradio_audio_windows_la_SOURCES =	\
-	guile/audio_windows.cc			\
-	$(audio_windows_la_swig_sources)
-nobase_audio_windows_scm_DATA = 		\
-	gnuradio/audio_windows.scm 		\
-	gnuradio/audio_windows-primitive.scm
-libguile_gnuradio_audio_windows_la_LIBADD = 	\
-	$(STD_SWIG_LA_LIB_ADD)		\
-	$(audio_windows_la_swig_libadd)
-libguile_gnuradio_audio_windows_la_LDFLAGS = 	\
-	$(STD_SWIG_LA_LD_FLAGS)		\
-	$(audio_windows_la_swig_ldflags)
-libguile_gnuradio_audio_windows_la_CXXFLAGS = 	\
-	$(STD_SWIG_CXX_FLAGS)		\
-	-I$(top_builddir) 		\
-	$(audio_windows_la_swig_cxxflags)
-
-guile/audio_windows.cc: gnuradio/audio_windows.scm
-gnuradio/audio_windows.scm: audio_windows.i
-gnuradio/audio_windows-primitive.scm: gnuradio/audio_windows.scm
-
-# Include the guile dependencies for this file
--include guile/audio_windows.d
-
-endif				# end of GUILE
-
-