Merged r10554:10595 from michaelld/am_swig_4 into trunk. Major overhaul of SWIG...

[debian/gnuradio] / gr-audio-jack / src / Makefile.am

diff --git a/gr-audio-jack/src/Makefile.am b/gr-audio-jack/src/Makefile.am
index 4ac3d1a432e4172f57d26adda52381db1df5e5ed..bd8694a26188709232858d04dbecd80e03b8d5bd 100644 (file)
--- a/gr-audio-jack/src/Makefile.am
+++ b/gr-audio-jack/src/Makefile.am
@@ -21,44 +21,13 @@
 
 include $(top_srcdir)/Makefile.common
 
-# Install this stuff so that it ends up as the gnuradio.audio_jack 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
 
-LOCAL_IFILES =                                 \
-       $(srcdir)/audio_jack.i                          
-
-NON_LOCAL_IFILES =                     \
-       $(GNURADIO_I)
-
-ALL_IFILES =                           \
-       $(LOCAL_IFILES)                 \
-       $(NON_LOCAL_IFILES)             
-
-BUILT_SOURCES =                        \
-       audio_jack.cc                   \
-       audio_jack.py                           
-
-ourpython_PYTHON =                     \
-       audio_jack.py
-
-AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
-
-ourlib_LTLIBRARIES = _audio_jack.la
-
-_audio_jack_la_SOURCES =               \
-       audio_jack.cc                   \
-       audio_jack_sink.cc              \
-       audio_jack_source.cc            \
-       gri_jack.cc
+DISTCLEANFILES = run_tests
 
+# C/C++ headers get installed in ${prefix}/include/gnuradio
 grinclude_HEADERS =                    \
        audio_jack_sink.h               \
        audio_jack_source.h
@@ -66,30 +35,39 @@ grinclude_HEADERS =                 \
 noinst_HEADERS =                       \
        gri_jack.h
 
-swiginclude_HEADERS =                  \
-       $(LOCAL_IFILES)
+noinst_PYTHON =                        \
+       qa_jack.py
 
-_audio_jack_la_LIBADD =                \
-       $(PYTHON_LDFLAGS)               \
-       $(GNURADIO_CORE_LA)             \
-       $(JACK_LIBS)                    \
-       -lstdc++
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
-_audio_jack_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
+###################################
+# SWIG Python interface and library
 
-_audio_jack_la_CXXFLAGS = @swig_CXXFLAGS@
+TOP_SWIG_IFILES =                      \
+       audio_jack.i
 
-audio_jack.cc audio_jack.py: $(ALL_IFILES)
-       $(SWIG) $(STD_SWIG_PYTHON_ARGS) -module audio_jack \
-               -o audio_jack.cc $(LOCAL_IFILES)
+# Install so that they end up available as:
+#   import gnuradio.audio_jack
+# This ends up at:
+#   ${prefix}/lib/python${python_version}/site-packages/gnuradio
+audio_jack_pythondir_category =                \
+       gnuradio
 
-noinst_PYTHON =                        \
-       qa_jack.py
+# additional sources for the SWIG-generated library
+audio_jack_la_swig_sources =           \
+       audio_jack_sink.cc              \
+       audio_jack_source.cc            \
+       gri_jack.cc
+
+# additional libraries for linking with the SWIG-generated library
+audio_jack_la_swig_libadd =            \
+       $(GNURADIO_CORE_LA)             \
+       $(JACK_LIBS)
+
+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)