Merged r10554:10595 from michaelld/am_swig_4 into trunk. Major overhaul of SWIG usage in build system, also fixes ticket:130. Trunk passes distcheck.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10596 221aa14e-8319-0410-a670-987f0aec2ac5

1 files changed, 26 insertions, 71 deletions

diff --git a/gr-msdd6000/src/Makefile.am b/gr-msdd6000/src/Makefile.am
index 2d0899ca0..b2bf22ab9 100644
--- a/gr-msdd6000/src/Makefile.am
+++ b/gr-msdd6000/src/Makefile.am
@@ -21,86 +21,41 @@
 
 include $(top_srcdir)/Makefile.common
 
-# Install this stuff so that it ends up as the gnuradio.howto module
-# This usually ends up at:
-#   ${prefix}/lib/python${python_version}/site-packages/gnuradio
-
-ourpythondir = $(grpythondir)
-ourlibdir    = $(grpyexecdir)
-
-
-#EXTRA_DIST = run_tests.in
-
-#TESTS = run_tests
-
-
-#INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS)
-
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \
 	$(WITH_INCLUDES)
 
-NON_LOCAL_IFILES =			\
-	$(GNURADIO_I)
-
-LOCAL_IFILES = 				\
-	$(srcdir)/msdd.i
-
-ALL_IFILES = 				\
-	$(LOCAL_IFILES)			\
-	$(NON_LOCAL_IFILES)		
-
-
-# These files are built by SWIG.  The first is the C++ glue.
-# The second is the python wrapper that loads the _howto shared library
-# and knows how to call our extensions.
+# C/C++ headers get installed in ${prefix}/include/gnuradio
+grinclude_HEADERS =			\
+	msdd_source_simple.h		\
+	msdd_buffer_copy_behaviors.h	\
+	msdd6000.h
 
-BUILT_SOURCES = 			\
-	msdd.cc			\
-	msdd.py				
+#################################
+# SWIG interface and library
 
-# This gets howto.py installed in the right place
-ourpython_PYTHON =			\
-	msdd.py
+TOP_SWIG_IFILES =			\
+	msdd.i
 
-ourlib_LTLIBRARIES = _msdd.la
+# Install so that they end up available as:
+#   import gnuradio.msdd
+# This ends up at:
+#   ${prefix}/lib/python${python_version}/site-packages/gnuradio
+msdd_pythondir_category =		\
+	gnuradio
 
-# These are the source files that go into the shared library
-_msdd_la_SOURCES = 			\
-	msdd.cc			\
-	msdd_source_simple.cc	\
+# additional sources for the SWIG-generated library
+msdd_la_swig_sources =			\
+	msdd_source_simple.cc		\
 	msdd6000.cc
 
-# magic flag
-_msdd_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version 
-#-lfftw3 -lfftw3f -lfann 
-
-# link the library against some comon swig runtime code and the 
-# c++ standard library
-_msdd_la_LIBADD = 			\
-	$(GNURADIO_CORE_LA)		\
-	$(PYTHON_LDFLAGS)		\
-	-lstdc++
-
-
-msdd.cc msdd.py: $(ALL_IFILES) 
-	$(SWIG) $(STD_SWIG_PYTHON_ARGS) -module msdd \
-		-o msdd.cc $(LOCAL_IFILES)
-
-# These headers get installed in ${prefix}/include/gnuradio
-grinclude_HEADERS =			\
-	msdd_source_simple.h			\
-	msdd_buffer_copy_behaviors.h \
-	msdd6000.h
-
-
-# These swig headers get installed in ${prefix}/include/gnuradio/swig
-swiginclude_HEADERS = 			\
-	$(LOCAL_IFILES)
+# additional libraries for linking with the SWIG-generated library
+msdd_la_swig_libadd =			\
+	$(GNURADIO_CORE_LA)
 
+include $(top_srcdir)/Makefile.swig
 
-MOSTLYCLEANFILES = $(BUILT_SOURCES) *.pyc
+# add some of the variables generated inside the Makefile.swig.gen
+BUILT_SOURCES = $(swig_built_sources)
 
-# Don't distribute output of swig
-dist-hook:
-	@for file in $(BUILT_SOURCES); do echo $(RM) $(distdir)/$$file; done
-	@for file in $(BUILT_SOURCES); do $(RM) $(distdir)/$$file; done
+# Do not distribute the output of SWIG
+no_dist_files = $(swig_built_sources)