[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r11129 - in gnuradio/branches/developers/jcorgan/np: .
|
From: |
jcorgan |
|
Subject: |
[Commit-gnuradio] r11129 - in gnuradio/branches/developers/jcorgan/np: . gnuradio-core/src gnuradio-core/src/lib gnuradio-core/src/lib/filter gnuradio-core/src/lib/general gnuradio-core/src/lib/gengen gnuradio-core/src/lib/hier gnuradio-core/src/lib/io gnuradio-core/src/lib/runtime gnuradio-core/src/lib/swig gnuradio-core/src/python/gnuradio gnuradio-examples gr-atsc/src gr-atsc/src/lib gr-audio-alsa/src gr-audio-jack/src gr-audio-oss/src gr-audio-osx/src gr-audio-portaudio/src gr-audio-windows/src gr-comedi/src gr-cvsd-vocoder/src gr-cvsd-vocoder/src/lib gr-gcell/src gr-gpio/src gr-gsm-fr-vocoder/src gr-gsm-fr-vocoder/src/lib gr-msdd6000/src gr-pager/src gr-qtgui/src gr-qtgui/src/lib gr-radar-mono/src gr-radio-astronomy/src gr-radio-astronomy/src/lib gr-sounder/src gr-trellis/src gr-trellis/src/lib gr-usrp/src gr-usrp2/src gr-utils/src gr-video-sdl/src gr-wxgui grc usrp/host usrp/host/lib/legacy |
|
Date: |
Tue, 26 May 2009 12:51:01 -0600 (MDT) |
Author: jcorgan
Date: 2009-05-26 12:51:00 -0600 (Tue, 26 May 2009)
New Revision: 11129
Modified:
gnuradio/branches/developers/jcorgan/np/Makefile.common
gnuradio/branches/developers/jcorgan/np/configure.ac
gnuradio/branches/developers/jcorgan/np/gnuradio-core/src/Makefile.am
gnuradio/branches/developers/jcorgan/np/gnuradio-core/src/lib/Makefile.am
gnuradio/branches/developers/jcorgan/np/gnuradio-core/src/lib/filter/Makefile.am
gnuradio/branches/developers/jcorgan/np/gnuradio-core/src/lib/general/Makefile.am
gnuradio/branches/developers/jcorgan/np/gnuradio-core/src/lib/gengen/Makefile.am
gnuradio/branches/developers/jcorgan/np/gnuradio-core/src/lib/hier/Makefile.am
gnuradio/branches/developers/jcorgan/np/gnuradio-core/src/lib/io/Makefile.am
gnuradio/branches/developers/jcorgan/np/gnuradio-core/src/lib/runtime/Makefile.am
gnuradio/branches/developers/jcorgan/np/gnuradio-core/src/lib/swig/Makefile.am
gnuradio/branches/developers/jcorgan/np/gnuradio-core/src/python/gnuradio/Makefile.am
gnuradio/branches/developers/jcorgan/np/gnuradio-examples/Makefile.am
gnuradio/branches/developers/jcorgan/np/gr-atsc/src/Makefile.am
gnuradio/branches/developers/jcorgan/np/gr-atsc/src/lib/Makefile.am
gnuradio/branches/developers/jcorgan/np/gr-audio-alsa/src/Makefile.am
gnuradio/branches/developers/jcorgan/np/gr-audio-jack/src/Makefile.am
gnuradio/branches/developers/jcorgan/np/gr-audio-oss/src/Makefile.am
gnuradio/branches/developers/jcorgan/np/gr-audio-osx/src/Makefile.am
gnuradio/branches/developers/jcorgan/np/gr-audio-portaudio/src/Makefile.am
gnuradio/branches/developers/jcorgan/np/gr-audio-windows/src/Makefile.am
gnuradio/branches/developers/jcorgan/np/gr-comedi/src/Makefile.am
gnuradio/branches/developers/jcorgan/np/gr-cvsd-vocoder/src/Makefile.am
gnuradio/branches/developers/jcorgan/np/gr-cvsd-vocoder/src/lib/Makefile.am
gnuradio/branches/developers/jcorgan/np/gr-gcell/src/Makefile.am
gnuradio/branches/developers/jcorgan/np/gr-gpio/src/Makefile.am
gnuradio/branches/developers/jcorgan/np/gr-gsm-fr-vocoder/src/Makefile.am
gnuradio/branches/developers/jcorgan/np/gr-gsm-fr-vocoder/src/lib/Makefile.am
gnuradio/branches/developers/jcorgan/np/gr-msdd6000/src/Makefile.am
gnuradio/branches/developers/jcorgan/np/gr-pager/src/Makefile.am
gnuradio/branches/developers/jcorgan/np/gr-qtgui/src/Makefile.am
gnuradio/branches/developers/jcorgan/np/gr-qtgui/src/lib/Makefile.am
gnuradio/branches/developers/jcorgan/np/gr-radar-mono/src/Makefile.am
gnuradio/branches/developers/jcorgan/np/gr-radio-astronomy/src/Makefile.am
gnuradio/branches/developers/jcorgan/np/gr-radio-astronomy/src/lib/Makefile.am
gnuradio/branches/developers/jcorgan/np/gr-sounder/src/Makefile.am
gnuradio/branches/developers/jcorgan/np/gr-trellis/src/Makefile.am
gnuradio/branches/developers/jcorgan/np/gr-trellis/src/lib/Makefile.am
gnuradio/branches/developers/jcorgan/np/gr-usrp/src/Makefile.am
gnuradio/branches/developers/jcorgan/np/gr-usrp2/src/Makefile.am
gnuradio/branches/developers/jcorgan/np/gr-utils/src/Makefile.am
gnuradio/branches/developers/jcorgan/np/gr-video-sdl/src/Makefile.am
gnuradio/branches/developers/jcorgan/np/gr-wxgui/Makefile.am
gnuradio/branches/developers/jcorgan/np/grc/Makefile.am
gnuradio/branches/developers/jcorgan/np/usrp/host/Makefile.am
gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/Makefile.am
Log:
Added --enable-python, defaulting to yes, causing only existing C++ API
components to be built.
Modified: gnuradio/branches/developers/jcorgan/np/Makefile.common
===================================================================
--- gnuradio/branches/developers/jcorgan/np/Makefile.common 2009-05-26
18:06:03 UTC (rev 11128)
+++ gnuradio/branches/developers/jcorgan/np/Makefile.common 2009-05-26
18:51:00 UTC (rev 11129)
@@ -26,6 +26,7 @@
# includes
grincludedir = $(includedir)/gnuradio
+if PYTHON
# swig includes
swigincludedir = $(grincludedir)/swig
@@ -42,6 +43,7 @@
usrppythondir = $(pythondir)/usrpm
usrppyexecdir = $(pyexecdir)/usrpm
+endif
# gcell includes
gcellincludedir = $(includedir)/gcell
Modified: gnuradio/branches/developers/jcorgan/np/configure.ac
===================================================================
--- gnuradio/branches/developers/jcorgan/np/configure.ac 2009-05-26
18:06:03 UTC (rev 11128)
+++ gnuradio/branches/developers/jcorgan/np/configure.ac 2009-05-26
18:51:00 UTC (rev 11129)
@@ -126,6 +126,20 @@
GR_NO_UNDEFINED dnl do we need the -no-undefined linker flag
GR_SCRIPTING
+# Allow user to choose whether to generate SWIG/Python
+# Default is enabled
+AC_ARG_ENABLE([python],
+ [AS_HELP_STRING([--enable-python],
+ [generate SWIG/Python components (default is yes)])],
+ [case "${enableval}" in
+ yes) enable_python=yes ;;
+ no) enable_python=no ;;
+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-python]) ;;
+ esac],
+ [enable_python=yes]
+)
+AM_CONDITIONAL([PYTHON], [test x$enable_python = xyes])
+
AC_CHECK_PROG([XMLTO],[xmlto],[yes],[])
AM_CONDITIONAL([HAS_XMLTO], [test x$XMLTO = xyes])
@@ -327,7 +341,7 @@
GRC_GR_WXGUI
GRC_GR_QTGUI
GRC_GR_SOUNDER dnl this must come after GRC_USRP
-GRC_GR_UTILS dnl this must come after GRC_GR_WXGUI
+GRC_GR_UTILS dnl this must come after GRC_GR_WXGUI
GRC_GNURADIO_EXAMPLES dnl must come after all GRC_GR_*
GRC_GRC
GRC_DOCS dnl must be last
@@ -402,3 +416,4 @@
echo These components will not be built.
echo
fi
+
Modified: gnuradio/branches/developers/jcorgan/np/gnuradio-core/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gnuradio-core/src/Makefile.am
2009-05-26 18:06:03 UTC (rev 11128)
+++ gnuradio/branches/developers/jcorgan/np/gnuradio-core/src/Makefile.am
2009-05-26 18:51:00 UTC (rev 11129)
@@ -1,5 +1,5 @@
#
-# Copyright 2001,2004 Free Software Foundation, Inc.
+# Copyright 2001,2004,2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -21,6 +21,9 @@
include $(top_srcdir)/Makefile.common
-SUBDIRS = gen_interpolator_taps lib tests python
+SUBDIRS = gen_interpolator_taps lib tests
+if PYTHON
+SUBDIRS += python
+endif
DIST_SUBDIRS = gen_interpolator_taps lib tests python utils
Modified:
gnuradio/branches/developers/jcorgan/np/gnuradio-core/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gnuradio-core/src/lib/Makefile.am
2009-05-26 18:06:03 UTC (rev 11128)
+++ gnuradio/branches/developers/jcorgan/np/gnuradio-core/src/lib/Makefile.am
2009-05-26 18:51:00 UTC (rev 11129)
@@ -1,5 +1,5 @@
#
-# Copyright 2001,2004 Free Software Foundation, Inc.
+# Copyright 2001,2004,2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -24,7 +24,10 @@
## Process this file with automake to produce Makefile.in
# We've got to build . before swig
-SUBDIRS = missing runtime filter viterbi general gengen g72x reed-solomon io
hier . swig
+SUBDIRS = missing runtime filter viterbi general gengen g72x reed-solomon io
hier .
+if PYTHON
+SUBDIRS += swig
+endif
# generate libgnuradio-core.la from the convenience libraries in subdirs
Modified:
gnuradio/branches/developers/jcorgan/np/gnuradio-core/src/lib/filter/Makefile.am
===================================================================
---
gnuradio/branches/developers/jcorgan/np/gnuradio-core/src/lib/filter/Makefile.am
2009-05-26 18:06:03 UTC (rev 11128)
+++
gnuradio/branches/developers/jcorgan/np/gnuradio-core/src/lib/filter/Makefile.am
2009-05-26 18:51:00 UTC (rev 11129)
@@ -293,7 +293,7 @@
qa_gri_mmse_fir_interpolator_cc.h
-
+if PYTHON
swiginclude_HEADERS = \
filter.i \
filter_generated.i \
@@ -310,6 +310,7 @@
gr_single_pole_iir_filter_ff.i \
gr_single_pole_iir_filter_cc.i \
$(GENERATED_I)
+endif
# Do creation and inclusion of other Makefiles last
Modified:
gnuradio/branches/developers/jcorgan/np/gnuradio-core/src/lib/general/Makefile.am
===================================================================
---
gnuradio/branches/developers/jcorgan/np/gnuradio-core/src/lib/general/Makefile.am
2009-05-26 18:06:03 UTC (rev 11128)
+++
gnuradio/branches/developers/jcorgan/np/gnuradio-core/src/lib/general/Makefile.am
2009-05-26 18:51:00 UTC (rev 11129)
@@ -353,6 +353,7 @@
sine_table.h \
qa_gr_math.h
+if PYTHON
swiginclude_HEADERS = \
general.i \
gr_agc_cc.i \
@@ -478,3 +479,4 @@
gr_scrambler_bb.i \
gr_probe_mpsk_snr_c.i \
gr_probe_density_b.i
+endif
Modified:
gnuradio/branches/developers/jcorgan/np/gnuradio-core/src/lib/gengen/Makefile.am
===================================================================
---
gnuradio/branches/developers/jcorgan/np/gnuradio-core/src/lib/gengen/Makefile.am
2009-05-26 18:06:03 UTC (rev 11128)
+++
gnuradio/branches/developers/jcorgan/np/gnuradio-core/src/lib/gengen/Makefile.am
2009-05-26 18:51:00 UTC (rev 11129)
@@ -135,11 +135,13 @@
gr_noise_type.h \
gr_sig_source_waveform.h
+if PYTHON
swiginclude_HEADERS = \
$(GENERATED_I) \
gr_endianness.i \
gengen.i \
gengen_generated.i
+endif
# Do creation and inclusion of other Makefiles last
Modified:
gnuradio/branches/developers/jcorgan/np/gnuradio-core/src/lib/hier/Makefile.am
===================================================================
---
gnuradio/branches/developers/jcorgan/np/gnuradio-core/src/lib/hier/Makefile.am
2009-05-26 18:06:03 UTC (rev 11128)
+++
gnuradio/branches/developers/jcorgan/np/gnuradio-core/src/lib/hier/Makefile.am
2009-05-26 18:51:00 UTC (rev 11129)
@@ -32,6 +32,8 @@
grinclude_HEADERS = \
gr_channel_model.h
+if PYTHON
swiginclude_HEADERS = \
hier.i \
gr_channel_model.i
+endif
Modified:
gnuradio/branches/developers/jcorgan/np/gnuradio-core/src/lib/io/Makefile.am
===================================================================
---
gnuradio/branches/developers/jcorgan/np/gnuradio-core/src/lib/io/Makefile.am
2009-05-26 18:06:03 UTC (rev 11128)
+++
gnuradio/branches/developers/jcorgan/np/gnuradio-core/src/lib/io/Makefile.am
2009-05-26 18:51:00 UTC (rev 11129)
@@ -93,9 +93,7 @@
gr_wavfile_sink.h \
gri_wavfile.h
-
-
-
+if PYTHON
swiginclude_HEADERS = \
io.i \
gr_file_sink.i \
@@ -116,4 +114,4 @@
gr_udp_source.i \
gr_wavfile_source.i \
gr_wavfile_sink.i
-
+endif
Modified:
gnuradio/branches/developers/jcorgan/np/gnuradio-core/src/lib/runtime/Makefile.am
===================================================================
---
gnuradio/branches/developers/jcorgan/np/gnuradio-core/src/lib/runtime/Makefile.am
2009-05-26 18:06:03 UTC (rev 11128)
+++
gnuradio/branches/developers/jcorgan/np/gnuradio-core/src/lib/runtime/Makefile.am
2009-05-26 18:51:00 UTC (rev 11129)
@@ -135,6 +135,7 @@
qa_gr_vmcircbuf.h \
qa_runtime.h
+if PYTHON
swiginclude_HEADERS = \
gr_basic_block.i \
gr_block.i \
@@ -154,3 +155,4 @@
gr_sync_interpolator.i \
gr_top_block.i \
runtime.i
+endif
Modified:
gnuradio/branches/developers/jcorgan/np/gnuradio-core/src/lib/swig/Makefile.am
===================================================================
---
gnuradio/branches/developers/jcorgan/np/gnuradio-core/src/lib/swig/Makefile.am
2009-05-26 18:06:03 UTC (rev 11128)
+++
gnuradio/branches/developers/jcorgan/np/gnuradio-core/src/lib/swig/Makefile.am
2009-05-26 18:51:00 UTC (rev 11129)
@@ -21,6 +21,7 @@
include $(top_srcdir)/Makefile.common
+if PYTHON
AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) -I$(srcdir) \
$(WITH_INCLUDES)
@@ -99,3 +100,4 @@
# Do not distribute the output of SWIG
no_dist_files = $(swig_built_sources)
+endif
Modified:
gnuradio/branches/developers/jcorgan/np/gnuradio-core/src/python/gnuradio/Makefile.am
===================================================================
---
gnuradio/branches/developers/jcorgan/np/gnuradio-core/src/python/gnuradio/Makefile.am
2009-05-26 18:06:03 UTC (rev 11128)
+++
gnuradio/branches/developers/jcorgan/np/gnuradio-core/src/python/gnuradio/Makefile.am
2009-05-26 18:51:00 UTC (rev 11129)
@@ -21,6 +21,7 @@
include $(top_srcdir)/Makefile.common
+if PYTHON
SUBDIRS = gr gru gruimpl blks2 blks2impl vocoder
grpython_PYTHON = \
@@ -34,3 +35,4 @@
gr_unittest.py \
optfir.py \
window.py
+endif
Modified: gnuradio/branches/developers/jcorgan/np/gnuradio-examples/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gnuradio-examples/Makefile.am
2009-05-26 18:06:03 UTC (rev 11128)
+++ gnuradio/branches/developers/jcorgan/np/gnuradio-examples/Makefile.am
2009-05-26 18:51:00 UTC (rev 11129)
@@ -21,4 +21,7 @@
include $(top_srcdir)/Makefile.common
-SUBDIRS = python c++
+SUBDIRS = c++
+if PYTHON
+SUBDIRS += python
+endif
Modified: gnuradio/branches/developers/jcorgan/np/gr-atsc/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gr-atsc/src/Makefile.am
2009-05-26 18:06:03 UTC (rev 11128)
+++ gnuradio/branches/developers/jcorgan/np/gr-atsc/src/Makefile.am
2009-05-26 18:51:00 UTC (rev 11129)
@@ -19,4 +19,8 @@
# Boston, MA 02110-1301, USA.
#
-SUBDIRS = lib python
+SUBDIRS = lib
+if PYTHON
+SUBDIRS += python
+endif
+
Modified: gnuradio/branches/developers/jcorgan/np/gr-atsc/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gr-atsc/src/lib/Makefile.am
2009-05-26 18:06:03 UTC (rev 11128)
+++ gnuradio/branches/developers/jcorgan/np/gr-atsc/src/lib/Makefile.am
2009-05-26 18:51:00 UTC (rev 11129)
@@ -32,6 +32,7 @@
qa_atsci_viterbi_decoder_t1_input.dat \
qa_atsci_viterbi_decoder_t1_output.dat
+if PYTHON
TESTS = \
test_atsci
@@ -231,3 +232,4 @@
# Do not distribute the output of SWIG
no_dist_files = $(swig_built_sources)
+endif
Modified: gnuradio/branches/developers/jcorgan/np/gr-audio-alsa/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gr-audio-alsa/src/Makefile.am
2009-05-26 18:06:03 UTC (rev 11128)
+++ gnuradio/branches/developers/jcorgan/np/gr-audio-alsa/src/Makefile.am
2009-05-26 18:51:00 UTC (rev 11129)
@@ -23,10 +23,6 @@
EXTRA_DIST = run_tests.in
-TESTS = run_tests
-
-DISTCLEANFILES = run_tests
-
# C/C++ headers get installed in ${prefix}/include/gnuradio
grinclude_HEADERS = \
audio_alsa_sink.h \
@@ -57,8 +53,11 @@
libgnuradio_audio_alsa_la_LDFLAGS = \
$(NO_UNDEFINED)
+if PYTHON
###################################
# SWIG Python interface and library
+TESTS = run_tests
+DISTCLEANFILES = run_tests
TOP_SWIG_IFILES = \
audio_alsa.i
@@ -81,3 +80,4 @@
# Do not distribute the output of SWIG
no_dist_files = $(swig_built_sources)
+endif
\ No newline at end of file
Modified: gnuradio/branches/developers/jcorgan/np/gr-audio-jack/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gr-audio-jack/src/Makefile.am
2009-05-26 18:06:03 UTC (rev 11128)
+++ gnuradio/branches/developers/jcorgan/np/gr-audio-jack/src/Makefile.am
2009-05-26 18:51:00 UTC (rev 11129)
@@ -23,10 +23,7 @@
EXTRA_DIST = run_tests.in
-TESTS = run_tests
-
-DISTCLEANFILES = run_tests
-
+if PYTHON
# C/C++ headers get installed in ${prefix}/include/gnuradio
grinclude_HEADERS = \
audio_jack_sink.h \
@@ -42,6 +39,8 @@
###################################
# SWIG Python interface and library
+TESTS = run_tests
+DISTCLEANFILES = run_tests
TOP_SWIG_IFILES = \
audio_jack.i
@@ -71,3 +70,4 @@
# Do not distribute the output of SWIG
no_dist_files = $(swig_built_sources)
+endif
Modified: gnuradio/branches/developers/jcorgan/np/gr-audio-oss/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gr-audio-oss/src/Makefile.am
2009-05-26 18:06:03 UTC (rev 11128)
+++ gnuradio/branches/developers/jcorgan/np/gr-audio-oss/src/Makefile.am
2009-05-26 18:51:00 UTC (rev 11129)
@@ -23,10 +23,7 @@
EXTRA_DIST = run_tests.in
-TESTS = run_tests
-
-DISTCLEANFILES = run_tests
-
+if PYTHON
# C/C++ headers get installed in ${prefix}/include/gnuradio
grinclude_HEADERS = \
audio_oss_sink.h \
@@ -38,6 +35,8 @@
###################################
# SWIG Python interface and library
+TESTS = run_tests
+DISTCLEANFILES = run_tests
TOP_SWIG_IFILES = \
audio_oss.i
@@ -66,3 +65,4 @@
# Do not distribute the output of SWIG
no_dist_files = $(swig_built_sources)
+endif
Modified: gnuradio/branches/developers/jcorgan/np/gr-audio-osx/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gr-audio-osx/src/Makefile.am
2009-05-26 18:06:03 UTC (rev 11128)
+++ gnuradio/branches/developers/jcorgan/np/gr-audio-osx/src/Makefile.am
2009-05-26 18:51:00 UTC (rev 11129)
@@ -23,10 +23,7 @@
EXTRA_DIST = run_tests.in
-TESTS = run_tests
-
-DISTCLEANFILES = run_tests
-
+if PYTHON
AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
# C/C++ headers get installed in ${prefix}/include/gnuradio
@@ -45,6 +42,8 @@
###################################
# SWIG Python interface and library
+TESTS = run_tests
+DISTCLEANFILES = run_tests
TOP_SWIG_IFILES = \
audio_osx.i
@@ -78,3 +77,4 @@
# Do not distribute the output of SWIG
no_dist_files = $(swig_built_sources)
+endif
Modified:
gnuradio/branches/developers/jcorgan/np/gr-audio-portaudio/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gr-audio-portaudio/src/Makefile.am
2009-05-26 18:06:03 UTC (rev 11128)
+++ gnuradio/branches/developers/jcorgan/np/gr-audio-portaudio/src/Makefile.am
2009-05-26 18:51:00 UTC (rev 11129)
@@ -23,10 +23,7 @@
EXTRA_DIST = run_tests.in
-TESTS = run_tests
-
-DISTCLEANFILES = run_tests
-
+if PYTHON
AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \
$(PORTAUDIO_CFLAGS) $(WITH_INCLUDES)
@@ -43,6 +40,8 @@
###################################
# SWIG Python interface and library
+TESTS = run_tests
+DISTCLEANFILES = run_tests
TOP_SWIG_IFILES = \
audio_portaudio.i
@@ -72,3 +71,4 @@
# Do not distribute the output of SWIG
no_dist_files = $(swig_built_sources)
+endif
Modified:
gnuradio/branches/developers/jcorgan/np/gr-audio-windows/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gr-audio-windows/src/Makefile.am
2009-05-26 18:06:03 UTC (rev 11128)
+++ gnuradio/branches/developers/jcorgan/np/gr-audio-windows/src/Makefile.am
2009-05-26 18:51:00 UTC (rev 11129)
@@ -23,10 +23,7 @@
EXTRA_DIST = run_tests.in
-TESTS = run_tests
-
-DISTCLEANFILES = run_tests
-
+if PYTHON
noinst_PYTHON = qa_audio_windows.py
AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
@@ -38,6 +35,8 @@
###################################
# SWIG Python interface and library
+TESTS = run_tests
+DISTCLEANFILES = run_tests
TOP_SWIG_IFILES = \
audio_windows.i
@@ -70,3 +69,4 @@
# Do not distribute the output of SWIG
no_dist_files = $(swig_built_sources)
+endif
Modified: gnuradio/branches/developers/jcorgan/np/gr-comedi/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gr-comedi/src/Makefile.am
2009-05-26 18:06:03 UTC (rev 11128)
+++ gnuradio/branches/developers/jcorgan/np/gr-comedi/src/Makefile.am
2009-05-26 18:51:00 UTC (rev 11129)
@@ -23,12 +23,9 @@
EXTRA_DIST = run_tests.in
-TESTS = run_tests
-
-DISTCLEANFILES = run_tests
-
AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
+if PYTHON
# C/C++ headers get installed in ${prefix}/include/gnuradio
grinclude_HEADERS = \
comedi_sink_s.h \
@@ -42,6 +39,8 @@
###################################
# SWIG Python interface and library
+TESTS = run_tests
+DISTCLEANFILES = run_tests
TOP_SWIG_IFILES = \
comedi.i
@@ -71,3 +70,4 @@
# Do not distribute the output of SWIG
no_dist_files = $(swig_built_sources)
+endif
Modified:
gnuradio/branches/developers/jcorgan/np/gr-cvsd-vocoder/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gr-cvsd-vocoder/src/Makefile.am
2009-05-26 18:06:03 UTC (rev 11128)
+++ gnuradio/branches/developers/jcorgan/np/gr-cvsd-vocoder/src/Makefile.am
2009-05-26 18:51:00 UTC (rev 11129)
@@ -19,4 +19,7 @@
# Boston, MA 02110-1301, USA.
#
-SUBDIRS = lib python
+SUBDIRS = lib
+if PYTHON
+SUBDIRS += python
+endif
Modified:
gnuradio/branches/developers/jcorgan/np/gr-cvsd-vocoder/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gr-cvsd-vocoder/src/lib/Makefile.am
2009-05-26 18:06:03 UTC (rev 11128)
+++ gnuradio/branches/developers/jcorgan/np/gr-cvsd-vocoder/src/lib/Makefile.am
2009-05-26 18:51:00 UTC (rev 11129)
@@ -23,6 +23,7 @@
AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
+if PYTHON
# These headers get installed in ${prefix}/include/gnuradio
grinclude_HEADERS = \
cvsd_decode_bs.h \
@@ -57,3 +58,4 @@
# Do not distribute the output of SWIG
no_dist_files = $(swig_built_sources)
+endif
Modified: gnuradio/branches/developers/jcorgan/np/gr-gcell/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gr-gcell/src/Makefile.am
2009-05-26 18:06:03 UTC (rev 11128)
+++ gnuradio/branches/developers/jcorgan/np/gr-gcell/src/Makefile.am
2009-05-26 18:51:00 UTC (rev 11129)
@@ -22,13 +22,10 @@
SUBDIRS = . examples
-EXTRA_DIST = run_tests.in
-
-TESTS = run_tests
-
AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(GCELL_INCLUDES) \
$(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
+if PYTHON
# ----------------------------------------------------------------
noinst_PYTHON = \
@@ -61,6 +58,8 @@
# ----------------------------------------------------------------
# SWIG stuff
# ----------------------------------------------------------------
+EXTRA_DIST = run_tests.in
+TESTS = run_tests
TOP_SWIG_IFILES = \
gcell.i
@@ -92,3 +91,4 @@
# Do not distribute the output of SWIG
no_dist_files = $(swig_built_sources)
+endif
Modified: gnuradio/branches/developers/jcorgan/np/gr-gpio/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gr-gpio/src/Makefile.am
2009-05-26 18:06:03 UTC (rev 11128)
+++ gnuradio/branches/developers/jcorgan/np/gr-gpio/src/Makefile.am
2009-05-26 18:51:00 UTC (rev 11129)
@@ -19,4 +19,8 @@
# Boston, MA 02110-1301, USA.
#
-SUBDIRS = python fpga
+SUBDIRS = fpga
+if PYTHON
+SUBDIRS += python
+endif
+
Modified:
gnuradio/branches/developers/jcorgan/np/gr-gsm-fr-vocoder/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gr-gsm-fr-vocoder/src/Makefile.am
2009-05-26 18:06:03 UTC (rev 11128)
+++ gnuradio/branches/developers/jcorgan/np/gr-gsm-fr-vocoder/src/Makefile.am
2009-05-26 18:51:00 UTC (rev 11129)
@@ -19,4 +19,7 @@
# Boston, MA 02110-1301, USA.
#
-SUBDIRS = lib python
+SUBDIRS = lib
+if PYTHON
+SUBDIRS += python
+endif
Modified:
gnuradio/branches/developers/jcorgan/np/gr-gsm-fr-vocoder/src/lib/Makefile.am
===================================================================
---
gnuradio/branches/developers/jcorgan/np/gr-gsm-fr-vocoder/src/lib/Makefile.am
2009-05-26 18:06:03 UTC (rev 11128)
+++
gnuradio/branches/developers/jcorgan/np/gr-gsm-fr-vocoder/src/lib/Makefile.am
2009-05-26 18:51:00 UTC (rev 11129)
@@ -25,6 +25,7 @@
AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
+if PYTHON
# C/C++ headers get installed in ${prefix}/include/gnuradio
grinclude_HEADERS = \
gsm_fr_decode_ps.h \
@@ -59,3 +60,4 @@
# Do not distribute the output of SWIG
no_dist_files = $(swig_built_sources)
+endif
Modified: gnuradio/branches/developers/jcorgan/np/gr-msdd6000/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gr-msdd6000/src/Makefile.am
2009-05-26 18:06:03 UTC (rev 11128)
+++ gnuradio/branches/developers/jcorgan/np/gr-msdd6000/src/Makefile.am
2009-05-26 18:51:00 UTC (rev 11129)
@@ -24,6 +24,7 @@
AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \
$(WITH_INCLUDES)
+if PYTHON
# C/C++ headers get installed in ${prefix}/include/gnuradio
grinclude_HEADERS = \
msdd_source_simple.h \
@@ -59,3 +60,4 @@
# Do not distribute the output of SWIG
no_dist_files = $(swig_built_sources)
+endif
Modified: gnuradio/branches/developers/jcorgan/np/gr-pager/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gr-pager/src/Makefile.am
2009-05-26 18:06:03 UTC (rev 11128)
+++ gnuradio/branches/developers/jcorgan/np/gr-pager/src/Makefile.am
2009-05-26 18:51:00 UTC (rev 11129)
@@ -21,6 +21,7 @@
include $(top_srcdir)/Makefile.common
+if PYTHON
EXTRA_DIST = run_tests.in
TESTS = run_tests
@@ -93,3 +94,4 @@
# Do not distribute the output of SWIG
no_dist_files = $(swig_built_sources)
+endif
Modified: gnuradio/branches/developers/jcorgan/np/gr-qtgui/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gr-qtgui/src/Makefile.am
2009-05-26 18:06:03 UTC (rev 11128)
+++ gnuradio/branches/developers/jcorgan/np/gr-qtgui/src/Makefile.am
2009-05-26 18:51:00 UTC (rev 11129)
@@ -19,4 +19,7 @@
# Boston, MA 02110-1301, USA.
#
-SUBDIRS = lib python
+SUBDIRS = lib
+if PYTHON
+SUBDIRS += python
+endif
Modified: gnuradio/branches/developers/jcorgan/np/gr-qtgui/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gr-qtgui/src/lib/Makefile.am
2009-05-26 18:06:03 UTC (rev 11128)
+++ gnuradio/branches/developers/jcorgan/np/gr-qtgui/src/lib/Makefile.am
2009-05-26 18:51:00 UTC (rev 11129)
@@ -39,6 +39,8 @@
EXTRA_DIST = spectrumdisplayform.ui
+BUILT_SOURCES = $(QMAKE_SOURCES)
+
# Build the normal library for C++ apps to link against
lib_LTLIBRARIES = libgnuradio-qtgui.la
@@ -97,6 +99,7 @@
-lstdc++ \
$(QT_LIBS)
+if PYTHON
##############################
# SWIG interface and library
@@ -117,9 +120,9 @@
include $(top_srcdir)/Makefile.swig
# add some of the variables generated inside the Makefile.swig.gen
-BUILT_SOURCES = \
- $(QMAKE_SOURCES) \
+BUILT_SOURCES += \
$(swig_built_sources)
# Do not distribute the output of SWIG
no_dist_files = $(swig_built_sources)
+endif
Modified: gnuradio/branches/developers/jcorgan/np/gr-radar-mono/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gr-radar-mono/src/Makefile.am
2009-05-26 18:06:03 UTC (rev 11128)
+++ gnuradio/branches/developers/jcorgan/np/gr-radar-mono/src/Makefile.am
2009-05-26 18:51:00 UTC (rev 11129)
@@ -21,4 +21,7 @@
include $(top_srcdir)/Makefile.common
-SUBDIRS = fpga lib python
+SUBDIRS = fpga lib
+if PYTHON
+SUBDIRS += python
+endif
Modified:
gnuradio/branches/developers/jcorgan/np/gr-radio-astronomy/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gr-radio-astronomy/src/Makefile.am
2009-05-26 18:06:03 UTC (rev 11128)
+++ gnuradio/branches/developers/jcorgan/np/gr-radio-astronomy/src/Makefile.am
2009-05-26 18:51:00 UTC (rev 11129)
@@ -19,4 +19,7 @@
# Boston, MA 02110-1301, USA.
#
-SUBDIRS = lib python
+SUBDIRS = lib
+if PYTHON
+SUBDIRS += python
+endif
Modified:
gnuradio/branches/developers/jcorgan/np/gr-radio-astronomy/src/lib/Makefile.am
===================================================================
---
gnuradio/branches/developers/jcorgan/np/gr-radio-astronomy/src/lib/Makefile.am
2009-05-26 18:06:03 UTC (rev 11128)
+++
gnuradio/branches/developers/jcorgan/np/gr-radio-astronomy/src/lib/Makefile.am
2009-05-26 18:51:00 UTC (rev 11129)
@@ -23,6 +23,7 @@
AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
+if PYTHON
TOP_SWIG_IFILES = \
ra.i
@@ -40,3 +41,4 @@
# Do not distribute the output of SWIG
no_dist_files = $(swig_built_sources)
+endif
Modified: gnuradio/branches/developers/jcorgan/np/gr-sounder/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gr-sounder/src/Makefile.am
2009-05-26 18:06:03 UTC (rev 11128)
+++ gnuradio/branches/developers/jcorgan/np/gr-sounder/src/Makefile.am
2009-05-26 18:51:00 UTC (rev 11129)
@@ -21,4 +21,7 @@
include $(top_srcdir)/Makefile.common
-SUBDIRS = fpga lib python
+SUBDIRS = fpga lib
+if PYTHON
+SUBDIRS += python
+endif
Modified: gnuradio/branches/developers/jcorgan/np/gr-trellis/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gr-trellis/src/Makefile.am
2009-05-26 18:06:03 UTC (rev 11128)
+++ gnuradio/branches/developers/jcorgan/np/gr-trellis/src/Makefile.am
2009-05-26 18:51:00 UTC (rev 11129)
@@ -19,4 +19,7 @@
# Boston, MA 02110-1301, USA.
#
-SUBDIRS = lib python examples
+SUBDIRS = lib
+if PYTHON
+SUBDIRS += python examples
+endif
Modified: gnuradio/branches/developers/jcorgan/np/gr-trellis/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gr-trellis/src/lib/Makefile.am
2009-05-26 18:06:03 UTC (rev 11128)
+++ gnuradio/branches/developers/jcorgan/np/gr-trellis/src/lib/Makefile.am
2009-05-26 18:51:00 UTC (rev 11129)
@@ -23,6 +23,7 @@
AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
+if PYTHON
# ----------------------------------------------------------------
# these scripts generate trellis codes from template files
@@ -131,3 +132,4 @@
# Do not distribute the output of SWIG
no_dist_files = $(swig_built_sources)
+endif
Modified: gnuradio/branches/developers/jcorgan/np/gr-usrp/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gr-usrp/src/Makefile.am
2009-05-26 18:06:03 UTC (rev 11128)
+++ gnuradio/branches/developers/jcorgan/np/gr-usrp/src/Makefile.am
2009-05-26 18:51:00 UTC (rev 11129)
@@ -26,8 +26,6 @@
EXTRA_DIST = run_tests.in
-TESTS = run_tests
-
DISTCLEANFILES = run_tests
noinst_PYTHON = qa_usrp.py
@@ -68,8 +66,10 @@
usrp_source_c.h \
usrp_source_s.h
+if PYTHON
# ----------------------------------------------------------------
# The SWIG library
+TESTS = run_tests
TOP_SWIG_IFILES = \
usrp_swig.i
@@ -111,3 +111,4 @@
# Do not distribute the output of SWIG
no_dist_files = $(swig_built_sources)
+endif
Modified: gnuradio/branches/developers/jcorgan/np/gr-usrp2/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gr-usrp2/src/Makefile.am
2009-05-26 18:06:03 UTC (rev 11128)
+++ gnuradio/branches/developers/jcorgan/np/gr-usrp2/src/Makefile.am
2009-05-26 18:51:00 UTC (rev 11129)
@@ -34,7 +34,6 @@
# ----------------------------------------------------------------------
EXTRA_DIST = run_tests.in
-TESTS = run_tests
DISTCLEANFILES = run_tests
# ----------------------------------------------------------------------
@@ -79,12 +78,14 @@
rx_16sc_handler.h \
rx_32fc_handler.h
+if PYTHON
# ----------------------------------------------------------------------
# Python SWIG wrapper around C++ library
#
# usrp2.py
# _usrp2.so
# ----------------------------------------------------------------------
+TESTS = run_tests
TOP_SWIG_IFILES = \
usrp2.i
@@ -111,3 +112,4 @@
# Do not distribute the output of SWIG
no_dist_files = $(swig_built_sources)
+endif
Modified: gnuradio/branches/developers/jcorgan/np/gr-utils/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gr-utils/src/Makefile.am
2009-05-26 18:06:03 UTC (rev 11128)
+++ gnuradio/branches/developers/jcorgan/np/gr-utils/src/Makefile.am
2009-05-26 18:51:00 UTC (rev 11129)
@@ -19,4 +19,7 @@
# Boston, MA 02110-1301, USA.
#
-SUBDIRS = lib python
+SUBDIRS = lib
+if PYTHON
+SUBDIRS += python
+endif
Modified: gnuradio/branches/developers/jcorgan/np/gr-video-sdl/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gr-video-sdl/src/Makefile.am
2009-05-26 18:06:03 UTC (rev 11128)
+++ gnuradio/branches/developers/jcorgan/np/gr-video-sdl/src/Makefile.am
2009-05-26 18:51:00 UTC (rev 11129)
@@ -23,22 +23,21 @@
EXTRA_DIST = run_tests.in
-TESTS = run_tests
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(SDL_CFLAGS) \
+ $(WITH_INCLUDES)
-DISTCLEANFILES = run_tests
-
+if PYTHON
noinst_PYTHON = \
qa_video_sdl.py
-AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(SDL_CFLAGS) \
- $(WITH_INCLUDES)
-
grinclude_HEADERS = \
video_sdl_sink_uc.h \
video_sdl_sink_s.h
#################################
# SWIG interface and library
+TESTS = run_tests
+DISTCLEANFILES = run_tests
TOP_SWIG_IFILES = \
video_sdl.i
@@ -67,3 +66,4 @@
# Do not distribute the output of SWIG
no_dist_files = $(swig_built_sources)
+endif
Modified: gnuradio/branches/developers/jcorgan/np/gr-wxgui/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/gr-wxgui/Makefile.am
2009-05-26 18:06:03 UTC (rev 11128)
+++ gnuradio/branches/developers/jcorgan/np/gr-wxgui/Makefile.am
2009-05-26 18:51:00 UTC (rev 11129)
@@ -26,6 +26,7 @@
README \
README.gl
+if PYTHON
SUBDIRS = src
etcdir = $(sysconfdir)/gnuradio/conf.d
@@ -33,3 +34,4 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = gr-wxgui.pc
+endif
Modified: gnuradio/branches/developers/jcorgan/np/grc/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/grc/Makefile.am 2009-05-26
18:06:03 UTC (rev 11128)
+++ gnuradio/branches/developers/jcorgan/np/grc/Makefile.am 2009-05-26
18:51:00 UTC (rev 11129)
@@ -21,6 +21,7 @@
include $(top_srcdir)/grc/Makefile.inc
+if PYTHON
SUBDIRS = \
data \
examples \
@@ -31,3 +32,4 @@
if XDG_UTILS
SUBDIRS += freedesktop
endif
+endif
Modified: gnuradio/branches/developers/jcorgan/np/usrp/host/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/usrp/host/Makefile.am
2009-05-26 18:06:03 UTC (rev 11128)
+++ gnuradio/branches/developers/jcorgan/np/usrp/host/Makefile.am
2009-05-26 18:51:00 UTC (rev 11129)
@@ -1,5 +1,5 @@
#
-# Copyright 2001,2007 Free Software Foundation, Inc.
+# Copyright 2001,2007,2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -19,5 +19,8 @@
# Boston, MA 02110-1301, USA.
#
-SUBDIRS = misc lib swig apps apps-inband
+SUBDIRS = misc lib apps apps-inband
+if PYTHON
+SUBDIRS += swig
+endif
Modified:
gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/Makefile.am
2009-05-26 18:06:03 UTC (rev 11128)
+++ gnuradio/branches/developers/jcorgan/np/usrp/host/lib/legacy/Makefile.am
2009-05-26 18:51:00 UTC (rev 11129)
@@ -47,10 +47,10 @@
usrp_dbid.dat
BUILT_SOURCES = \
- usrp_dbid.h \
- usrp_dbid.cc \
- usrp_dbid.py
+ usrp_dbid.h
+BUILT_SOURCES += usrp_dbid.cc \
+ usrp_dbid.py
# ----------------------------------------------------------------
# FUSB_TECH is set at configure time by way of
@@ -118,7 +118,6 @@
db_dtt768.cc \
db_util.cc
-# db_wbx.cc
if FUSB_TECH_generic
@@ -177,6 +176,7 @@
rate_to_regval.h \
usrp_local_sighandler.h
+if PYTHON
usrppython_PYTHON = \
usrp_dbid.py
@@ -186,6 +186,7 @@
dump_data.py
swiginclude_HEADERS = db_base.i
+endif
# common way for generating sources from templates when using
# BUILT_SOURCES, using parallel build protection.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r11129 - in gnuradio/branches/developers/jcorgan/np: . gnuradio-core/src gnuradio-core/src/lib gnuradio-core/src/lib/filter gnuradio-core/src/lib/general gnuradio-core/src/lib/gengen gnuradio-core/src/lib/hier gnuradio-core/src/lib/io gnuradio-core/src/lib/runtime gnuradio-core/src/lib/swig gnuradio-core/src/python/gnuradio gnuradio-examples gr-atsc/src gr-atsc/src/lib gr-audio-alsa/src gr-audio-jack/src gr-audio-oss/src gr-audio-osx/src gr-audio-portaudio/src gr-audio-windows/src gr-comedi/src gr-cvsd-vocoder/src gr-cvsd-vocoder/src/lib gr-gcell/src gr-gpio/src gr-gsm-fr-vocoder/src gr-gsm-fr-vocoder/src/lib gr-msdd6000/src gr-pager/src gr-qtgui/src gr-qtgui/src/lib gr-radar-mono/src gr-radio-astronomy/src gr-radio-astronomy/src/lib gr-sounder/src gr-trellis/src gr-trellis/src/lib gr-usrp/src gr-usrp2/src gr-utils/src gr-video-sdl/src gr-wxgui grc usrp/host usrp/host/lib/legacy,
jcorgan <=