Merged r11123:11148 from jcorgan/np into trunk.
authorjcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5>
Wed, 27 May 2009 01:54:41 +0000 (01:54 +0000)
committerjcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5>
Wed, 27 May 2009 01:54:41 +0000 (01:54 +0000)
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

90 files changed:
Makefile.common
config/grc_gr_atsc.m4
config/grc_gr_audio_alsa.m4
config/grc_gr_audio_jack.m4
config/grc_gr_audio_oss.m4
config/grc_gr_audio_portaudio.m4
config/grc_gr_comedi.m4
config/grc_gr_cvsd_vocoder.m4
config/grc_gr_gsm_fr_vocoder.m4
config/grc_gr_msdd6000.m4
config/grc_gr_pager.m4
config/grc_gr_trellis.m4
config/grc_gr_video_sdl.m4
configure.ac
debian/gen-install-files.sh
gnuradio-core/gnuradio-core.pc.in
gnuradio-core/src/Makefile.am
gnuradio-core/src/lib/Makefile.am
gnuradio-core/src/lib/filter/Makefile.am
gnuradio-core/src/lib/general/Makefile.am
gnuradio-core/src/lib/gengen/Makefile.am
gnuradio-core/src/lib/hier/Makefile.am
gnuradio-core/src/lib/io/Makefile.am
gnuradio-core/src/lib/runtime/Makefile.am
gnuradio-core/src/lib/swig/Makefile.am
gnuradio-core/src/python/gnuradio/Makefile.am
gnuradio-examples/Makefile.am
gr-atsc/Makefile.am
gr-atsc/gnuradio-atsc.pc.in [new file with mode: 0644]
gr-atsc/src/Makefile.am
gr-atsc/src/lib/Makefile.am
gr-audio-alsa/Makefile.am
gr-audio-alsa/gnuradio-audio-alsa.pc.in [new file with mode: 0644]
gr-audio-alsa/gr-audio-alsa.pc.in [deleted file]
gr-audio-alsa/src/Makefile.am
gr-audio-jack/Makefile.am
gr-audio-jack/gnuradio-audio-jack.pc.in [new file with mode: 0644]
gr-audio-jack/src/Makefile.am
gr-audio-oss/Makefile.am
gr-audio-oss/gnuradio-audio-oss.pc.in [new file with mode: 0644]
gr-audio-oss/src/Makefile.am
gr-audio-osx/src/Makefile.am
gr-audio-portaudio/Makefile.am
gr-audio-portaudio/gnuradio-audio-portaudio.pc.in [new file with mode: 0644]
gr-audio-portaudio/src/Makefile.am
gr-audio-windows/src/Makefile.am
gr-comedi/Makefile.am
gr-comedi/gnuradio-comedi.pc.in [new file with mode: 0644]
gr-comedi/src/Makefile.am
gr-cvsd-vocoder/Makefile.am
gr-cvsd-vocoder/gnuradio-cvsd-vocoder.pc.in [new file with mode: 0644]
gr-cvsd-vocoder/src/Makefile.am
gr-cvsd-vocoder/src/lib/Makefile.am
gr-gcell/src/Makefile.am
gr-gpio/src/Makefile.am
gr-gsm-fr-vocoder/Makefile.am
gr-gsm-fr-vocoder/gnuradio-gsm-fr-vocoder.pc.in [new file with mode: 0644]
gr-gsm-fr-vocoder/src/Makefile.am
gr-gsm-fr-vocoder/src/lib/Makefile.am
gr-msdd6000/Makefile.am
gr-msdd6000/gnuradio-msdd6000.pc.in [new file with mode: 0644]
gr-msdd6000/src/Makefile.am
gr-pager/Makefile.am
gr-pager/gnuradio-pager.pc.in [new file with mode: 0644]
gr-pager/src/Makefile.am
gr-qtgui/src/Makefile.am
gr-qtgui/src/lib/Makefile.am
gr-radar-mono/src/Makefile.am
gr-radio-astronomy/src/Makefile.am
gr-radio-astronomy/src/lib/Makefile.am
gr-sounder/src/Makefile.am
gr-trellis/Makefile.am
gr-trellis/gnuradio-trellis.pc.in [new file with mode: 0644]
gr-trellis/src/Makefile.am
gr-trellis/src/lib/Makefile.am
gr-usrp/src/Makefile.am
gr-usrp2/src/Makefile.am
gr-utils/src/Makefile.am
gr-video-sdl/Makefile.am
gr-video-sdl/gnuradio-video-sdl.pc.in [new file with mode: 0644]
gr-video-sdl/src/Makefile.am
gr-wxgui/Makefile.am
grc/Makefile.am
mblock/mblock.pc.in
omnithread/gnuradio-omnithread.pc.in
pmt/pmt.pc.in
usrp/host/Makefile.am
usrp/host/lib/legacy/Makefile.am
usrp/usrp-inband.pc.in
usrp/usrp.pc.in

index e9bc13e4109d11fb01c2699b561f4426a1cc0b80..7bd35ce9a9f4d439498b848004baa013fc51f991 100644 (file)
@@ -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
index 003d1b7c7f587029d0825b9862bbe16a99f043d6..6dfb40132e549a6cdb0f3d4681eaf4b559caeab0 100644 (file)
@@ -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 \
index 9c653c1c255da8b8b302ea841efb826ceb18eaad..d6955980d2868094828fd9cf195be26eac193f61 100644 (file)
@@ -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 \
     ])
index cb7bf2990fc1ebf573ecc7b4a56388080925dafc..d1853588bbabbb64e568ea5066a265654126e02b 100644 (file)
@@ -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 \
     ])
index 6fd4577a8bad0ffa378fec1c7d6d592896162e44..13c83bba9b229cb30c13c291c69a8de35d838f46 100644 (file)
@@ -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 \
     ])
index b2f27f2c80f54f4d2ffb9107988138e1886ca148..ff551b38a77df1f07928e72d96daf9a617cff8c3 100644 (file)
@@ -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 \
     ])
index 2bdfacbc05542a1a0aa1692a9e0b3fd7aec84548..5e30894174b46c697e416dec7c2ae2b1d8e8ab66 100644 (file)
@@ -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 \
     ])
index c73a3052b95739769a291fb94acc2de67267e251..ddf6f9b2f2b72fd6d8ebc8c636e79a84ac1274f4 100644 (file)
@@ -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 \
index 941cb25577f7de3f34bbe3ed8896b84a5502e31e..a93d4edb7e13be4c80bd5b3d15a3bf6d105d7614 100644 (file)
@@ -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 \
index 3f2e17a2a5ab3d6fd8a7df18762283e9dd972297..6d40e893111e7263026c200fd427372ed473bf2a 100644 (file)
@@ -22,6 +22,7 @@ AC_DEFUN([GRC_GR_MSDD6000],[
 
     AC_CONFIG_FILES([\
        gr-msdd6000/Makefile \
+       gr-msdd6000/gnuradio-msdd6000.pc \
        gr-msdd6000/src/Makefile
     ])
 
index cb417ae25c2d14cd516a61eb66488d96c2ea7ffc..23af7a9c4d64a1f5da3aaa6ab2927402f017316a 100644 (file)
@@ -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
     ])
index f6ed4a488c1f0cd7db6592880f0ba271338a861d..cb51325d65433fba24ea6757d7aa11cc3d4d0314 100644 (file)
@@ -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 \
index 774f7250c8b0d69dae57c9af69363b24283174d3..c890bc31c452a4483055791714f6249498bc7b57 100644 (file)
@@ -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 \
     ])
index 69de40b1a96587107015ec532401a407d5bc8686..5be42eb607bfddb5ddd0005c4380cdf95002f55f 100644 (file)
@@ -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
+
index 9eda4085467f06d04f02b9a3f46edfe10952679f..99735c15a103aac54a5a1a669b7144517f581ac8 100755 (executable)
@@ -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
index 2c507fa22738b840d478c62df29f145d3587baa8..dc06fcf89f21361f3fa93c914394c1d63988f5fc 100644 (file)
@@ -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}
index 7b325974a6da98dcf396bc450fba8cf40284db19..eb979fe58be6c64e136d7d92f00df14ef4a734cd 100644 (file)
@@ -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
index fcb4d4ea5b1a574416b790178c5e9e7767616cf5..ef2b17f5ab44ac1dd5e0755a61f67c58bd917c8f 100644 (file)
@@ -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
 
index b7fd0f58aac9f9c6436e7164101e36640c438094..f46956745813d2216fd41958e2728e0a42a4d733 100644 (file)
@@ -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
 
index 4ceb7248626cfcd199327aa7ca4c801d130cbc0b..5564ee3d4cd1ed71c1a0eef5ed157cf37beb91ce 100644 (file)
@@ -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
index db7bee02f2ab3ab3b1069b0d4b3a1734dac72c03..4978ad1c511325e2005a2752931a2ecad7d8e276 100644 (file)
@@ -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
 
index b525d19b4f63c056c4c3289575125295204cf9fb..e2e7fe886ac6f4009bb00e6e0f9f119a672c40e9 100644 (file)
@@ -32,6 +32,8 @@ libhier_la_SOURCES = \
 grinclude_HEADERS = \
        gr_channel_model.h
 
+if PYTHON
 swiginclude_HEADERS = \
        hier.i \
        gr_channel_model.i
+endif
index 4583a033c88d9b4a7c0cb72316b9de0e19993865..9eacd137d9b3fa27b3c0cb75faad2480e4fd14d2 100644 (file)
@@ -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
index af5e4980d68ec91813d9bc6ddde7f251b06fe81a..14ab464ad257835cdc579cf896386b004dd04b1d 100644 (file)
@@ -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
index 75b152dc0b52109cf0be208eb161fc749282f880..242f27d9c0d7d9de79696ca4af39a3fc13f76ab2 100644 (file)
@@ -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
index 5cc0824b3aa5392ea96c48553cf836ff2d0ddc85..ed36bbae7c479e2d8c2cc8c959a2b8ca2a3b3943 100644 (file)
@@ -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
index 41e9ee4d6101d337953547d5c2a5f314dbfd7caf..360ae8b41f080fb057a74bce4ad2cbfa84097552 100644 (file)
@@ -21,4 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
-SUBDIRS = python c++
+SUBDIRS = c++
+if PYTHON
+SUBDIRS += python
+endif
index 99b4ff2da226d185b00d41de03c3f07d3bbe7976..ffb37f7ec858b2d7b010582026c7acb250874308 100644 (file)
@@ -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 (file)
index 0000000..4c5ae06
--- /dev/null
@@ -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}
index e3f0399eb093e516a323ed1c5d4a6f7eb12c6cc9..78e03f580c8e72b69be5d5708eaa5ad5364f088a 100644 (file)
@@ -19,4 +19,8 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-SUBDIRS = lib python
+SUBDIRS = lib
+if PYTHON
+SUBDIRS += python
+endif
+
index 905eaa57e455328bb60fd6ae42e027fd806a5f77..b435461254fedf1639898fba2749105c906604e1 100644 (file)
@@ -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
index 0b472f9c967cd9ae0c2858660274db8d53e34886..e2f67725ac090fbc5e8195e977873f8ba137bf50 100644 (file)
 
 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/gnuradio-audio-alsa.pc.in b/gr-audio-alsa/gnuradio-audio-alsa.pc.in
new file mode 100644 (file)
index 0000000..797bfc0
--- /dev/null
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: gnuradio-audio-alsa
+Description: The GNU Radio block for the ALSA sound system
+Requires: gnuradio-core alsa
+Version: @VERSION@
+Libs: -L${libdir} -lgnuradio-audio-alsa
+Cflags: -I${includedir}
diff --git a/gr-audio-alsa/gr-audio-alsa.pc.in b/gr-audio-alsa/gr-audio-alsa.pc.in
deleted file mode 100644 (file)
index 69b6e8c..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: gnuradio-audio-alsa
-Description: The GNU Radio block for the ALSA sound system
-Requires: gnuradio-core
-Version: @VERSION@
-Libs: -L${libdir} -lgnuradio-audio-alsa
-Cflags: -I${includedir}
index 8230ab56999dee5c0173765c0e6042b8cdf25e6e..ee7498af48b8a52ef16eb9797e7b63898cea9266 100644 (file)
@@ -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
index 4f3a452be492cb5f69fd8b30090778429deba8f4..8eeb9bffe0bb803a4c985ba8e9f3cf3f2150c267 100644 (file)
@@ -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 (file)
index 0000000..eaceaea
--- /dev/null
@@ -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}
index bd8694a26188709232858d04dbecd80e03b8d5bd..b766ec201294a483badd665539833fb6dad1a1fe 100644 (file)
@@ -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
index 7b4fca6dc88a5e627679cd3e318dec87ef91b925..697c9a604c016f437ae207a2e76f6822dc36aded 100644 (file)
@@ -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 (file)
index 0000000..f598ba3
--- /dev/null
@@ -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}
index f83ba68ca98927a2714f28c73f9044dd300e8134..6142806395cd9978a2fc9f9afc678f18311e0221 100644 (file)
 
 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
index a4e690963ad63a433d023e18798ca42f64acb90d..a4129260a4f9881004466875ddb79b2758c8d00d 100644 (file)
@@ -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
index bf10b39c3dc0fc0ae0fc4504ea41c2d7fee63541..30a90647ec053b8f567d009f75ced9ca523a892d 100644 (file)
@@ -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 (file)
index 0000000..8f2c808
--- /dev/null
@@ -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}
index 4b44807d8363c420bbd69236591cff36433723d6..1df6bbceaf546ddc1e72ae04f39d75ffb419a61f 100644 (file)
@@ -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
index 1a8ededa609dc3dfff6e0b00b13f28a5c77347ed..dc91e140ca00b8e190c31ace6b3d118727a377fd 100644 (file)
@@ -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
index 23ca1fa8513713f772f119cdcc6ca6a620fdbae3..4fc1e1eb5ee87284f1e1ca4061a20fc56d51be18 100644 (file)
@@ -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 (file)
index 0000000..8c320b5
--- /dev/null
@@ -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}
index bd26e695223eada8cd3c8df34bf5cbd179e30633..974b108abd5b171801fb951fa83d923653a57f65 100644 (file)
@@ -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
index f2e929644b09dbdc0eba34ad82b7bb2695f0e7c1..48807a34b6d43a71370dab1af8c4dabcd94c1368 100644 (file)
@@ -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 (file)
index 0000000..0562308
--- /dev/null
@@ -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}
index e3f0399eb093e516a323ed1c5d4a6f7eb12c6cc9..be38b7c1ab43449ae85bcec13768c8afc0452f0b 100644 (file)
@@ -19,4 +19,7 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-SUBDIRS = lib python
+SUBDIRS = lib
+if PYTHON
+SUBDIRS += python
+endif
index 78a7c6400ecbacf95e8b003e47607eb92ae1602c..500d0e858c30fba91291dd80298abf8c851fcd1a 100644 (file)
@@ -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
index 83dc30f45789a9710515da88affbe4fd80b055b1..f44095b473587ad888329e0404fefc2de39a8a1f 100644 (file)
@@ -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
index 8c9a64b8bfaa485437089e1ddd8e943f101de794..5071c22732a5ec7ada80264241738f7db17f50b5 100644 (file)
@@ -19,4 +19,8 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-SUBDIRS = python fpga
+SUBDIRS = fpga
+if PYTHON
+SUBDIRS += python
+endif
+
index f2e929644b09dbdc0eba34ad82b7bb2695f0e7c1..968ce327c08691ad4c7a273dcb492f7a187d804c 100644 (file)
@@ -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 (file)
index 0000000..43d5c6b
--- /dev/null
@@ -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}
index e3f0399eb093e516a323ed1c5d4a6f7eb12c6cc9..be38b7c1ab43449ae85bcec13768c8afc0452f0b 100644 (file)
@@ -19,4 +19,7 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-SUBDIRS = lib python
+SUBDIRS = lib
+if PYTHON
+SUBDIRS += python
+endif
index 0cf0fb0788fe67653f15cf72e89ea1fae324d6ad..3b0270c2f9be5e4d5e05afaa7a24244109af56c0 100644 (file)
@@ -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
index 73f418edcbbc361804a1ed625a6e9ea53dc132b4..89405d08c8be58fed2123931bfa96dfb7478c867 100644 (file)
@@ -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 (file)
index 0000000..8c320b5
--- /dev/null
@@ -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}
index b2bf22ab9f10173a713896d0009709b7520a47ce..0865d40de7c96d5f51cc87b3331463e862bb9ddd 100644 (file)
@@ -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
index 7297661a1f524189b84999ae986ac7e035fcce48..d73e4050fe8a1bd2de42dd0be844e7a3c2d35da8 100644 (file)
@@ -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 (file)
index 0000000..35516b6
--- /dev/null
@@ -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}
index b12f7b8ff9eb488629fdbb9f8201396644c77f3a..d084d05f8b21903f8fd5684f4e905e6f224717d0 100644 (file)
@@ -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
index 7230d6096df2d9d7cb473171f1db6ec6920afa11..52b06fbc454f0090d050a49faff1f553260a35bd 100644 (file)
@@ -19,4 +19,7 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-SUBDIRS = lib python
+SUBDIRS = lib
+if PYTHON
+SUBDIRS += python
+endif
index 6543a71ce9400ecd7f21ad729d2ae673820d12ff..290af1dd3792526c06815854f919b270fd4815c6 100644 (file)
@@ -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
index c6fb49efa1e78f7270805a0fa79c10c289389525..d546da7f8656f5ceedbf0aec48b3c8cc57cff991 100644 (file)
@@ -21,4 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
-SUBDIRS = fpga lib python
+SUBDIRS = fpga lib
+if PYTHON
+SUBDIRS += python
+endif
index e3f0399eb093e516a323ed1c5d4a6f7eb12c6cc9..be38b7c1ab43449ae85bcec13768c8afc0452f0b 100644 (file)
@@ -19,4 +19,7 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-SUBDIRS = lib python
+SUBDIRS = lib
+if PYTHON
+SUBDIRS += python
+endif
index 33a8a859ab6e438a01f88d69713996dc16c639ef..d2dafdeacc7cf4324966d59075af100d6c737d4a 100644 (file)
@@ -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
index c6fb49efa1e78f7270805a0fa79c10c289389525..d546da7f8656f5ceedbf0aec48b3c8cc57cff991 100644 (file)
@@ -21,4 +21,7 @@
 
 include $(top_srcdir)/Makefile.common
 
-SUBDIRS = fpga lib python
+SUBDIRS = fpga lib
+if PYTHON
+SUBDIRS += python
+endif
index ecf56ee21543752c71eb92370c6ffc8a6dbfca41..d68fb59c9dbe25e3e9a3a37c0bedce30dcb72b07 100644 (file)
@@ -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 (file)
index 0000000..8c320b5
--- /dev/null
@@ -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}
index 41f525b0b8dbb477149a0e187001805396165f12..79e9d626ad5fffc23279cc1caece815da4dbaad9 100644 (file)
@@ -19,4 +19,7 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-SUBDIRS = lib python examples
+SUBDIRS = lib 
+if PYTHON
+SUBDIRS += python examples
+endif
index 2e7591e4b9bc76e87136ea009e1d0033f81e3ffd..58115de254c4db817684f0a943d57659bf3a5068 100644 (file)
@@ -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
index 9b8737d715666b43b5487cee19c12e6673fb61f3..0835e2b9bb562b6919ac792923ab6a171dcf9ee8 100644 (file)
@@ -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
index 77da2bd4918931287516cddbb87a4db6221f2657..8425c497caff94b1c532282f2e0a23c12e6b2709 100644 (file)
@@ -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
index 7a941211384b6d536ef7ca05e5d17f032f8c66cc..b2847dce98e99f4d3f5d7703cf405d1ae4481674 100644 (file)
@@ -19,4 +19,7 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-SUBDIRS = lib python
+SUBDIRS = lib
+if PYTHON
+SUBDIRS += python
+endif
index 2b6e6c8f33e7f8543497fae7289d13dd5732fd84..75efb3b602650d5030c121e4d539634a955e619e 100644 (file)
@@ -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 (file)
index 0000000..9a8fe7d
--- /dev/null
@@ -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}
index 04139afde5f51d5516a544d5e8192c4381605f69..e623eb2a9df1a8d37c66d2d1b3d9e11b8cdaff66 100644 (file)
@@ -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
index d637acb32eafacf7d6fbe50745029f63e23d493f..3e31fc435a5e90dd8dab7149bfa81dbe9ce1f567 100644 (file)
@@ -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
index 7f62f39b6d9fe0a1ef8b809afd9b0709c4d19c75..0583e88bff1d04ec44be093d44d2572e6dd89363 100644 (file)
@@ -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
index ec72b104ec4d6bf313595ced813fbaad68f05b15..3d849995b4959135bc0c39c2ff58d899dd98e126 100644 (file)
@@ -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
index 0a94562e9e46f8814f91d48795e4a884c75e2d29..fb3be4a96949e5e484c62d84a5b575b3a2834d0d 100644 (file)
@@ -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}
index 5a48ea20954471f74c7b14983e9bc18ab84391e6..d6628cad60a21ebc837cb1e3906c4c0cfc9c1282 100644 (file)
@@ -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
index 1716f513d4576898e81f293a73dd30d52bb87ddb..514b835a9d98a020c099b614395488cb24a3eb78 100644 (file)
@@ -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 
index e2fabc229c84d7faa2e977961c39f02e0f656b6e..e1b1b850abf72192f09e8da40c0c290729cfd60c 100644 (file)
@@ -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.
index 74665bdbb5ac119f9f6c3f900bd401b4a7c47b74..57e27462498af11af9a2a7e86a473293c382d229 100644 (file)
@@ -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}
index 77430ea463f46c42a6111ed7d3e3eb04479d4a30..297775fb1da3f9f027de94eb2db0454fb788fdf6 100644 (file)
@@ -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}