diff options
| author | Nick Foster | 2011-01-10 15:25:19 -0800 |
|---|---|---|
| committer | Nick Foster | 2011-01-10 15:25:19 -0800 |
| commit | 70e978b7fdc0285b56ed3ec7be3f10dc3d922504 (patch) | |
| tree | 75231113034c1ac75277fbe444c02e9b600b2a7a /gr-comedi/src/Makefile.am | |
| parent | 0e92b93f21fc9c324c379bc318120d414e7422cc (diff) | |
| parent | bb438e7d12c5767123f8abed5810f284a5f18bf8 (diff) | |
| download | gnuradio-70e978b7fdc0285b56ed3ec7be3f10dc3d922504.tar.gz gnuradio-70e978b7fdc0285b56ed3ec7be3f10dc3d922504.tar.bz2 gnuradio-70e978b7fdc0285b56ed3ec7be3f10dc3d922504.zip | |
Merge branch 'next' of http://gnuradio.org/git/gnuradio into next
Diffstat (limited to 'gr-comedi/src/Makefile.am')
| -rw-r--r-- | gr-comedi/src/Makefile.am | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/gr-comedi/src/Makefile.am b/gr-comedi/src/Makefile.am index a55bd175b..47f689adb 100644 --- a/gr-comedi/src/Makefile.am +++ b/gr-comedi/src/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2005,2008,2009 Free Software Foundation, Inc. +# Copyright 2005,2008,2009,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -20,8 +20,12 @@ # include $(top_srcdir)/Makefile.common +include $(top_srcdir)/Makefile.swig + +TESTS = +EXTRA_DIST += run_tests.in +DISTCLEANFILES += run_tests -EXTRA_DIST = run_tests.in AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) @@ -49,11 +53,8 @@ libgnuradio_comedi_la_LIBADD = \ libgnuradio_comedi_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS) -if PYTHON ################################### -# SWIG Python interface and library -TESTS = run_tests -DISTCLEANFILES = run_tests +# SWIG interfaces and libraries TOP_SWIG_IFILES = \ comedi.i @@ -69,11 +70,6 @@ comedi_pythondir_category = \ comedi_la_swig_libadd = \ libgnuradio-comedi.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 |