X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=gr-audio-alsa%2Fsrc%2FMakefile.am;fp=gr-audio-alsa%2Fsrc%2FMakefile.am;h=8230ab56999dee5c0173765c0e6042b8cdf25e6e;hb=c3f962a1f0a4132ad643c58774bb69b190dccc49;hp=d7c787d56c0ad39f43c04b7c0e2ffdc56c868562;hpb=4eea337c46db44a6ee7560a4552e158421776777;p=debian%2Fgnuradio

diff --git a/gr-audio-alsa/src/Makefile.am b/gr-audio-alsa/src/Makefile.am
index d7c787d5..8230ab56 100644
--- a/gr-audio-alsa/src/Makefile.am
+++ b/gr-audio-alsa/src/Makefile.am
@@ -21,85 +21,63 @@
 
 include $(top_srcdir)/Makefile.common
 
-# Install this stuff so that it ends up as the gnuradio.audio_alsa 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_alsa.i				
-
-NON_LOCAL_IFILES =			\
-	$(GNURADIO_I)
+DISTCLEANFILES = run_tests
 
-ALL_IFILES = 				\
-	$(LOCAL_IFILES)			\
-	$(NON_LOCAL_IFILES)		
+# C/C++ headers get installed in ${prefix}/include/gnuradio
+grinclude_HEADERS =			\
+	audio_alsa_sink.h		\
+	audio_alsa_source.h
 
-BUILT_SOURCES = 			\
-	audio_alsa.cc			\
-	audio_alsa.py				
+noinst_HEADERS = 			\
+	gri_alsa.h
 
-ourpython_PYTHON =			\
-	audio_alsa.py
+noinst_PYTHON = 			\
+	qa_alsa.py
 
 AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
-ourlib_LTLIBRARIES = _audio_alsa.la
+###################################
+# ALSA library, including OS interface, sink, and source
 
 lib_LTLIBRARIES = libgnuradio-audio-alsa.la
 
-_audio_alsa_la_SOURCES = 		\
-	audio_alsa.cc
-
 libgnuradio_audio_alsa_la_SOURCES = 	\
 	audio_alsa_sink.cc		\
 	audio_alsa_source.cc		\
 	gri_alsa.cc
 
-grinclude_HEADERS =			\
-	audio_alsa_sink.h		\
-	audio_alsa_source.h
-
-noinst_HEADERS = 			\
-	gri_alsa.h
-
-swiginclude_HEADERS = 			\
-	$(LOCAL_IFILES)
-
-_audio_alsa_la_LIBADD = 		\
-	$(PYTHON_LDFLAGS)		\
-	$(GNURADIO_CORE_LA)		\
-	$(ALSA_LIBS)			\
-	libgnuradio-audio-alsa.la	\
-	-lstdc++
-
 libgnuradio_audio_alsa_la_LIBADD =	\
+	$(GNURADIO_CORE_LA)		\
 	$(ALSA_LIBS)
 
-_audio_alsa_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
+libgnuradio_audio_alsa_la_LDFLAGS =	\
+	$(NO_UNDEFINED)
 
-libgnuradio_audio_alsa_la_LDFLAGS = $(NO_UNDEFINED)
+###################################
+# SWIG Python interface and library
 
-_audio_alsa_la_CXXFLAGS = @swig_CXXFLAGS@
+TOP_SWIG_IFILES = 			\
+	audio_alsa.i
 
-audio_alsa.cc audio_alsa.py: $(ALL_IFILES)
-	$(SWIG) $(STD_SWIG_PYTHON_ARGS) -module audio_alsa \
-		-o audio_alsa.cc $(LOCAL_IFILES)
+# Install so that they end up available as:
+#   import gnuradio.audio_alsa
+# This ends up at:
+#   ${prefix}/lib/python${python_version}/site-packages/gnuradio
+audio_alsa_pythondir_category =		\
+	gnuradio
 
-noinst_PYTHON = 			\
-	qa_alsa.py			
+# additional libraries for linking with the SWIG-generated library
+audio_alsa_la_swig_libadd =		\
+	libgnuradio-audio-alsa.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)