1 files changed, 5 insertions, 60 deletions
diff --git a/volk/python/Makefile.am b/volk/python/Makefile.am
index 8485c4793..8519a102a 100644
--- a/volk/python/Makefile.am
+++ b/volk/python/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2008 Free Software Foundation, Inc.
+# Copyright 2010 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -33,63 +33,8 @@ dist-hook:
 	@for file in $(swig_built_sources); do $(RM) $(distdir)/$$file; done
 
 
-# if we're not using python, ignore the rest...
+# Set the install location of any python scripts to /volk
+volkpythondir = $(pythondir)/volk
 
-TESTS = 
-
-
-ALL_IFILES = \
-	$(LOCAL_IFILES)	\
-	$(NON_LOCAL_IFILES)
-
-NON_LOCAL_IFILES = \
-	$(GNURADIO_CORE_INCLUDEDIR)/swig/gnuradio.i
-
-LOCAL_IFILES = \
-	libvector.i \
-	libvector_square_ff.i
-
-
-# These files are built by SWIG.  The first is the C++ glue.
-# The second is the python wrapper that loads the _libvector shared library
-# and knows how to call our extensions.
-
-swig_built_sources = \
-	libvector_swig.cc \
-	libvector_swig.py
-
-# This gets libvector.py installed in the right place.
-# Any hand-written python should be listed here too.
-ourpython_PYTHON = \
-	__init__.py \
-	libvector_swig.py
-
-# Python QA code gets listed here.  It's not installed.
-noinst_PYTHON = 
-
-# This library contains the swig generated glue
-ourpyexec_LTLIBRARIES = _libvector_swig.la
-
-# These are the source files that go into the shared library
-_libvector_swig_la_SOURCES = \
-	libvector_swig.cc
-
-# Dummy C++ source to cause C++ linking
-nodist_EXTRA__libvector_swig_la_SOURCES = dummy.cc
-
-# magic flags
-_libvector_swig_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
-
-# Link the swig generated code against our library and some python magic.
-_libvector_swig_la_LIBADD = \
-	../lib/liblibvector.la \
-	$(PYTHON_LDFLAGS)
-
-
-libvector_swig.cc libvector_swig.py: $(LOCAL_IFILES) $(ALL_IFILES)
-	$(SWIG) $(SWIGPYTHONARGS) -module libvector_swig -o libvector_swig.cc $(srcdir)/libvector.i
-
-
-# These swig headers get installed in ${prefix}/include/<component>/swig
-ourswiginclude_HEADERS = \
-	$(LOCAL_IFILES)
+volkpython_PYTHON = \
+	__init__.py