diff options
| author | jcorgan | 2009-05-27 01:54:41 +0000 |
|---|---|---|
| committer | jcorgan | 2009-05-27 01:54:41 +0000 |
| commit | 40b8a57d69b4b85f207fb0408347c210e23202cc (patch) | |
| tree | 8d1e3bbc9159bdd0de98bb897432abd81563dbca | |
| parent | e3cd8f7d59aad0ffd51c417b2623ab02588fdb08 (diff) | |
| download | gnuradio-40b8a57d69b4b85f207fb0408347c210e23202cc.tar.gz gnuradio-40b8a57d69b4b85f207fb0408347c210e23202cc.tar.bz2 gnuradio-40b8a57d69b4b85f207fb0408347c210e23202cc.zip | |
Merged r11123:11148 from jcorgan/np into trunk.
Adds --enable-python option to configure (defaults to yes).
Using --disable-python or --enable-python=no will cause only
C++ API targets to be created and installed.
Several new shared libraries are now created. Where in the past,
the C++ objects of the actual gnuradio blocks that were in a component
were hidden inside their corresponding Python extension modules, these
are now split out into a libgnuradio-foo.so library, and the _foo.so
Python module is linked to that. This has been the way several top-
level components have operated for some time, such as gr-audio-alsa
and gr-usrp and gr-usrp2. This changeset applies that pattern to all
components.
C++ API users can use pkg-config to discover the cflags and libs
parameters needed to include and link against these libraries.
These components have not been tested:
gr-comedi
gr-audio-osx
gr-audio-windows
Passes distcheck.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11150 221aa14e-8319-0410-a670-987f0aec2ac5
89 files changed, 564 insertions, 229 deletions
diff --git a/Makefile.common b/Makefile.common index e9bc13e41..7bd35ce9a 100644 --- a/Makefile.common +++ b/Makefile.common @@ -26,6 +26,7 @@ AM_CXXFLAGS = @autoconf_default_CXXFLAGS@ @lf_CXXFLAGS@ # includes grincludedir = $(includedir)/gnuradio +if PYTHON # swig includes swigincludedir = $(grincludedir)/swig @@ -42,6 +43,7 @@ grpyexecdir = $(pyexecdir)/gnuradio usrppythondir = $(pythondir)/usrpm usrppyexecdir = $(pyexecdir)/usrpm +endif # gcell includes gcellincludedir = $(includedir)/gcell diff --git a/config/grc_gr_atsc.m4 b/config/grc_gr_atsc.m4 index 003d1b7c7..6dfb40132 100644 --- a/config/grc_gr_atsc.m4 +++ b/config/grc_gr_atsc.m4 @@ -25,6 +25,7 @@ AC_DEFUN([GRC_GR_ATSC],[ AC_CONFIG_FILES([\ gr-atsc/Makefile \ + gr-atsc/gnuradio-atsc.pc \ gr-atsc/doc/Makefile \ gr-atsc/src/Makefile \ gr-atsc/src/lib/Makefile \ diff --git a/config/grc_gr_audio_alsa.m4 b/config/grc_gr_audio_alsa.m4 index 9c653c1c2..d6955980d 100644 --- a/config/grc_gr_audio_alsa.m4 +++ b/config/grc_gr_audio_alsa.m4 @@ -35,7 +35,7 @@ AC_DEFUN([GRC_GR_AUDIO_ALSA],[ AC_CONFIG_FILES([ \ gr-audio-alsa/Makefile \ - gr-audio-alsa/gr-audio-alsa.pc \ + gr-audio-alsa/gnuradio-audio-alsa.pc \ gr-audio-alsa/src/Makefile \ gr-audio-alsa/src/run_tests \ ]) diff --git a/config/grc_gr_audio_jack.m4 b/config/grc_gr_audio_jack.m4 index cb7bf2990..d1853588b 100644 --- a/config/grc_gr_audio_jack.m4 +++ b/config/grc_gr_audio_jack.m4 @@ -35,6 +35,7 @@ AC_DEFUN([GRC_GR_AUDIO_JACK],[ AC_CONFIG_FILES([ \ gr-audio-jack/Makefile \ + gr-audio-jack/gnuradio-audio-jack.pc \ gr-audio-jack/src/Makefile \ gr-audio-jack/src/run_tests \ ]) diff --git a/config/grc_gr_audio_oss.m4 b/config/grc_gr_audio_oss.m4 index 6fd4577a8..13c83bba9 100644 --- a/config/grc_gr_audio_oss.m4 +++ b/config/grc_gr_audio_oss.m4 @@ -51,6 +51,7 @@ AC_DEFUN([GRC_GR_AUDIO_OSS],[ AC_CONFIG_FILES([ \ gr-audio-oss/Makefile \ + gr-audio-oss/gnuradio-audio-oss.pc \ gr-audio-oss/src/Makefile \ gr-audio-oss/src/run_tests \ ]) diff --git a/config/grc_gr_audio_portaudio.m4 b/config/grc_gr_audio_portaudio.m4 index b2f27f2c8..ff551b38a 100644 --- a/config/grc_gr_audio_portaudio.m4 +++ b/config/grc_gr_audio_portaudio.m4 @@ -35,6 +35,7 @@ AC_DEFUN([GRC_GR_AUDIO_PORTAUDIO],[ AC_CONFIG_FILES([ \ gr-audio-portaudio/Makefile \ + gr-audio-portaudio/gnuradio-audio-portaudio.pc \ gr-audio-portaudio/src/Makefile \ gr-audio-portaudio/src/run_tests \ ]) diff --git a/config/grc_gr_comedi.m4 b/config/grc_gr_comedi.m4 index 2bdfacbc0..5e3089417 100644 --- a/config/grc_gr_comedi.m4 +++ b/config/grc_gr_comedi.m4 @@ -35,6 +35,7 @@ AC_DEFUN([GRC_GR_COMEDI],[ AC_CONFIG_FILES([ \ gr-comedi/Makefile \ + gr-comedi/gnuradio-comedi.pc \ gr-comedi/src/Makefile \ gr-comedi/src/run_tests \ ]) diff --git a/config/grc_gr_cvsd_vocoder.m4 b/config/grc_gr_cvsd_vocoder.m4 index c73a3052b..ddf6f9b2f 100644 --- a/config/grc_gr_cvsd_vocoder.m4 +++ b/config/grc_gr_cvsd_vocoder.m4 @@ -25,6 +25,7 @@ AC_DEFUN([GRC_GR_CVSD_VOCODER],[ AC_CONFIG_FILES([\ gr-cvsd-vocoder/Makefile \ + gr-cvsd-vocoder/gnuradio-cvsd-vocoder.pc \ gr-cvsd-vocoder/src/Makefile \ gr-cvsd-vocoder/src/lib/Makefile \ gr-cvsd-vocoder/src/python/Makefile \ diff --git a/config/grc_gr_gsm_fr_vocoder.m4 b/config/grc_gr_gsm_fr_vocoder.m4 index 941cb2557..a93d4edb7 100644 --- a/config/grc_gr_gsm_fr_vocoder.m4 +++ b/config/grc_gr_gsm_fr_vocoder.m4 @@ -25,6 +25,7 @@ AC_DEFUN([GRC_GR_GSM_FR_VOCODER],[ AC_CONFIG_FILES([\ gr-gsm-fr-vocoder/Makefile \ + gr-gsm-fr-vocoder/gnuradio-gsm-fr-vocoder.pc \ gr-gsm-fr-vocoder/src/Makefile \ gr-gsm-fr-vocoder/src/lib/Makefile \ gr-gsm-fr-vocoder/src/lib/gsm/Makefile \ diff --git a/config/grc_gr_msdd6000.m4 b/config/grc_gr_msdd6000.m4 index 3f2e17a2a..6d40e8931 100644 --- a/config/grc_gr_msdd6000.m4 +++ b/config/grc_gr_msdd6000.m4 @@ -22,6 +22,7 @@ AC_DEFUN([GRC_GR_MSDD6000],[ AC_CONFIG_FILES([\ gr-msdd6000/Makefile \ + gr-msdd6000/gnuradio-msdd6000.pc \ gr-msdd6000/src/Makefile ]) diff --git a/config/grc_gr_pager.m4 b/config/grc_gr_pager.m4 index cb417ae25..23af7a9c4 100644 --- a/config/grc_gr_pager.m4 +++ b/config/grc_gr_pager.m4 @@ -25,6 +25,7 @@ AC_DEFUN([GRC_GR_PAGER],[ AC_CONFIG_FILES([\ gr-pager/Makefile \ + gr-pager/gnuradio-pager.pc \ gr-pager/src/Makefile \ gr-pager/src/run_tests ]) diff --git a/config/grc_gr_trellis.m4 b/config/grc_gr_trellis.m4 index f6ed4a488..cb51325d6 100644 --- a/config/grc_gr_trellis.m4 +++ b/config/grc_gr_trellis.m4 @@ -25,6 +25,7 @@ AC_DEFUN([GRC_GR_TRELLIS],[ AC_CONFIG_FILES([\ gr-trellis/Makefile \ + gr-trellis/gnuradio-trellis.pc \ gr-trellis/doc/Makefile \ gr-trellis/src/Makefile \ gr-trellis/src/lib/Makefile \ diff --git a/config/grc_gr_video_sdl.m4 b/config/grc_gr_video_sdl.m4 index 774f7250c..c890bc31c 100644 --- a/config/grc_gr_video_sdl.m4 +++ b/config/grc_gr_video_sdl.m4 @@ -1,4 +1,4 @@ -dnl Copyright 2001,2002,2003,2004,2005,2006,2008 Free Software Foundation, Inc. +dnl Copyright 2001,2002,2003,2004,2005,2006,2008,2009 Free Software Foundation, Inc. dnl dnl This file is part of GNU Radio dnl @@ -37,6 +37,7 @@ AC_DEFUN([GRC_GR_VIDEO_SDL],[ AC_CONFIG_FILES([ \ gr-video-sdl/Makefile \ + gr-video-sdl/gnuradio-video-sdl.pc \ gr-video-sdl/src/Makefile \ gr-video-sdl/src/run_tests \ ]) diff --git a/configure.ac b/configure.ac index 69de40b1a..5be42eb60 100644 --- a/configure.ac +++ b/configure.ac @@ -126,6 +126,20 @@ GR_FORTRAN 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_VIDEO_SDL 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 @@ if test "$with_dirs" != ""; then echo These components will not be built. echo fi + diff --git a/debian/gen-install-files.sh b/debian/gen-install-files.sh index 9eda40854..99735c15a 100755 --- a/debian/gen-install-files.sh +++ b/debian/gen-install-files.sh @@ -57,7 +57,7 @@ rm -f $NAME touch $NAME $EXTRACT gr-audio-alsa/src/Makefile grinclude_HEADERS >>$NAME echo usr/lib/libgnuradio-audio-alsa.so >>$NAME -echo usr/lib/pkgconfig/gr-audio-alsa.pc >>$NAME +echo usr/lib/pkgconfig/gnuradio-audio-alsa.pc >>$NAME # libgnuradio-qtgui NAME=debian/libgnuradio-qtgui.install diff --git a/gnuradio-core/gnuradio-core.pc.in b/gnuradio-core/gnuradio-core.pc.in index 2c507fa22..dc06fcf89 100644 --- a/gnuradio-core/gnuradio-core.pc.in +++ b/gnuradio-core/gnuradio-core.pc.in @@ -7,5 +7,6 @@ Name: gnuradio-core Description: GNU Software Radio toolkit Requires: gruel fftw3f gsl gnuradio-omnithread Version: @VERSION@ -Libs: -L${libdir} -lgnuradio-core @BOOST_LDFLAGS@ @BOOST_THREAD_LIB@ @BOOST_DATE_TIME_LIB@ -Cflags: @BOOST_CPPFLAGS@ @BOOST_CXXFLAGS@ -I${includedir} @DEFINES@ +Libs.private: @BOOST_LDFLAGS@ @BOOST_THREAD_LIB@ @BOOST_DATE_TIME_LIB@ +Libs: -L${libdir} -lgnuradio-core +Cflags: @BOOST_CPPFLAGS@ @BOOST_CXXFLAGS@ -I${includedir} diff --git a/gnuradio-core/src/Makefile.am b/gnuradio-core/src/Makefile.am index 7b325974a..eb979fe58 100644 --- a/gnuradio-core/src/Makefile.am +++ b/gnuradio-core/src/Makefile.am @@ -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 diff --git a/gnuradio-core/src/lib/Makefile.am b/gnuradio-core/src/lib/Makefile.am index fcb4d4ea5..ef2b17f5a 100644 --- a/gnuradio-core/src/lib/Makefile.am +++ b/gnuradio-core/src/lib/Makefile.am @@ -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 @@ include $(top_srcdir)/Makefile.common ## 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 diff --git a/gnuradio-core/src/lib/filter/Makefile.am b/gnuradio-core/src/lib/filter/Makefile.am index b7fd0f58a..f46956745 100644 --- a/gnuradio-core/src/lib/filter/Makefile.am +++ b/gnuradio-core/src/lib/filter/Makefile.am @@ -293,7 +293,7 @@ noinst_HEADERS = \ qa_gri_mmse_fir_interpolator_cc.h - +if PYTHON swiginclude_HEADERS = \ filter.i \ filter_generated.i \ @@ -310,6 +310,7 @@ swiginclude_HEADERS = \ 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 diff --git a/gnuradio-core/src/lib/general/Makefile.am b/gnuradio-core/src/lib/general/Makefile.am index 4ceb72486..5564ee3d4 100644 --- a/gnuradio-core/src/lib/general/Makefile.am +++ b/gnuradio-core/src/lib/general/Makefile.am @@ -353,6 +353,7 @@ noinst_HEADERS = \ sine_table.h \ qa_gr_math.h +if PYTHON swiginclude_HEADERS = \ general.i \ gr_agc_cc.i \ @@ -478,3 +479,4 @@ swiginclude_HEADERS = \ gr_scrambler_bb.i \ gr_probe_mpsk_snr_c.i \ gr_probe_density_b.i +endif diff --git a/gnuradio-core/src/lib/gengen/Makefile.am b/gnuradio-core/src/lib/gengen/Makefile.am index db7bee02f..4978ad1c5 100644 --- a/gnuradio-core/src/lib/gengen/Makefile.am +++ b/gnuradio-core/src/lib/gengen/Makefile.am @@ -135,11 +135,13 @@ grinclude_HEADERS = \ 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 diff --git a/gnuradio-core/src/lib/hier/Makefile.am b/gnuradio-core/src/lib/hier/Makefile.am index b525d19b4..e2e7fe886 100644 --- a/gnuradio-core/src/lib/hier/Makefile.am +++ b/gnuradio-core/src/lib/hier/Makefile.am @@ -32,6 +32,8 @@ libhier_la_SOURCES = \ grinclude_HEADERS = \ gr_channel_model.h +if PYTHON swiginclude_HEADERS = \ hier.i \ gr_channel_model.i +endif diff --git a/gnuradio-core/src/lib/io/Makefile.am b/gnuradio-core/src/lib/io/Makefile.am index 4583a033c..9eacd137d 100644 --- a/gnuradio-core/src/lib/io/Makefile.am +++ b/gnuradio-core/src/lib/io/Makefile.am @@ -93,9 +93,7 @@ grinclude_HEADERS = \ gr_wavfile_sink.h \ gri_wavfile.h - - - +if PYTHON swiginclude_HEADERS = \ io.i \ gr_file_sink.i \ @@ -116,4 +114,4 @@ swiginclude_HEADERS = \ gr_udp_source.i \ gr_wavfile_source.i \ gr_wavfile_sink.i - +endif diff --git a/gnuradio-core/src/lib/runtime/Makefile.am b/gnuradio-core/src/lib/runtime/Makefile.am index af5e4980d..14ab464ad 100644 --- a/gnuradio-core/src/lib/runtime/Makefile.am +++ b/gnuradio-core/src/lib/runtime/Makefile.am @@ -135,6 +135,7 @@ noinst_HEADERS = \ qa_gr_vmcircbuf.h \ qa_runtime.h +if PYTHON swiginclude_HEADERS = \ gr_basic_block.i \ gr_block.i \ @@ -154,3 +155,4 @@ swiginclude_HEADERS = \ gr_sync_interpolator.i \ gr_top_block.i \ runtime.i +endif diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am index 75b152dc0..242f27d9c 100644 --- a/gnuradio-core/src/lib/swig/Makefile.am +++ b/gnuradio-core/src/lib/swig/Makefile.am @@ -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 @@ BUILT_SOURCES = \ # Do not distribute the output of SWIG no_dist_files = $(swig_built_sources) +endif diff --git a/gnuradio-core/src/python/gnuradio/Makefile.am b/gnuradio-core/src/python/gnuradio/Makefile.am index 5cc0824b3..ed36bbae7 100644 --- a/gnuradio-core/src/python/gnuradio/Makefile.am +++ b/gnuradio-core/src/python/gnuradio/Makefile.am @@ -21,6 +21,7 @@ include $(top_srcdir)/Makefile.common +if PYTHON SUBDIRS = gr gru gruimpl blks2 blks2impl vocoder grpython_PYTHON = \ @@ -34,3 +35,4 @@ grpython_PYTHON = \ gr_unittest.py \ optfir.py \ window.py +endif diff --git a/gnuradio-examples/Makefile.am b/gnuradio-examples/Makefile.am index 41e9ee4d6..360ae8b41 100644 --- a/gnuradio-examples/Makefile.am +++ b/gnuradio-examples/Makefile.am @@ -21,4 +21,7 @@ include $(top_srcdir)/Makefile.common -SUBDIRS = python c++ +SUBDIRS = c++ +if PYTHON +SUBDIRS += python +endif diff --git a/gr-atsc/Makefile.am b/gr-atsc/Makefile.am index 99b4ff2da..ffb37f7ec 100644 --- a/gr-atsc/Makefile.am +++ b/gr-atsc/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2004 Free Software Foundation, Inc. +# Copyright 2004,2009 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -25,4 +25,4 @@ SUBDIRS = src DIST_SUBDIRS = src doc pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = +dist_pkgconfig_DATA = gnuradio-atsc.pc diff --git a/gr-atsc/gnuradio-atsc.pc.in b/gr-atsc/gnuradio-atsc.pc.in new file mode 100644 index 000000000..4c5ae0682 --- /dev/null +++ b/gr-atsc/gnuradio-atsc.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: gnuradio-atsc +Description: The GNU Radio blocks for ATSC decoding +Requires: gnuradio-core +Version: @VERSION@ +Libs: -L${libdir} -lgnuradio-atsc +Cflags: -I${includedir} diff --git a/gr-atsc/src/Makefile.am b/gr-atsc/src/Makefile.am index e3f0399eb..78e03f580 100644 --- a/gr-atsc/src/Makefile.am +++ b/gr-atsc/src/Makefile.am @@ -19,4 +19,8 @@ # Boston, MA 02110-1301, USA. # -SUBDIRS = lib python +SUBDIRS = lib +if PYTHON +SUBDIRS += python +endif + diff --git a/gr-atsc/src/lib/Makefile.am b/gr-atsc/src/lib/Makefile.am index 905eaa57e..b43546125 100644 --- a/gr-atsc/src/lib/Makefile.am +++ b/gr-atsc/src/lib/Makefile.am @@ -32,12 +32,10 @@ EXTRA_DIST = \ qa_atsci_viterbi_decoder_t1_input.dat \ qa_atsci_viterbi_decoder_t1_output.dat -TESTS = \ - test_atsci -# We build two libtool convenience libraries +TESTS = test_atsci -noinst_LTLIBRARIES = libatsc.la libatsc-qa.la +lib_LTLIBRARIES = libgnuradio-atsc.la # FIXME # atsci_exp2_lp.cc \ @@ -46,7 +44,7 @@ noinst_LTLIBRARIES = libatsc.la libatsc-qa.la # atsci_vsbtx_lp.cc \ # -libatsc_la_SOURCES = \ +libgnuradio_atsc_la_SOURCES = \ atsc_derandomizer.cc \ atsc_randomizer.cc \ atsc_rs_decoder.cc \ @@ -88,10 +86,15 @@ libatsc_la_SOURCES = \ create_atsci_fs_correlator.cc \ plinfo.cc -libatsc_la_LIBADD = \ +BUILT_SOURCES = \ + atsci_viterbi_mux.cc + +libgnuradio_atsc_la_LIBADD = \ $(GNURADIO_CORE_LA) -libatsc_qa_la_SOURCES = \ +noinst_LTLIBRARIES = libgnuradio-atsc-qa.la + +libgnuradio_atsc_qa_la_SOURCES = \ qa_atsci_basic_trellis_encoder.cc \ qa_atsci_data_interleaver.cc \ qa_atsci_equalizer_nop.cc \ @@ -107,9 +110,10 @@ libatsc_qa_la_SOURCES = \ qa_atsci.cc \ qa_interleaver_fifo.cc -libatsc_qa_la_LIBADD = \ +libgnuradio_atsc_qa_la_LIBADD = \ $(GNURADIO_CORE_LA) + # These headers get installed in ${prefix}/include/gnuradio grinclude_HEADERS = \ atsc_consts.h \ @@ -193,8 +197,8 @@ atsci_viterbi_mux.cc: atsci_viterbi_gen$(EXEEXT) test_atsci_SOURCES = test_atsci.cc test_atsci_LDADD = \ - libatsc-qa.la \ - libatsc.la \ + libgnuradio-atsc-qa.la \ + libgnuradio-atsc.la \ $(CPPUNIT_LIBS) # ------------------------------------------------------------------------ @@ -203,6 +207,7 @@ test_atsci_LDADD = \ CLEANFILES = atsci_viterbi_mux.cc atsci_viterbi_gen$(EXEEXT) +if PYTHON # ------------------------------------------------------------------------ # This is the swig-ish part of the Makefile. # It builds the atsc module which we'll load into python @@ -220,14 +225,13 @@ atsc_pythondir_category = \ # additional libraries for linking with the SWIG-generated library atsc_la_swig_libadd = \ - libatsc.la + libgnuradio-atsc.la include $(top_srcdir)/Makefile.swig # add some of the variables generated inside the Makefile.swig.gen -BUILT_SOURCES = \ - atsci_viterbi_mux.cc \ - $(swig_built_sources) +BUILT_SOURCES += $(swig_built_sources) # Do not distribute the output of SWIG no_dist_files = $(swig_built_sources) +endif diff --git a/gr-audio-alsa/Makefile.am b/gr-audio-alsa/Makefile.am index 0b472f9c9..e2f67725a 100644 --- a/gr-audio-alsa/Makefile.am +++ b/gr-audio-alsa/Makefile.am @@ -21,13 +21,10 @@ include $(top_srcdir)/Makefile.common -EXTRA_DIST = \ - gr-audio-alsa.pc.in - SUBDIRS = src pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = gr-audio-alsa.pc +dist_pkgconfig_DATA = gnuradio-audio-alsa.pc etcdir = $(sysconfdir)/gnuradio/conf.d dist_etc_DATA = gr-audio-alsa.conf diff --git a/gr-audio-alsa/gr-audio-alsa.pc.in b/gr-audio-alsa/gnuradio-audio-alsa.pc.in index 69b6e8c6b..797bfc024 100644 --- a/gr-audio-alsa/gr-audio-alsa.pc.in +++ b/gr-audio-alsa/gnuradio-audio-alsa.pc.in @@ -5,7 +5,7 @@ includedir=@includedir@ Name: gnuradio-audio-alsa Description: The GNU Radio block for the ALSA sound system -Requires: gnuradio-core +Requires: gnuradio-core alsa Version: @VERSION@ Libs: -L${libdir} -lgnuradio-audio-alsa Cflags: -I${includedir} diff --git a/gr-audio-alsa/src/Makefile.am b/gr-audio-alsa/src/Makefile.am index 8230ab569..ee7498af4 100644 --- a/gr-audio-alsa/src/Makefile.am +++ b/gr-audio-alsa/src/Makefile.am @@ -23,10 +23,6 @@ include $(top_srcdir)/Makefile.common 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_LIBADD = \ 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 @@ BUILT_SOURCES = $(swig_built_sources) # Do not distribute the output of SWIG no_dist_files = $(swig_built_sources) +endif
\ No newline at end of file diff --git a/gr-audio-jack/Makefile.am b/gr-audio-jack/Makefile.am index 4f3a452be..8eeb9bffe 100644 --- a/gr-audio-jack/Makefile.am +++ b/gr-audio-jack/Makefile.am @@ -23,5 +23,8 @@ include $(top_srcdir)/Makefile.common SUBDIRS = src +pkgconfigdir = $(libdir)/pkgconfig +dist_pkgconfig_DATA = gnuradio-audio-jack.pc + etcdir = $(sysconfdir)/gnuradio/conf.d dist_etc_DATA = gr-audio-jack.conf diff --git a/gr-audio-jack/gnuradio-audio-jack.pc.in b/gr-audio-jack/gnuradio-audio-jack.pc.in new file mode 100644 index 000000000..eaceaea2f --- /dev/null +++ b/gr-audio-jack/gnuradio-audio-jack.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: gnuradio-audio-jack +Description: GNU Radio blocks for the JACK sound system +Requires: gnuradio-core jack +Version: @VERSION@ +Libs: -L${libdir} -lgnuradio-audio-jack +Cflags: -I${includedir} diff --git a/gr-audio-jack/src/Makefile.am b/gr-audio-jack/src/Makefile.am index bd8694a26..b766ec201 100644 --- a/gr-audio-jack/src/Makefile.am +++ b/gr-audio-jack/src/Makefile.am @@ -23,10 +23,6 @@ include $(top_srcdir)/Makefile.common EXTRA_DIST = run_tests.in -TESTS = run_tests - -DISTCLEANFILES = run_tests - # C/C++ headers get installed in ${prefix}/include/gnuradio grinclude_HEADERS = \ audio_jack_sink.h \ @@ -35,13 +31,30 @@ grinclude_HEADERS = \ noinst_HEADERS = \ gri_jack.h +lib_LTLIBRARIES = libgnuradio-audio-jack.la + +libgnuradio_audio_jack_la_SOURCES = \ + audio_jack_sink.cc \ + audio_jack_source.cc \ + gri_jack.cc + +libgnuradio_audio_jack_la_LIBADD = \ + $(GNURADIO_CORE_LA) \ + $(JACK_LIBS) + +libgnuradio_audio_jack_la_LDFLAGS = \ + $(NO_UNDEFINED) + noinst_PYTHON = \ qa_jack.py AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) +if PYTHON ################################### # SWIG Python interface and library +TESTS = run_tests +DISTCLEANFILES = run_tests TOP_SWIG_IFILES = \ audio_jack.i @@ -53,16 +66,9 @@ TOP_SWIG_IFILES = \ audio_jack_pythondir_category = \ gnuradio -# additional sources for the SWIG-generated library -audio_jack_la_swig_sources = \ - audio_jack_sink.cc \ - audio_jack_source.cc \ - gri_jack.cc - # additional libraries for linking with the SWIG-generated library audio_jack_la_swig_libadd = \ - $(GNURADIO_CORE_LA) \ - $(JACK_LIBS) + libgnuradio-audio-jack.la include $(top_srcdir)/Makefile.swig @@ -71,3 +77,4 @@ BUILT_SOURCES = $(swig_built_sources) # Do not distribute the output of SWIG no_dist_files = $(swig_built_sources) +endif diff --git a/gr-audio-oss/Makefile.am b/gr-audio-oss/Makefile.am index 7b4fca6dc..697c9a604 100644 --- a/gr-audio-oss/Makefile.am +++ b/gr-audio-oss/Makefile.am @@ -23,5 +23,8 @@ include $(top_srcdir)/Makefile.common SUBDIRS = src +pkgconfigdir = $(libdir)/pkgconfig +dist_pkgconfig_DATA = gnuradio-audio-oss.pc + etcdir = $(sysconfdir)/gnuradio/conf.d dist_etc_DATA = gr-audio-oss.conf diff --git a/gr-audio-oss/gnuradio-audio-oss.pc.in b/gr-audio-oss/gnuradio-audio-oss.pc.in new file mode 100644 index 000000000..f598ba304 --- /dev/null +++ b/gr-audio-oss/gnuradio-audio-oss.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: gnuradio-audio-oss +Description: The GNU Radio block for the OSS sound system +Requires: gnuradio-core +Version: @VERSION@ +Libs: -L${libdir} -lgnuradio-audio-oss +Cflags: -I${includedir} diff --git a/gr-audio-oss/src/Makefile.am b/gr-audio-oss/src/Makefile.am index f83ba68ca..614280639 100644 --- 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,24 @@ 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) + +if PYTHON ################################### # SWIG Python interface and library +TESTS = run_tests +DISTCLEANFILES = run_tests TOP_SWIG_IFILES = \ audio_oss.i @@ -49,15 +61,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 +72,4 @@ BUILT_SOURCES = $(swig_built_sources) # Do not distribute the output of SWIG no_dist_files = $(swig_built_sources) +endif diff --git a/gr-audio-osx/src/Makefile.am b/gr-audio-osx/src/Makefile.am index a4e690963..a4129260a 100644 --- a/gr-audio-osx/src/Makefile.am +++ b/gr-audio-osx/src/Makefile.am @@ -23,10 +23,6 @@ include $(top_srcdir)/Makefile.common EXTRA_DIST = run_tests.in -TESTS = run_tests - -DISTCLEANFILES = run_tests - AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) # C/C++ headers get installed in ${prefix}/include/gnuradio @@ -43,8 +39,26 @@ noinst_PYTHON = \ qa_osx.py \ test_audio_loop.py +lib_LTLIBRARIES = libgnuradio-audio-osx.la + +libgnuradio_audio_osx_la_SOURCES = \ + audio_osx_sink.cc \ + audio_osx_source.cc + +libgnuradio_audio_osx_la_LIBADD = \ + $(GNURADIO_CORE_LA) + +libgnuradio_audio_osx_la_LDFLAGS = \ + -framework AudioUnit \ + -framework CoreAudio \ + -framework AudioToolbox \ + $(NO_UNDEFINED) + +if PYTHON ################################### # SWIG Python interface and library +TESTS = run_tests +DISTCLEANFILES = run_tests TOP_SWIG_IFILES = \ audio_osx.i @@ -56,20 +70,9 @@ TOP_SWIG_IFILES = \ audio_osx_pythondir_category = \ gnuradio -# additional sources for the SWIG-generated library -audio_osx_la_swig_sources = \ - audio_osx_sink.cc \ - audio_osx_source.cc - # additional libraries for linking with the SWIG-generated library audio_osx_la_swig_libadd = \ - $(GNURADIO_CORE_LA) - -# additional LD flags for linking the SWIG-generated library -audio_osx_la_swig_ldflags = \ - -framework AudioUnit \ - -framework CoreAudio \ - -framework AudioToolbox + libgnuradio_audio_osx.la include $(top_srcdir)/Makefile.swig @@ -78,3 +81,4 @@ BUILT_SOURCES = $(swig_built_sources) # Do not distribute the output of SWIG no_dist_files = $(swig_built_sources) +endif diff --git a/gr-audio-portaudio/Makefile.am b/gr-audio-portaudio/Makefile.am index bf10b39c3..30a90647e 100644 --- a/gr-audio-portaudio/Makefile.am +++ b/gr-audio-portaudio/Makefile.am @@ -23,5 +23,8 @@ include $(top_srcdir)/Makefile.common SUBDIRS = src +pkgconfigdir = $(libdir)/pkgconfig +dist_pkgconfig_DATA = gnuradio-audio-portaudio.pc + etcdir = $(sysconfdir)/gnuradio/conf.d dist_etc_DATA = gr-audio-portaudio.conf diff --git a/gr-audio-portaudio/gnuradio-audio-portaudio.pc.in b/gr-audio-portaudio/gnuradio-audio-portaudio.pc.in new file mode 100644 index 000000000..8f2c80869 --- /dev/null +++ b/gr-audio-portaudio/gnuradio-audio-portaudio.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: gnuradio-audio-portaudio +Description: The GNU Radio block for the PORTAUDIO sound system +Requires: gnuradio-core +Version: @VERSION@ +Libs: -L${libdir} -lgnuradio-audio-portaudio +Cflags: -I${includedir} diff --git a/gr-audio-portaudio/src/Makefile.am b/gr-audio-portaudio/src/Makefile.am index 4b44807d8..1df6bbcea 100644 --- a/gr-audio-portaudio/src/Makefile.am +++ b/gr-audio-portaudio/src/Makefile.am @@ -23,10 +23,6 @@ include $(top_srcdir)/Makefile.common EXTRA_DIST = run_tests.in -TESTS = run_tests - -DISTCLEANFILES = run_tests - AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) \ $(PORTAUDIO_CFLAGS) $(WITH_INCLUDES) @@ -41,8 +37,26 @@ noinst_HEADERS = \ noinst_PYTHON = \ qa_portaudio.py +lib_LTLIBRARIES = libgnuradio-audio-portaudio.la + +libgnuradio_audio_portaudio_la_SOURCES = \ + audio_portaudio_sink.cc \ + audio_portaudio_source.cc \ + gri_portaudio.cc + +libgnuradio_audio_portaudio_la_LIBADD = \ + $(GNURADIO_CORE_LA) \ + $(PORTAUDIO_LIBS) + +libgnuradio_audio_portaudio_la_LDFLAGS = \ + $(NO_UNDEFINED) + + +if PYTHON ################################### # SWIG Python interface and library +TESTS = run_tests +DISTCLEANFILES = run_tests TOP_SWIG_IFILES = \ audio_portaudio.i @@ -54,16 +68,9 @@ TOP_SWIG_IFILES = \ audio_portaudio_pythondir_category = \ gnuradio -# additional sources for the SWIG-generated library -audio_portaudio_la_swig_sources = \ - audio_portaudio_sink.cc \ - audio_portaudio_source.cc \ - gri_portaudio.cc - # additional libraries for linking with the SWIG-generated library audio_portaudio_la_swig_libadd = \ - $(GNURADIO_CORE_LA) \ - $(PORTAUDIO_LIBS) + libgnuradio-audio-portaudio.la include $(top_srcdir)/Makefile.swig @@ -72,3 +79,4 @@ BUILT_SOURCES = $(swig_built_sources) # Do not distribute the output of SWIG no_dist_files = $(swig_built_sources) +endif diff --git a/gr-audio-windows/src/Makefile.am b/gr-audio-windows/src/Makefile.am index 1a8ededa6..dc91e140c 100644 --- a/gr-audio-windows/src/Makefile.am +++ b/gr-audio-windows/src/Makefile.am @@ -23,21 +23,34 @@ include $(top_srcdir)/Makefile.common EXTRA_DIST = run_tests.in -TESTS = run_tests - -DISTCLEANFILES = run_tests +AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) noinst_PYTHON = qa_audio_windows.py -AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) - # C/C++ headers get installed in ${prefix}/include/gnuradio grinclude_HEADERS = \ audio_windows_sink.h \ audio_windows_source.h +lib_LTLIBRARIES = libgnuradio-audio-windows.la + +libgnuradio_audio_windows_la_SOURCES = \ + audio_windows_sink.cc \ + audio_windows_source.cc + +libgnuradio_audio_windows_la_LIBADD = \ + $(GNURADIO_CORE_LA) \ + $(WINAUDIO_LIBS) + +libgnuradio_audio_windows_la_LDFLAGS = \ + $(LIBGNURADIO_CORE_EXTRA_LDFLAGS) \ + $(NO_UNDEFINED) + +if PYTHON ################################### # SWIG Python interface and library +TESTS = run_tests +DISTCLEANFILES = run_tests TOP_SWIG_IFILES = \ audio_windows.i @@ -49,19 +62,9 @@ TOP_SWIG_IFILES = \ audio_windows_pythondir_category = \ gnuradio -# additional sources for the SWIG-generated library -audio_windows_la_swig_sources = \ - audio_windows_sink.cc \ - audio_windows_source.cc - # additional libraries for linking with the SWIG-generated library audio_windows_la_swig_libadd = \ - $(GNURADIO_CORE_LA) \ - $(WINAUDIO_LIBS) - -# additional LD flags for linking the SWIG-generated library -audio_windows_la_swig_ldflags = \ - $(LIBGNURADIO_CORE_EXTRA_LDFLAGS) + libgnuradio-audio-windows.la include $(top_srcdir)/Makefile.swig @@ -70,3 +73,4 @@ BUILT_SOURCES = $(swig_built_sources) # Do not distribute the output of SWIG no_dist_files = $(swig_built_sources) +endif diff --git a/gr-comedi/Makefile.am b/gr-comedi/Makefile.am index 23ca1fa85..4fc1e1eb5 100644 --- a/gr-comedi/Makefile.am +++ b/gr-comedi/Makefile.am @@ -22,3 +22,6 @@ include $(top_srcdir)/Makefile.common SUBDIRS = src + +pkgconfigdir = $(libdir)/pkgconfig +dist_pkgconfig_DATA = gnuradio-comedi.pc diff --git a/gr-comedi/gnuradio-comedi.pc.in b/gr-comedi/gnuradio-comedi.pc.in new file mode 100644 index 000000000..8c320b563 --- /dev/null +++ b/gr-comedi/gnuradio-comedi.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: gnuradio-comedi +Description: GNU Radio blocks for the comedi library +Requires: gnuradio-core +Version: @VERSION@ +Libs: -L${libdir} -lgnuradio-comedi +Cflags: -I${includedir} diff --git a/gr-comedi/src/Makefile.am b/gr-comedi/src/Makefile.am index bd26e6952..974b108ab 100644 --- a/gr-comedi/src/Makefile.am +++ b/gr-comedi/src/Makefile.am @@ -23,10 +23,6 @@ include $(top_srcdir)/Makefile.common EXTRA_DIST = run_tests.in -TESTS = run_tests - -DISTCLEANFILES = run_tests - AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) # C/C++ headers get installed in ${prefix}/include/gnuradio @@ -40,8 +36,25 @@ noinst_HEADERS = \ noinst_PYTHON = \ qa_comedi.py +lib_LTLIBRARIES = libgnuradio-comedi.la + +libgnuradio_comedi_la_SOURCES = \ + comedi_sink.cc \ + comedi_source.cc \ + gri_comedi.cc + +libgnuradio_comedi_la_LIBADD = \ + $(GNURADIO_CORE_LA) \ + $(COMEDI_LIBS) + +libgnuradio_comedi_la_LDFLAGS = \ + $(NO_UNDEFINED) + +if PYTHON ################################### # SWIG Python interface and library +TESTS = run_tests +DISTCLEANFILES = run_tests TOP_SWIG_IFILES = \ comedi.i @@ -53,16 +66,9 @@ TOP_SWIG_IFILES = \ comedi_pythondir_category = \ gnuradio -# additional sources for the SWIG-generated library -comedi_la_swig_sources = \ - comedi_sink_s.cc \ - comedi_source_s.cc \ - gri_comedi.cc - # additional libraries for linking with the SWIG-generated library comedi_la_swig_libadd = \ - $(GNURADIO_CORE_LA) \ - $(COMEDI_LIBS) + libgnuradio-comedi.la include $(top_srcdir)/Makefile.swig @@ -71,3 +77,4 @@ BUILT_SOURCES = $(swig_built_sources) # Do not distribute the output of SWIG no_dist_files = $(swig_built_sources) +endif diff --git a/gr-cvsd-vocoder/Makefile.am b/gr-cvsd-vocoder/Makefile.am index f2e929644..48807a34b 100644 --- a/gr-cvsd-vocoder/Makefile.am +++ b/gr-cvsd-vocoder/Makefile.am @@ -22,4 +22,6 @@ include $(top_srcdir)/Makefile.common SUBDIRS = src -DIST_SUBDIRS = src + +pkgconfigdir = $(libdir)/pkgconfig +dist_pkgconfig_DATA = gnuradio-cvsd-vocoder.pc diff --git a/gr-cvsd-vocoder/gnuradio-cvsd-vocoder.pc.in b/gr-cvsd-vocoder/gnuradio-cvsd-vocoder.pc.in new file mode 100644 index 000000000..056230864 --- /dev/null +++ b/gr-cvsd-vocoder/gnuradio-cvsd-vocoder.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: gnuradio-cvsd-vocoder +Description: GNU Radio blocks implementing a CVSD vocoder +Requires: gnuradio-core +Version: @VERSION@ +Libs: -L${libdir} -lgnuradio-cvsd-vocoder +Cflags: -I${includedir} diff --git a/gr-cvsd-vocoder/src/Makefile.am b/gr-cvsd-vocoder/src/Makefile.am index e3f0399eb..be38b7c1a 100644 --- a/gr-cvsd-vocoder/src/Makefile.am +++ b/gr-cvsd-vocoder/src/Makefile.am @@ -19,4 +19,7 @@ # Boston, MA 02110-1301, USA. # -SUBDIRS = lib python +SUBDIRS = lib +if PYTHON +SUBDIRS += python +endif diff --git a/gr-cvsd-vocoder/src/lib/Makefile.am b/gr-cvsd-vocoder/src/lib/Makefile.am index 78a7c6400..500d0e858 100644 --- a/gr-cvsd-vocoder/src/lib/Makefile.am +++ b/gr-cvsd-vocoder/src/lib/Makefile.am @@ -28,6 +28,19 @@ grinclude_HEADERS = \ cvsd_decode_bs.h \ cvsd_encode_sb.h +lib_LTLIBRARIES = libgnuradio-cvsd-vocoder.la + +libgnuradio_cvsd_vocoder_la_SOURCES = \ + cvsd_decode_bs.cc \ + cvsd_encode_sb.cc + +libgnuradio_cvsd_vocoder_la_LIBADD = \ + $(GNURADIO_CORE_LA) + +libgnuradio_cvsd_vocoder_la_LDFLAGS = \ + $(NO_UNDEFINED) + +if PYTHON ################################### # SWIG Python interface and library @@ -41,14 +54,9 @@ TOP_SWIG_IFILES = \ cvsd_vocoder_pythondir_category = \ gnuradio/vocoder -# additional sources for the SWIG-generated library -cvsd_vocoder_la_swig_sources = \ - cvsd_decode_bs.cc \ - cvsd_encode_sb.cc - # additional libraries for linking with the SWIG-generated library cvsd_vocoder_la_swig_libadd = \ - $(GNURADIO_CORE_LA) + libgnuradio-cvsd-vocoder.la include $(top_srcdir)/Makefile.swig @@ -57,3 +65,4 @@ BUILT_SOURCES = $(swig_built_sources) # Do not distribute the output of SWIG no_dist_files = $(swig_built_sources) +endif diff --git a/gr-gcell/src/Makefile.am b/gr-gcell/src/Makefile.am index 83dc30f45..f44095b47 100644 --- a/gr-gcell/src/Makefile.am +++ b/gr-gcell/src/Makefile.am @@ -22,10 +22,6 @@ include $(top_srcdir)/Makefile.common SUBDIRS = . examples -EXTRA_DIST = run_tests.in - -TESTS = run_tests - AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(GCELL_INCLUDES) \ $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) @@ -43,24 +39,27 @@ DISTCLEANFILES = \ # ---------------------------------------------------------------- # the library for the C++ blocks -lib_LTLIBRARIES = libgr_gcell.la +lib_LTLIBRARIES = libgnuradio_gcell.la -libgr_gcell_la_SOURCES = \ +libgnuradio_gcell_la_SOURCES = \ gcell_fft_vcc.cc # C/C++ headers get installed in ${prefix}/include/gnuradio grinclude_HEADERS = \ gcell_fft_vcc.h -libgr_gcell_la_LIBADD = \ +libgnuradio_gcell_la_LIBADD = \ $(GNURADIO_CORE_LA) \ $(GCELL_LA) -libgr_gcell_la_LDFLAGS = $(NO_UNDEFINED) +libgnuradio_gcell_la_LDFLAGS = $(NO_UNDEFINED) +if PYTHON # ---------------------------------------------------------------- # SWIG stuff # ---------------------------------------------------------------- +EXTRA_DIST = run_tests.in +TESTS = run_tests TOP_SWIG_IFILES = \ gcell.i @@ -78,7 +77,7 @@ gcell_swig_args = \ # additional libraries for linking with the SWIG-generated library gcell_la_swig_libadd = \ - libgr_gcell.la + libgnuradio_gcell.la # additional SWIG files to be installed gcell_swiginclude_headers = \ @@ -92,3 +91,4 @@ BUILT_SOURCES = $(swig_built_sources) # Do not distribute the output of SWIG no_dist_files = $(swig_built_sources) +endif diff --git a/gr-gpio/src/Makefile.am b/gr-gpio/src/Makefile.am index 8c9a64b8b..5071c2273 100644 --- a/gr-gpio/src/Makefile.am +++ b/gr-gpio/src/Makefile.am @@ -19,4 +19,8 @@ # Boston, MA 02110-1301, USA. # -SUBDIRS = python fpga +SUBDIRS = fpga +if PYTHON +SUBDIRS += python +endif + diff --git a/gr-gsm-fr-vocoder/Makefile.am b/gr-gsm-fr-vocoder/Makefile.am index f2e929644..968ce327c 100644 --- a/gr-gsm-fr-vocoder/Makefile.am +++ b/gr-gsm-fr-vocoder/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2004 Free Software Foundation, Inc. +# Copyright 2004,2009 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -22,4 +22,6 @@ include $(top_srcdir)/Makefile.common SUBDIRS = src -DIST_SUBDIRS = src + +pkgconfigdir = $(libdir)/pkgconfig +dist_pkgconfig_DATA = gnuradio-gsm-fr-vocoder.pc diff --git a/gr-gsm-fr-vocoder/gnuradio-gsm-fr-vocoder.pc.in b/gr-gsm-fr-vocoder/gnuradio-gsm-fr-vocoder.pc.in new file mode 100644 index 000000000..43d5c6bad --- /dev/null +++ b/gr-gsm-fr-vocoder/gnuradio-gsm-fr-vocoder.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: gnuradio-comedi +Description: GNU Radio blocks implementing a GSM full rate vocoder +Requires: gnuradio-core +Version: @VERSION@ +Libs: -L${libdir} -lgnuradio-gsm-fr-vocoder +Cflags: -I${includedir} diff --git a/gr-gsm-fr-vocoder/src/Makefile.am b/gr-gsm-fr-vocoder/src/Makefile.am index e3f0399eb..be38b7c1a 100644 --- a/gr-gsm-fr-vocoder/src/Makefile.am +++ b/gr-gsm-fr-vocoder/src/Makefile.am @@ -19,4 +19,7 @@ # Boston, MA 02110-1301, USA. # -SUBDIRS = lib python +SUBDIRS = lib +if PYTHON +SUBDIRS += python +endif diff --git a/gr-gsm-fr-vocoder/src/lib/Makefile.am b/gr-gsm-fr-vocoder/src/lib/Makefile.am index 0cf0fb078..3b0270c2f 100644 --- a/gr-gsm-fr-vocoder/src/lib/Makefile.am +++ b/gr-gsm-fr-vocoder/src/lib/Makefile.am @@ -30,8 +30,21 @@ grinclude_HEADERS = \ gsm_fr_decode_ps.h \ gsm_fr_encode_sp.h -# SWIG interface and library +lib_LTLIBRARIES = libgnuradio-gsm-fr-vocoder.la + +libgnuradio_gsm_fr_vocoder_la_SOURCES = \ + gsm_fr_decode_ps.cc \ + gsm_fr_encode_sp.cc + +libgnuradio_gsm_fr_vocoder_la_LIBADD = \ + $(GNURADIO_CORE_LA) \ + gsm/libgsm.la +libgnuradio_gsm_fr_vocoder_la_LDFLAGS = \ + $(NO_UNDEFINED) + +if PYTHON +# SWIG interface and library TOP_SWIG_IFILES = \ gsm_full_rate.i @@ -42,15 +55,9 @@ TOP_SWIG_IFILES = \ gsm_full_rate_pythondir_category = \ gnuradio/vocoder -# additional sources for the SWIG-generated library -gsm_full_rate_la_swig_sources = \ - gsm_fr_decode_ps.cc \ - gsm_fr_encode_sp.cc - # additional libraries for linking with the SWIG-generated library gsm_full_rate_la_swig_libadd = \ - $(GNURADIO_CORE_LA) \ - gsm/libgsm.la + libgnuradio-gsm-fr-vocoder.la include $(top_srcdir)/Makefile.swig @@ -59,3 +66,4 @@ BUILT_SOURCES = $(swig_built_sources) # Do not distribute the output of SWIG no_dist_files = $(swig_built_sources) +endif diff --git a/gr-msdd6000/Makefile.am b/gr-msdd6000/Makefile.am index 73f418edc..89405d08c 100644 --- a/gr-msdd6000/Makefile.am +++ b/gr-msdd6000/Makefile.am @@ -23,3 +23,5 @@ include $(top_srcdir)/Makefile.common SUBDIRS = src +pkgconfigdir = $(libdir)/pkgconfig +dist_pkgconfig_DATA = gnuradio-msdd6000.pc diff --git a/gr-msdd6000/gnuradio-msdd6000.pc.in b/gr-msdd6000/gnuradio-msdd6000.pc.in new file mode 100644 index 000000000..8c320b563 --- /dev/null +++ b/gr-msdd6000/gnuradio-msdd6000.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: gnuradio-comedi +Description: GNU Radio blocks for the comedi library +Requires: gnuradio-core +Version: @VERSION@ +Libs: -L${libdir} -lgnuradio-comedi +Cflags: -I${includedir} diff --git a/gr-msdd6000/src/Makefile.am b/gr-msdd6000/src/Makefile.am index b2bf22ab9..0865d40de 100644 --- a/gr-msdd6000/src/Makefile.am +++ b/gr-msdd6000/src/Makefile.am @@ -30,6 +30,19 @@ grinclude_HEADERS = \ msdd_buffer_copy_behaviors.h \ msdd6000.h +lib_LTLIBRARIES = libgnuradio-msdd6000.la + +libgnuradio_msdd6000_la_SOURCES = \ + msdd_source_simple.cc \ + msdd6000.cc + +libgnuradio_msdd6000_la_LIBADD = \ + $(GNURADIO_CORE_LA) + +libgnuradio_msdd6000_la_LDFLAGS = \ + $(NO_UNDEFINED) + +if PYTHON ################################# # SWIG interface and library @@ -43,14 +56,9 @@ TOP_SWIG_IFILES = \ msdd_pythondir_category = \ gnuradio -# additional sources for the SWIG-generated library -msdd_la_swig_sources = \ - msdd_source_simple.cc \ - msdd6000.cc - # additional libraries for linking with the SWIG-generated library msdd_la_swig_libadd = \ - $(GNURADIO_CORE_LA) + libgnuradio-msdd6000.la include $(top_srcdir)/Makefile.swig @@ -59,3 +67,4 @@ BUILT_SOURCES = $(swig_built_sources) # Do not distribute the output of SWIG no_dist_files = $(swig_built_sources) +endif diff --git a/gr-pager/Makefile.am b/gr-pager/Makefile.am index 7297661a1..d73e4050f 100644 --- a/gr-pager/Makefile.am +++ b/gr-pager/Makefile.am @@ -22,3 +22,6 @@ include $(top_srcdir)/Makefile.common SUBDIRS = src + +pkgconfigdir = $(libdir)/pkgconfig +dist_pkgconfig_DATA = gnuradio-pager.pc diff --git a/gr-pager/gnuradio-pager.pc.in b/gr-pager/gnuradio-pager.pc.in new file mode 100644 index 000000000..35516b6ed --- /dev/null +++ b/gr-pager/gnuradio-pager.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: gnuradio-comedi +Description: GNU Radio blocks implementing a FLEX pager decoder +Requires: gnuradio-core +Version: @VERSION@ +Libs: -L${libdir} -lgnuradio-pager +Cflags: -I${includedir} diff --git a/gr-pager/src/Makefile.am b/gr-pager/src/Makefile.am index b12f7b8ff..d084d05f8 100644 --- a/gr-pager/src/Makefile.am +++ b/gr-pager/src/Makefile.am @@ -23,17 +23,8 @@ include $(top_srcdir)/Makefile.common EXTRA_DIST = run_tests.in -TESTS = run_tests - -DISTCLEANFILES = run_tests - AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) -dist_bin_SCRIPTS = \ - usrp_flex.py \ - usrp_flex_all.py \ - usrp_flex_band.py - noinst_PYTHON = \ qa_pager.py @@ -48,8 +39,35 @@ grinclude_HEADERS = \ pageri_flex_modes.h \ pageri_util.h +lib_LTLIBRARIES = libgnuradio-pager.la + +libgnuradio_pager_la_SOURCES = \ + pager_flex_frame.cc \ + pager_slicer_fb.cc \ + pager_flex_sync.cc \ + pager_flex_deinterleave.cc \ + pager_flex_parse.cc \ + pageri_bch3221.cc \ + pageri_flex_modes.cc \ + pageri_util.cc + +libgnuradio_pager_la_LIBADD = \ + $(GNURADIO_CORE_LA) + +libgnuradio_pager_la_LDFLAGS = \ + $(NO_UNDEFINED) + +if PYTHON + +dist_bin_SCRIPTS = \ + usrp_flex.py \ + usrp_flex_all.py \ + usrp_flex_band.py + ############################## # SWIG interface and library +TESTS = run_tests +DISTCLEANFILES = run_tests TOP_SWIG_IFILES = \ pager_swig.i @@ -61,20 +79,9 @@ TOP_SWIG_IFILES = \ pager_swig_pythondir_category = \ gnuradio/pager -# additional sources for the SWIG-generated library -pager_swig_la_swig_sources = \ - pager_flex_frame.cc \ - pager_slicer_fb.cc \ - pager_flex_sync.cc \ - pager_flex_deinterleave.cc \ - pager_flex_parse.cc \ - pageri_bch3221.cc \ - pageri_flex_modes.cc \ - pageri_util.cc - # additional libraries for linking with the SWIG-generated library pager_swig_la_swig_libadd = \ - $(GNURADIO_CORE_LA) + libgnuradio-pager.la # additional Python files to be installed along with the SWIG-generated one pager_swig_python = \ @@ -93,3 +100,4 @@ BUILT_SOURCES = $(swig_built_sources) # Do not distribute the output of SWIG no_dist_files = $(swig_built_sources) +endif diff --git a/gr-qtgui/src/Makefile.am b/gr-qtgui/src/Makefile.am index 7230d6096..52b06fbc4 100644 --- a/gr-qtgui/src/Makefile.am +++ b/gr-qtgui/src/Makefile.am @@ -19,4 +19,7 @@ # Boston, MA 02110-1301, USA. # -SUBDIRS = lib python +SUBDIRS = lib +if PYTHON +SUBDIRS += python +endif diff --git a/gr-qtgui/src/lib/Makefile.am b/gr-qtgui/src/lib/Makefile.am index 6543a71ce..290af1dd3 100644 --- a/gr-qtgui/src/lib/Makefile.am +++ b/gr-qtgui/src/lib/Makefile.am @@ -39,6 +39,8 @@ endif 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 @@ libgnuradio_qtgui_la_LIBADD = \ -lstdc++ \ $(QT_LIBS) +if PYTHON ############################## # SWIG interface and library @@ -117,9 +120,9 @@ qtgui_la_swig_libadd = \ 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 diff --git a/gr-radar-mono/src/Makefile.am b/gr-radar-mono/src/Makefile.am index c6fb49efa..d546da7f8 100644 --- a/gr-radar-mono/src/Makefile.am +++ b/gr-radar-mono/src/Makefile.am @@ -21,4 +21,7 @@ include $(top_srcdir)/Makefile.common -SUBDIRS = fpga lib python +SUBDIRS = fpga lib +if PYTHON +SUBDIRS += python +endif diff --git a/gr-radio-astronomy/src/Makefile.am b/gr-radio-astronomy/src/Makefile.am index e3f0399eb..be38b7c1a 100644 --- a/gr-radio-astronomy/src/Makefile.am +++ b/gr-radio-astronomy/src/Makefile.am @@ -19,4 +19,7 @@ # Boston, MA 02110-1301, USA. # -SUBDIRS = lib python +SUBDIRS = lib +if PYTHON +SUBDIRS += python +endif diff --git a/gr-radio-astronomy/src/lib/Makefile.am b/gr-radio-astronomy/src/lib/Makefile.am index 33a8a859a..d2dafdeac 100644 --- a/gr-radio-astronomy/src/lib/Makefile.am +++ b/gr-radio-astronomy/src/lib/Makefile.am @@ -23,6 +23,7 @@ include $(top_srcdir)/Makefile.common AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES) +if PYTHON TOP_SWIG_IFILES = \ ra.i @@ -40,3 +41,4 @@ BUILT_SOURCES = $(swig_built_sources) # Do not distribute the output of SWIG no_dist_files = $(swig_built_sources) +endif diff --git a/gr-sounder/src/Makefile.am b/gr-sounder/src/Makefile.am index c6fb49efa..d546da7f8 100644 --- a/gr-sounder/src/Makefile.am +++ b/gr-sounder/src/Makefile.am @@ -21,4 +21,7 @@ include $(top_srcdir)/Makefile.common -SUBDIRS = fpga lib python +SUBDIRS = fpga lib +if PYTHON +SUBDIRS += python +endif diff --git a/gr-trellis/Makefile.am b/gr-trellis/Makefile.am index ecf56ee21..d68fb59c9 100644 --- a/gr-trellis/Makefile.am +++ b/gr-trellis/Makefile.am @@ -23,3 +23,5 @@ include $(top_srcdir)/Makefile.common SUBDIRS = src doc +pkgconfigdir = $(libdir)/pkgconfig +dist_pkgconfig_DATA = gnuradio-trellis.pc diff --git a/gr-trellis/gnuradio-trellis.pc.in b/gr-trellis/gnuradio-trellis.pc.in new file mode 100644 index 000000000..8c320b563 --- /dev/null +++ b/gr-trellis/gnuradio-trellis.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: gnuradio-comedi +Description: GNU Radio blocks for the comedi library +Requires: gnuradio-core +Version: @VERSION@ +Libs: -L${libdir} -lgnuradio-comedi +Cflags: -I${includedir} diff --git a/gr-trellis/src/Makefile.am b/gr-trellis/src/Makefile.am index 41f525b0b..79e9d626a 100644 --- a/gr-trellis/src/Makefile.am +++ b/gr-trellis/src/Makefile.am @@ -19,4 +19,7 @@ # Boston, MA 02110-1301, USA. # -SUBDIRS = lib python examples +SUBDIRS = lib +if PYTHON +SUBDIRS += python examples +endif diff --git a/gr-trellis/src/lib/Makefile.am b/gr-trellis/src/lib/Makefile.am index 2e7591e4b..58115de25 100644 --- a/gr-trellis/src/lib/Makefile.am +++ b/gr-trellis/src/lib/Makefile.am @@ -66,6 +66,29 @@ grinclude_HEADERS = \ trellis_siso_combined_f.h \ $(GENERATED_H) +lib_LTLIBRARIES = libgnuradio-trellis.la + +libgnuradio_trellis_la_SOURCES = \ + fsm.cc \ + quicksort_index.cc \ + base.cc \ + interleaver.cc \ + trellis_calc_metric.cc \ + trellis_permutation.cc \ + trellis_siso_f.cc \ + trellis_siso_combined_f.cc \ + $(GENERATED_CC) + +libgnuradio_trellis_la_LIBADD = \ + $(GNURADIO_CORE_LA) + +libgnuradio_trellis_la_LDFLAGS = \ + $(NO_UNDEFINED) + + + + +if PYTHON ################################# # SWIG interface and library @@ -79,21 +102,9 @@ TOP_SWIG_IFILES = \ trellis_pythondir_category = \ gnuradio -# additional sources for the SWIG-generated library -trellis_la_swig_sources = \ - fsm.cc \ - quicksort_index.cc \ - base.cc \ - interleaver.cc \ - trellis_calc_metric.cc \ - trellis_permutation.cc \ - trellis_siso_f.cc \ - trellis_siso_combined_f.cc \ - $(GENERATED_CC) - # additional libraries for linking with the SWIG-generated library trellis_la_swig_libadd = \ - $(GNURADIO_CORE_LA) + libgnuradio-trellis.la # additional SWIG files to be installed trellis_swiginclude_headers = \ @@ -131,3 +142,4 @@ BUILT_SOURCES = \ # Do not distribute the output of SWIG no_dist_files = $(swig_built_sources) +endif diff --git a/gr-usrp/src/Makefile.am b/gr-usrp/src/Makefile.am index 9b8737d71..0835e2b9b 100644 --- a/gr-usrp/src/Makefile.am +++ b/gr-usrp/src/Makefile.am @@ -26,8 +26,6 @@ include $(top_srcdir)/Makefile.common EXTRA_DIST = run_tests.in -TESTS = run_tests - DISTCLEANFILES = run_tests noinst_PYTHON = qa_usrp.py @@ -68,8 +66,10 @@ grinclude_HEADERS = \ 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 @@ BUILT_SOURCES = $(swig_built_sources) # Do not distribute the output of SWIG no_dist_files = $(swig_built_sources) +endif diff --git a/gr-usrp2/src/Makefile.am b/gr-usrp2/src/Makefile.am index 77da2bd49..8425c497c 100644 --- a/gr-usrp2/src/Makefile.am +++ b/gr-usrp2/src/Makefile.am @@ -34,7 +34,6 @@ noinst_PYTHON = qa_usrp2.py # ---------------------------------------------------------------------- EXTRA_DIST = run_tests.in -TESTS = run_tests DISTCLEANFILES = run_tests # ---------------------------------------------------------------------- @@ -79,12 +78,14 @@ noinst_HEADERS = \ 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 @@ BUILT_SOURCES = $(swig_built_sources) # Do not distribute the output of SWIG no_dist_files = $(swig_built_sources) +endif diff --git a/gr-utils/src/Makefile.am b/gr-utils/src/Makefile.am index 7a9412113..b2847dce9 100644 --- a/gr-utils/src/Makefile.am +++ b/gr-utils/src/Makefile.am @@ -19,4 +19,7 @@ # Boston, MA 02110-1301, USA. # -SUBDIRS = lib python +SUBDIRS = lib +if PYTHON +SUBDIRS += python +endif diff --git a/gr-video-sdl/Makefile.am b/gr-video-sdl/Makefile.am index 2b6e6c8f3..75efb3b60 100644 --- a/gr-video-sdl/Makefile.am +++ b/gr-video-sdl/Makefile.am @@ -22,3 +22,6 @@ include $(top_srcdir)/Makefile.common SUBDIRS = src + +pkgconfigdir = $(libdir)/pkgconfig +dist_pkgconfig_DATA = gnuradio-video-sdl.pc diff --git a/gr-video-sdl/gnuradio-video-sdl.pc.in b/gr-video-sdl/gnuradio-video-sdl.pc.in new file mode 100644 index 000000000..9a8fe7d5e --- /dev/null +++ b/gr-video-sdl/gnuradio-video-sdl.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: gnuradio-comedi +Description: GNU Radio blocks for the SDL library +Requires: gnuradio-core sdl +Version: @VERSION@ +Libs: -L${libdir} -lgnuradio-video-sdl +Cflags: -I${includedir} diff --git a/gr-video-sdl/src/Makefile.am b/gr-video-sdl/src/Makefile.am index 04139afde..e623eb2a9 100644 --- a/gr-video-sdl/src/Makefile.am +++ b/gr-video-sdl/src/Makefile.am @@ -23,22 +23,34 @@ include $(top_srcdir)/Makefile.common EXTRA_DIST = run_tests.in -TESTS = run_tests - -DISTCLEANFILES = run_tests +AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(SDL_CFLAGS) \ + $(WITH_INCLUDES) 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 +lib_LTLIBRARIES = libgnuradio-video-sdl.la + +libgnuradio_video_sdl_la_SOURCES = \ + video_sdl_sink_uc.cc \ + video_sdl_sink_s.cc + +libgnuradio_video_sdl_la_LIBADD = \ + $(SDL_LIBS) \ + $(GNURADIO_CORE_LA) + +libgnuradio_video_sdl_la_LDFLAGS = \ + $(NO_UNDEFINED) + +if PYTHON ################################# # SWIG interface and library +TESTS = run_tests +DISTCLEANFILES = run_tests TOP_SWIG_IFILES = \ video_sdl.i @@ -50,15 +62,9 @@ TOP_SWIG_IFILES = \ video_sdl_pythondir_category = \ gnuradio -# additional sources for the SWIG-generated library -video_sdl_la_swig_sources = \ - video_sdl_sink_uc.cc \ - video_sdl_sink_s.cc - # additional libraries for linking with the SWIG-generated library video_sdl_la_swig_libadd = \ - $(SDL_LIBS) \ - $(GNURADIO_CORE_LA) + libgnuradio-video-sdl.la include $(top_srcdir)/Makefile.swig @@ -67,3 +73,4 @@ BUILT_SOURCES = $(swig_built_sources) # Do not distribute the output of SWIG no_dist_files = $(swig_built_sources) +endif diff --git a/gr-wxgui/Makefile.am b/gr-wxgui/Makefile.am index d637acb32..3e31fc435 100644 --- a/gr-wxgui/Makefile.am +++ b/gr-wxgui/Makefile.am @@ -26,6 +26,7 @@ EXTRA_DIST = \ README \ README.gl +if PYTHON SUBDIRS = src etcdir = $(sysconfdir)/gnuradio/conf.d @@ -33,3 +34,4 @@ dist_etc_DATA = gr-wxgui.conf pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = gr-wxgui.pc +endif diff --git a/grc/Makefile.am b/grc/Makefile.am index 7f62f39b6..0583e88bf 100644 --- a/grc/Makefile.am +++ b/grc/Makefile.am @@ -21,6 +21,7 @@ include $(top_srcdir)/grc/Makefile.inc +if PYTHON SUBDIRS = \ data \ examples \ @@ -31,3 +32,4 @@ SUBDIRS = \ if XDG_UTILS SUBDIRS += freedesktop endif +endif diff --git a/mblock/mblock.pc.in b/mblock/mblock.pc.in index ec72b104e..3d849995b 100644 --- a/mblock/mblock.pc.in +++ b/mblock/mblock.pc.in @@ -8,4 +8,4 @@ Description: The GNU Radio message block library Requires: pmt gnuradio-omnithread Version: @VERSION@ Libs: -L${libdir} -lmblock -Cflags: -I${includedir} @DEFINES@ +Cflags: -I${includedir}
\ No newline at end of file diff --git a/omnithread/gnuradio-omnithread.pc.in b/omnithread/gnuradio-omnithread.pc.in index 0a94562e9..fb3be4a96 100644 --- a/omnithread/gnuradio-omnithread.pc.in +++ b/omnithread/gnuradio-omnithread.pc.in @@ -8,4 +8,4 @@ Description: The GNU Radio omniORB threading library Requires: Version: @VERSION@ Libs: -L${libdir} -lgromnithread -Cflags: -I${includedir} @DEFINES@ @PTHREAD_CFLAGS@ +Cflags: -I${includedir} diff --git a/pmt/pmt.pc.in b/pmt/pmt.pc.in index 5a48ea209..d6628cad6 100644 --- a/pmt/pmt.pc.in +++ b/pmt/pmt.pc.in @@ -8,4 +8,4 @@ Description: The GNU Radio Polymorphic Type library Requires: gnuradio-omnithread Version: @VERSION@ Libs: -L${libdir} -lpmt -Cflags: -I${includedir} @DEFINES@ +Cflags: -I${includedir}
\ No newline at end of file diff --git a/usrp/host/Makefile.am b/usrp/host/Makefile.am index 1716f513d..514b835a9 100644 --- a/usrp/host/Makefile.am +++ b/usrp/host/Makefile.am @@ -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 diff --git a/usrp/host/lib/legacy/Makefile.am b/usrp/host/lib/legacy/Makefile.am index e2fabc229..e1b1b850a 100644 --- a/usrp/host/lib/legacy/Makefile.am +++ b/usrp/host/lib/legacy/Makefile.am @@ -47,10 +47,10 @@ EXTRA_DIST = \ 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 @@ libusrp_la_common_SOURCES = \ db_dtt768.cc \ db_util.cc -# db_wbx.cc if FUSB_TECH_generic @@ -177,6 +176,7 @@ noinst_HEADERS = \ rate_to_regval.h \ usrp_local_sighandler.h +if PYTHON usrppython_PYTHON = \ usrp_dbid.py @@ -186,6 +186,7 @@ noinst_PYTHON = \ dump_data.py swiginclude_HEADERS = db_base.i +endif # common way for generating sources from templates when using # BUILT_SOURCES, using parallel build protection. diff --git a/usrp/usrp-inband.pc.in b/usrp/usrp-inband.pc.in index 74665bdbb..57e274624 100644 --- a/usrp/usrp-inband.pc.in +++ b/usrp/usrp-inband.pc.in @@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -Name: usrp +Name: usrp-inband Description: USRP C++ Interface with in-band signaling -Requires: mblock pmt gnuradio-omnithread libusb +Requires: usrp pmt mblock Version: @VERSION@ -Libs: -L${libdir} -lusrp-inband -lusrp -Cflags: -I${includedir} @DEFINES@ +Libs: -L${libdir} -lusrp-inband +Cflags: -I${includedir} diff --git a/usrp/usrp.pc.in b/usrp/usrp.pc.in index 77430ea46..297775fb1 100644 --- a/usrp/usrp.pc.in +++ b/usrp/usrp.pc.in @@ -8,4 +8,4 @@ Description: USRP Client Side C++ interface Requires: libusb @usrp_darwin_omnithread_pc_requires@ Version: @VERSION@ Libs: -L${libdir} -lusrp -Cflags: -I${includedir} @DEFINES@ +Cflags: -I${includedir} |