diff options
author | Ben Reynwar | 2011-01-30 09:50:36 -0700 |
---|---|---|
committer | Ben Reynwar | 2011-01-30 09:50:36 -0700 |
commit | d1d4c8fd9dcf852cef9c274363182209c6761145 (patch) | |
tree | 54ddbd617c5ffffbbfc4e766f2d2281669919a73 /gr-audio-windows/src/Makefile.am | |
parent | f6547e103e6cae44ff2a81b0f83675ccc897f2e9 (diff) | |
parent | 023167ca8a85ab597f9e59302733f71809a8afbd (diff) | |
download | gnuradio-d1d4c8fd9dcf852cef9c274363182209c6761145.tar.gz gnuradio-d1d4c8fd9dcf852cef9c274363182209c6761145.tar.bz2 gnuradio-d1d4c8fd9dcf852cef9c274363182209c6761145.zip |
Merged upstream from next
Diffstat (limited to 'gr-audio-windows/src/Makefile.am')
-rw-r--r-- | gr-audio-windows/src/Makefile.am | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/gr-audio-windows/src/Makefile.am b/gr-audio-windows/src/Makefile.am index d3e3f5a85..1d7b253ec 100644 --- a/gr-audio-windows/src/Makefile.am +++ b/gr-audio-windows/src/Makefile.am @@ -20,8 +20,11 @@ # include $(top_srcdir)/Makefile.common +include $(top_srcdir)/Makefile.swig -EXTRA_DIST = run_tests.in +TESTS = +DISTCLEANFILES += run_tests +EXTRA_DIST += run_tests.in AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) @@ -36,7 +39,7 @@ lib_LTLIBRARIES = libgnuradio-audio-windows.la libgnuradio_audio_windows_la_SOURCES = \ audio_windows_sink.cc \ - audio_windows_source.cc + audio_windows_source.cc libgnuradio_audio_windows_la_LIBADD = \ $(GNURADIO_CORE_LA) \ @@ -47,11 +50,8 @@ libgnuradio_audio_windows_la_LDFLAGS = \ $(NO_UNDEFINED) \ $(LTVERSIONFLAGS) -if PYTHON ################################### -# SWIG Python interface and library -TESTS = run_tests -DISTCLEANFILES = run_tests +# SWIG interface and library TOP_SWIG_IFILES = \ audio_windows.i @@ -67,11 +67,6 @@ audio_windows_pythondir_category = \ audio_windows_la_swig_libadd = \ libgnuradio-audio-windows.la -include $(top_srcdir)/Makefile.swig - -# add some of the variables generated inside the Makefile.swig.gen -BUILT_SOURCES = $(swig_built_sources) - -# Do not distribute the output of SWIG -no_dist_files = $(swig_built_sources) +if PYTHON +TESTS += run_tests endif |