Merge branch 'upstream' into dfsg-orig

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

diff --git a/gr-audio-oss/src/Makefile.am b/gr-audio-oss/src/Makefile.am
index f83ba68ca98927a2714f28c73f9044dd300e8134..628c9fd9304c52096902d397eff3b697386f7883 100644 (file)
--- a/gr-audio-oss/src/Makefile.am
+++ b/gr-audio-oss/src/Makefile.am
@@ -21,11 +21,9 @@
 
 include $(top_srcdir)/Makefile.common
 
-EXTRA_DIST = run_tests.in
-
-TESTS = run_tests
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
-DISTCLEANFILES = run_tests
+EXTRA_DIST = run_tests.in
 
 # C/C++ headers get installed in ${prefix}/include/gnuradio
 grinclude_HEADERS =            \
@@ -34,10 +32,23 @@ grinclude_HEADERS =         \
 
 noinst_PYTHON = qa_oss.py
 
-AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
+lib_LTLIBRARIES = libgnuradio-audio-oss.la
+
+libgnuradio_audio_oss_la_SOURCES =     \
+       audio_oss_sink.cc               \
+       audio_oss_source.cc
 
+libgnuradio_audio_oss_la_LIBADD =      \
+       $(GNURADIO_CORE_LA)             \
+       $(OSS_LIBS)
+
+libgnuradio_audio_oss_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
+
+if PYTHON
 ###################################
 # SWIG Python interface and library
+TESTS = run_tests
+DISTCLEANFILES = run_tests
 
 TOP_SWIG_IFILES =              \
        audio_oss.i
@@ -49,15 +60,9 @@ TOP_SWIG_IFILES =            \
 audio_oss_pythondir_category = \
        gnuradio
 
-# additional sources for the SWIG-generated library
-audio_oss_la_swig_sources =    \
-       audio_oss_sink.cc       \
-       audio_oss_source.cc
-
 # additional libraries for linking with the SWIG-generated library
 audio_oss_la_swig_libadd =     \
-       $(GNURADIO_CORE_LA)     \
-       $(OSS_LIBS)
+       libgnuradio-audio-oss.la
 
 include $(top_srcdir)/Makefile.swig
 
@@ -66,3 +71,4 @@ BUILT_SOURCES = $(swig_built_sources)
 
 # Do not distribute the output of SWIG
 no_dist_files = $(swig_built_sources)
+endif