changes from running bootstrap and then make maintainer-clean
[debian/gnuradio] / gr-usrp / src / Makefile.in
index a2c41daed08cabebb3522a5df0a9073727daa820..d11fb0e704d1f1943f646fcae671e6246a676e19 100644 (file)
@@ -38,7 +38,7 @@
 
 # -*- Makefile -*-
 #
-# Copyright 2004,2006,2007,2008,2009 Free Software Foundation, Inc.
+# Copyright 2004,2006,2007,2008,2009,2010 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -125,11 +125,13 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
-DIST_COMMON = $(grinclude_HEADERS) $(noinst_PYTHON) \
-       $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+DIST_COMMON = $(am__usrp_swig_python_PYTHON_DIST) \
+       $(am__usrp_swig_swiginclude_HEADERS_DIST) $(grinclude_HEADERS) \
+       $(noinst_PYTHON) $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
        $(srcdir)/Makefile.swig.gen $(srcdir)/run_tests.in \
-       $(top_srcdir)/Makefile.common $(top_srcdir)/Makefile.swig \
-       $(usrp_swig_python_PYTHON) $(usrp_swig_swiginclude_HEADERS)
+       $(top_srcdir)/Makefile.common $(top_srcdir)/Makefile.swig
+@PYTHON_TRUE@am__append_1 = $(DEPDIR)/usrp_swig-generate-*
+@PYTHON_TRUE@am__append_2 = $(DEPDIR)/*.S*
 subdir = gr-usrp/src
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/config/acx_cblas.m4 \
@@ -143,36 +145,39 @@ am__aclocal_m4_deps = $(top_srcdir)/config/acx_cblas.m4 \
        $(top_srcdir)/config/gr_check_memalign.m4 \
        $(top_srcdir)/config/gr_check_shm_open.m4 \
        $(top_srcdir)/config/gr_doxygen.m4 \
-       $(top_srcdir)/config/gr_fortran.m4 \
+       $(top_srcdir)/config/gr_git.m4 \
        $(top_srcdir)/config/gr_gprof.m4 \
        $(top_srcdir)/config/gr_lib64.m4 \
        $(top_srcdir)/config/gr_libgnuradio_core_extra_ldflags.m4 \
        $(top_srcdir)/config/gr_no_undefined.m4 \
-       $(top_srcdir)/config/gr_omnithread.m4 \
        $(top_srcdir)/config/gr_pwin32.m4 \
        $(top_srcdir)/config/gr_python.m4 \
        $(top_srcdir)/config/gr_qwt.m4 \
        $(top_srcdir)/config/gr_qwtplot3d.m4 \
        $(top_srcdir)/config/gr_scripting.m4 \
        $(top_srcdir)/config/gr_set_md_cpu.m4 \
-       $(top_srcdir)/config/gr_subversion.m4 \
        $(top_srcdir)/config/gr_swig.m4 \
        $(top_srcdir)/config/gr_sysv_shm.m4 \
+       $(top_srcdir)/config/gr_version.m4 \
        $(top_srcdir)/config/grc_build.m4 \
        $(top_srcdir)/config/grc_docs.m4 \
        $(top_srcdir)/config/grc_gcell.m4 \
        $(top_srcdir)/config/grc_gnuradio_core.m4 \
        $(top_srcdir)/config/grc_gnuradio_examples.m4 \
+       $(top_srcdir)/config/grc_gr_atsc.m4 \
        $(top_srcdir)/config/grc_gr_audio_alsa.m4 \
        $(top_srcdir)/config/grc_gr_audio_jack.m4 \
        $(top_srcdir)/config/grc_gr_audio_oss.m4 \
        $(top_srcdir)/config/grc_gr_audio_osx.m4 \
        $(top_srcdir)/config/grc_gr_audio_portaudio.m4 \
        $(top_srcdir)/config/grc_gr_audio_windows.m4 \
+       $(top_srcdir)/config/grc_gr_comedi.m4 \
        $(top_srcdir)/config/grc_gr_cvsd_vocoder.m4 \
        $(top_srcdir)/config/grc_gr_gcell.m4 \
        $(top_srcdir)/config/grc_gr_gpio.m4 \
        $(top_srcdir)/config/grc_gr_gsm_fr_vocoder.m4 \
+       $(top_srcdir)/config/grc_gr_msdd6000.m4 \
+       $(top_srcdir)/config/grc_gr_noaa.m4 \
        $(top_srcdir)/config/grc_gr_pager.m4 \
        $(top_srcdir)/config/grc_gr_qtgui.m4 \
        $(top_srcdir)/config/grc_gr_radar_mono.m4 \
@@ -186,9 +191,6 @@ am__aclocal_m4_deps = $(top_srcdir)/config/acx_cblas.m4 \
        $(top_srcdir)/config/grc_gr_wxgui.m4 \
        $(top_srcdir)/config/grc_grc.m4 \
        $(top_srcdir)/config/grc_gruel.m4 \
-       $(top_srcdir)/config/grc_mblock.m4 \
-       $(top_srcdir)/config/grc_omnithread.m4 \
-       $(top_srcdir)/config/grc_pmt.m4 \
        $(top_srcdir)/config/grc_usrp.m4 \
        $(top_srcdir)/config/grc_usrp2.m4 \
        $(top_srcdir)/config/lf_cc.m4 $(top_srcdir)/config/lf_cxx.m4 \
@@ -238,13 +240,15 @@ am__installdirs = "$(DESTDIR)$(libdir)" \
        "$(DESTDIR)$(usrp_swig_swigincludedir)"
 LTLIBRARIES = $(lib_LTLIBRARIES) $(usrp_swig_pylib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-_usrp_swig_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-       $(usrp_swig_la_swig_libadd)
-am__usrp_swig_la_OBJECTS = _usrp_swig_la-usrp_swig.lo
+@PYTHON_TRUE@_usrp_swig_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+@PYTHON_TRUE@  $(usrp_swig_la_swig_libadd)
+am___usrp_swig_la_SOURCES_DIST = usrp_swig.cc
+@PYTHON_TRUE@am__usrp_swig_la_OBJECTS = _usrp_swig_la-usrp_swig.lo
 _usrp_swig_la_OBJECTS = $(am__usrp_swig_la_OBJECTS)
 _usrp_swig_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(_usrp_swig_la_CXXFLAGS) \
        $(CXXFLAGS) $(_usrp_swig_la_LDFLAGS) $(LDFLAGS) -o $@
+@PYTHON_TRUE@am__usrp_swig_la_rpath = -rpath $(usrp_swig_pylibdir)
 libgnuradio_usrp_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
        $(am__DEPENDENCIES_1)
 am_libgnuradio_usrp_la_OBJECTS = usrp_base.lo usrp_sink_base.lo \
@@ -268,8 +272,13 @@ CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
        --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
        $(LDFLAGS) -o $@
 SOURCES = $(_usrp_swig_la_SOURCES) $(libgnuradio_usrp_la_SOURCES)
-DIST_SOURCES = $(_usrp_swig_la_SOURCES) $(libgnuradio_usrp_la_SOURCES)
+DIST_SOURCES = $(am___usrp_swig_la_SOURCES_DIST) \
+       $(libgnuradio_usrp_la_SOURCES)
+am__usrp_swig_python_PYTHON_DIST = usrp_swig.py __init__.py
 py_compile = $(top_srcdir)/py-compile
+am__usrp_swig_swiginclude_HEADERS_DIST = usrp_swig.i usrp_base.i \
+       usrp_source_base.i usrp_source_c.i usrp_source_s.i \
+       usrp_sink_base.i usrp_sink_c.i usrp_sink_s.i usrp_standard.i
 HEADERS = $(grinclude_HEADERS) $(usrp_swig_swiginclude_HEADERS)
 ETAGS = etags
 CTAGS = ctags
@@ -295,6 +304,7 @@ BOOST_DATE_TIME_LIB = @BOOST_DATE_TIME_LIB@
 BOOST_LDFLAGS = @BOOST_LDFLAGS@
 BOOST_PROGRAM_OPTIONS_LIB = @BOOST_PROGRAM_OPTIONS_LIB@
 BOOST_THREAD_LIB = @BOOST_THREAD_LIB@
+BUILD_DATE = @BUILD_DATE@
 CBLAS_LIBS = @CBLAS_LIBS@
 CC = @CC@
 CCAS = @CCAS@
@@ -302,6 +312,10 @@ CCASDEPMODE = @CCASDEPMODE@
 CCASFLAGS = @CCASFLAGS@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+COMEDI_CFLAGS = @COMEDI_CFLAGS@
+COMEDI_CPPFLAGS = @COMEDI_CPPFLAGS@
+COMEDI_INCLUDEDIR = @COMEDI_INCLUDEDIR@
+COMEDI_LIBS = @COMEDI_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@
@@ -320,6 +334,7 @@ DEFINES = @DEFINES@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
+DOCVER = @DOCVER@
 DOT = @DOT@
 DOXYGEN = @DOXYGEN@
 DSYMUTIL = @DSYMUTIL@
@@ -329,20 +344,23 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
 FFTW3F_CFLAGS = @FFTW3F_CFLAGS@
 FFTW3F_CPPFLAGS = @FFTW3F_CPPFLAGS@
 FFTW3F_INCLUDEDIR = @FFTW3F_INCLUDEDIR@
 FFTW3F_LIBS = @FFTW3F_LIBS@
 FGREP = @FGREP@
-FLIBS = @FLIBS@
 FUSB_TECH = @FUSB_TECH@
+GIT = @GIT@
+GIT_COMMIT = @GIT_COMMIT@
+GIT_DESCRIBE = @GIT_DESCRIBE@
+GIT_SEQNO = @GIT_SEQNO@
+GIT_TAG = @GIT_TAG@
 GREP = @GREP@
 GR_ARCH_BIGENDIAN = @GR_ARCH_BIGENDIAN@
 GR_HAVE_ARPA_INET = @GR_HAVE_ARPA_INET@
 GR_HAVE_BYTESWAP = @GR_HAVE_BYTESWAP@
 GR_HAVE_NETINET_IN = @GR_HAVE_NETINET_IN@
+GR_PREFSDIR = @GR_PREFSDIR@
 GSL_CFLAGS = @GSL_CFLAGS@
 GSL_CPPFLAGS = @GSL_CPPFLAGS@
 GSL_INCLUDEDIR = @GSL_INCLUDEDIR@
@@ -365,6 +383,8 @@ LIBGNURADIO_CORE_EXTRA_LDFLAGS = @LIBGNURADIO_CORE_EXTRA_LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
+LIBUSB_PKG_CONFIG_NAME = @LIBUSB_PKG_CONFIG_NAME@
+LIBVER = @LIBVER@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
@@ -426,6 +446,7 @@ QWTPLOT3D_LIBS = @QWTPLOT3D_LIBS@
 QWT_CFLAGS = @QWT_CFLAGS@
 QWT_LIBS = @QWT_LIBS@
 RANLIB = @RANLIB@
+RELEASE = @RELEASE@
 RM_PROG = @RM_PROG@
 SDL_CFLAGS = @SDL_CFLAGS@
 SDL_CONFIG = @SDL_CONFIG@
@@ -438,17 +459,17 @@ SHELL = @SHELL@
 SHM_OPEN_LIBS = @SHM_OPEN_LIBS@
 SPU_GCC_PROG = @SPU_GCC_PROG@
 STRIP = @STRIP@
-SVN = @SVN@
-SVNDATE = @SVNDATE@
-SVNVERSION = @SVNVERSION@
 SWIG = @SWIG@
 SWIG_PYTHON_CPPFLAGS = @SWIG_PYTHON_CPPFLAGS@
 SWIG_PYTHON_LIB = @SWIG_PYTHON_LIB@
 SWIG_PYTHON_OPT = @SWIG_PYTHON_OPT@
+SYSCONFDIR = @SYSCONFDIR@
 USB_CFLAGS = @USB_CFLAGS@
 USB_CPPFLAGS = @USB_CPPFLAGS@
 USB_INCLUDEDIR = @USB_INCLUDEDIR@
+USB_INCLUDES = @USB_INCLUDES@
 USB_LIBS = @USB_LIBS@
+USE_LIBUSB1 = @USE_LIBUSB1@
 USRP2_INCLUDES = @USRP2_INCLUDES@
 USRP2_LA = @USRP2_LA@
 VERSION = @VERSION@
@@ -464,7 +485,6 @@ abs_top_srcdir = @abs_top_srcdir@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-ac_ct_F77 = @ac_ct_F77@
 acx_pthread_config = @acx_pthread_config@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
@@ -516,6 +536,11 @@ gnuradio_examples_INCLUDES = @gnuradio_examples_INCLUDES@
 gnuradio_examples_LA = @gnuradio_examples_LA@
 gnuradio_examples_LDFLAG = @gnuradio_examples_LDFLAG@
 gnuradio_examples_LIBDIRPATH = @gnuradio_examples_LIBDIRPATH@
+gr_atsc_INCLUDEDIR = @gr_atsc_INCLUDEDIR@
+gr_atsc_INCLUDES = @gr_atsc_INCLUDES@
+gr_atsc_LA = @gr_atsc_LA@
+gr_atsc_LDFLAG = @gr_atsc_LDFLAG@
+gr_atsc_LIBDIRPATH = @gr_atsc_LIBDIRPATH@
 gr_audio_alsa_INCLUDEDIR = @gr_audio_alsa_INCLUDEDIR@
 gr_audio_alsa_INCLUDES = @gr_audio_alsa_INCLUDES@
 gr_audio_alsa_LA = @gr_audio_alsa_LA@
@@ -546,6 +571,11 @@ gr_audio_windows_INCLUDES = @gr_audio_windows_INCLUDES@
 gr_audio_windows_LA = @gr_audio_windows_LA@
 gr_audio_windows_LDFLAG = @gr_audio_windows_LDFLAG@
 gr_audio_windows_LIBDIRPATH = @gr_audio_windows_LIBDIRPATH@
+gr_comedi_INCLUDEDIR = @gr_comedi_INCLUDEDIR@
+gr_comedi_INCLUDES = @gr_comedi_INCLUDES@
+gr_comedi_LA = @gr_comedi_LA@
+gr_comedi_LDFLAG = @gr_comedi_LDFLAG@
+gr_comedi_LIBDIRPATH = @gr_comedi_LIBDIRPATH@
 gr_cvsd_vocoder_INCLUDEDIR = @gr_cvsd_vocoder_INCLUDEDIR@
 gr_cvsd_vocoder_INCLUDES = @gr_cvsd_vocoder_INCLUDES@
 gr_cvsd_vocoder_LA = @gr_cvsd_vocoder_LA@
@@ -567,6 +597,16 @@ gr_gsm_fr_vocoder_LA = @gr_gsm_fr_vocoder_LA@
 gr_gsm_fr_vocoder_LDFLAG = @gr_gsm_fr_vocoder_LDFLAG@
 gr_gsm_fr_vocoder_LIBDIRPATH = @gr_gsm_fr_vocoder_LIBDIRPATH@
 gr_libdir_suffix = @gr_libdir_suffix@
+gr_msdd6000_INCLUDEDIR = @gr_msdd6000_INCLUDEDIR@
+gr_msdd6000_INCLUDES = @gr_msdd6000_INCLUDES@
+gr_msdd6000_LA = @gr_msdd6000_LA@
+gr_msdd6000_LDFLAG = @gr_msdd6000_LDFLAG@
+gr_msdd6000_LIBDIRPATH = @gr_msdd6000_LIBDIRPATH@
+gr_noaa_INCLUDEDIR = @gr_noaa_INCLUDEDIR@
+gr_noaa_INCLUDES = @gr_noaa_INCLUDES@
+gr_noaa_LA = @gr_noaa_LA@
+gr_noaa_LDFLAG = @gr_noaa_LDFLAG@
+gr_noaa_LIBDIRPATH = @gr_noaa_LIBDIRPATH@
 gr_pager_INCLUDEDIR = @gr_pager_INCLUDEDIR@
 gr_pager_INCLUDES = @gr_pager_INCLUDES@
 gr_pager_LA = @gr_pager_LA@
@@ -649,26 +689,11 @@ localedir = @localedir@
 localstatedir = @localstatedir@
 lt_ECHO = @lt_ECHO@
 mandir = @mandir@
-mblock_INCLUDEDIR = @mblock_INCLUDEDIR@
-mblock_INCLUDES = @mblock_INCLUDES@
-mblock_LA = @mblock_LA@
-mblock_LDFLAG = @mblock_LDFLAG@
-mblock_LIBDIRPATH = @mblock_LIBDIRPATH@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
-omnithread_INCLUDEDIR = @omnithread_INCLUDEDIR@
-omnithread_INCLUDES = @omnithread_INCLUDES@
-omnithread_LA = @omnithread_LA@
-omnithread_LDFLAG = @omnithread_LDFLAG@
-omnithread_LIBDIRPATH = @omnithread_LIBDIRPATH@
 pdfdir = @pdfdir@
 pkgpyexecdir = @pkgpyexecdir@
 pkgpythondir = @pkgpythondir@
-pmt_INCLUDEDIR = @pmt_INCLUDEDIR@
-pmt_INCLUDES = @pmt_INCLUDES@
-pmt_LA = @pmt_LA@
-pmt_LDFLAG = @pmt_LDFLAG@
-pmt_LIBDIRPATH = @pmt_LIBDIRPATH@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
@@ -699,7 +724,6 @@ usrp_INCLUDES = @usrp_INCLUDES@
 usrp_LA = @usrp_LA@
 usrp_LDFLAG = @usrp_LDFLAG@
 usrp_LIBDIRPATH = @usrp_LIBDIRPATH@
-usrp_darwin_omnithread_pc_requires = @usrp_darwin_omnithread_pc_requires@
 with_INCLUDES = @with_INCLUDES@
 with_LIBDIRPATH = @with_LIBDIRPATH@
 with_PYDIRPATH = @with_PYDIRPATH@
@@ -709,23 +733,26 @@ with_dirs = @with_dirs@
 AM_CFLAGS = @autoconf_default_CFLAGS@ @lf_CFLAGS@
 AM_CXXFLAGS = @autoconf_default_CXXFLAGS@ @lf_CXXFLAGS@
 
+# Sets ABI version in SONAME and appends -LIBVER to filename
+LTVERSIONFLAGS = -version-info 0:0:0 -release $(LIBVER)
+
 # includes
 grincludedir = $(includedir)/gnuradio
 
 # swig includes
-swigincludedir = $(grincludedir)/swig
+@PYTHON_TRUE@swigincludedir = $(grincludedir)/swig
 
 # Install the gnuradio stuff in the appropriate subdirectory
 # This usually ends up at:
 #   ${prefix}/lib/python${python_version}/site-packages/gnuradio
-grpythondir = $(pythondir)/gnuradio
-grpyexecdir = $(pyexecdir)/gnuradio
+@PYTHON_TRUE@grpythondir = $(pythondir)/gnuradio
+@PYTHON_TRUE@grpyexecdir = $(pyexecdir)/gnuradio
 
 # Install the non-gnuradio usrp stuff in the appropriate subdirectory
 # This usually ends up at:
 #   ${prefix}/lib/python${python_version}/site-packages/usrpm
-usrppythondir = $(pythondir)/usrpm
-usrppyexecdir = $(pyexecdir)/usrpm
+@PYTHON_TRUE@usrppythondir = $(pythondir)/usrpm
+@PYTHON_TRUE@usrppyexecdir = $(pyexecdir)/usrpm
 
 # gcell includes
 gcellincludedir = $(includedir)/gcell
@@ -737,7 +764,7 @@ libspudir = $(libdir)spu
 # This used to be set in configure.ac but is now defined here for all 
 # Makefiles when this fragment is included.
 STD_DEFINES_AND_INCLUDES = $(DEFINES) $(BOOST_CPPFLAGS) \
-       $(OMNITHREAD_INCLUDES) $(GNURADIO_INCLUDES) $(GRUEL_INCLUDES)
+       $(GNURADIO_INCLUDES) $(GRUEL_INCLUDES)
 
 
 # when including for compilation from pre-installed libraries and such,
@@ -745,10 +772,6 @@ STD_DEFINES_AND_INCLUDES = $(DEFINES) $(BOOST_CPPFLAGS) \
 WITH_INCLUDES = @with_INCLUDES@
 WITH_SWIG_INCLUDES = @with_SWIG_INCLUDES@
 
-# How to link in the top-level omnithreads library from inside the tree
-OMNITHREAD_INCLUDES = @omnithread_INCLUDES@
-OMNITHREAD_LA = @omnithread_LA@
-
 # Where to find gnuradio include files in the current build tree
 # top_srcdir for original stuff, top_builddir for generated files
 GNURADIO_INCLUDES = @gnuradio_core_INCLUDES@
@@ -764,18 +787,6 @@ GRUEL_LA = @gruel_LA@
 USRP_INCLUDES = @usrp_INCLUDES@
 USRP_LA = @usrp_LA@
 
-# How to link in usrp-inband library from inside the tree
-USRP_INBAND_INCLUDES = @usrp_inband_INCLUDES@
-USRP_INBAND_LA = @usrp_inband_LA@
-
-# How to link the PMT library from inside the tree
-PMT_INCLUDES = @pmt_INCLUDES@
-PMT_LA = @pmt_LA@
-
-# How to link the mblock library from inside the tree
-MBLOCK_INCLUDES = @mblock_INCLUDES@
-MBLOCK_LA = @mblock_LA@
-
 # How to link the gcell library from inside the tree (the PPU part)
 GCELL_INCLUDES = @gcell_INCLUDES@
 GCELL_LA = @gcell_LA@
@@ -790,25 +801,26 @@ GCELL_EMBEDSPU_LIBTOOL = @abs_top_srcdir@/gcell/lib/runtime/gcell-embedspu-libto
 # Fix for BSD make not defining $(RM).  We define it now in configure.ac
 # using AM_PATH_PROG, but now here have to add a -f to be like GNU make
 RM = $(RM_PROG) -f
-RUN_GUILE = GUILE_LOAD_PATH="@abs_top_srcdir@/pmt/src/scheme:@abs_top_srcdir@/mblock/src/scheme" @GUILE@ -e main -s
-COMPILE_MBH = $(RUN_GUILE) $(top_srcdir)/mblock/src/scheme/gnuradio/compile-mbh.scm
+RUN_GUILE = GUILE_LOAD_PATH="@abs_top_srcdir@/gruel/src/scheme" @GUILE@ -e main -s
 
 # Base directory for example applications
 exampledir = $(datadir)/gnuradio/examples
-gr_docdir = $(docdir)-$(VERSION)
+gr_docdir = $(docdir)-$(DOCVER)
 
 # System configuration files
-gr_sysconfdir = $(sysconfdir)/$(PACKAGE)/conf.d
+gr_prefsdir = $(GR_PREFSDIR)
+
+# Data directory for grc block wrappers
+grc_blocksdir = $(pkgdatadir)/grc/blocks
 
 # Other common defines; use "+=" to add to these
-STAMPS = $(DEPDIR)/usrp_swig-generate-*
+STAMPS = $(am__append_1)
 MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp \
-       *.loT $(DEPDIR)/*.S*
+       *.loT $(am__append_2)
 
 # ----------------------------------------------------------------
 # Misc. build/installation activities
 EXTRA_DIST = run_tests.in
-TESTS = run_tests
 DISTCLEANFILES = run_tests
 noinst_PYTHON = qa_usrp.py
 
@@ -818,6 +830,7 @@ AM_CPPFLAGS = \
        $(STD_DEFINES_AND_INCLUDES) \
        $(PYTHON_CPPFLAGS) \
        $(USRP_INCLUDES) \
+       $(USB_INCLUDES) \
        $(WITH_INCLUDES)
 
 lib_LTLIBRARIES = \
@@ -836,7 +849,7 @@ libgnuradio_usrp_la_LIBADD = \
        $(GNURADIO_CORE_LA) \
        $(USRP_LA)                      
 
-libgnuradio_usrp_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0
+libgnuradio_usrp_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
 grinclude_HEADERS = \
        usrp_base.h \
        usrp_sink_base.h \
@@ -849,106 +862,107 @@ grinclude_HEADERS = \
 
 # ----------------------------------------------------------------
 # The SWIG library
-TOP_SWIG_IFILES = \
-       usrp_swig.i
+@PYTHON_TRUE@TESTS = run_tests
+@PYTHON_TRUE@TOP_SWIG_IFILES = \
+@PYTHON_TRUE@  usrp_swig.i
 
 
 # Install so that they end up available as:
 #   import gnuradio.usrp
 # This ends up at:
 #   ${prefix}/lib/python${python_version}/site-packages/gnuradio/usrp
-usrp_swig_pythondir_category = \
-       gnuradio/usrp
+@PYTHON_TRUE@usrp_swig_pythondir_category = \
+@PYTHON_TRUE@  gnuradio/usrp
 
 
 # additional arguments to the SWIG command
-usrp_swig_swig_args = \
-       $(USRP_INCLUDES)
+@PYTHON_TRUE@usrp_swig_swig_args = \
+@PYTHON_TRUE@  $(USRP_INCLUDES)
 
 
 # additional libraries for linking with the SWIG-generated library
-usrp_swig_la_swig_libadd = \
-       libgnuradio-usrp.la
+@PYTHON_TRUE@usrp_swig_la_swig_libadd = \
+@PYTHON_TRUE@  libgnuradio-usrp.la
 
 
 # additional Python files to be installed along with the SWIG-generated one
-usrp_swig_python = \
-       __init__.py
+@PYTHON_TRUE@usrp_swig_python = \
+@PYTHON_TRUE@  __init__.py
 
 
 # additional SWIG files to be installed
-usrp_swig_swiginclude_headers = \
-       usrp_base.i             \
-       usrp_source_base.i      \
-       usrp_source_c.i         \
-       usrp_source_s.i         \
-       usrp_sink_base.i        \
-       usrp_sink_c.i           \
-       usrp_sink_s.i           \
-       usrp_standard.i
-
-SWIG_PYTHON_FLAGS = \
-       -fvirtual       \
-       -python         \
-       -modern         \
-       -keyword        \
-       -w511           \
-       -outdir .
-
-STD_SWIG_PYTHON_ARGS = \
-       $(SWIG_PYTHON_FLAGS)                    \
-       $(STD_DEFINES_AND_INCLUDES)             \
-       $(WITH_SWIG_INCLUDES)                   \
-       $(WITH_INCLUDES)
-
-STD_SWIG_LA_LD_FLAGS = \
-       $(PYTHON_LDFLAGS)       \
-       -module                 \
-       -avoid-version          \
-       $(NO_UNDEFINED)
-
-STD_SWIG_LA_LIB_ADD = \
-       -lstdc++
-
-STD_SWIG_CXX_FLAGS = @swig_CXXFLAGS@
-SUFFIXES = .i
-swig_built_sources = usrp_swig.py usrp_swig.cc
-usrp_swig_pythondir = $(pythondir)/$(usrp_swig_pythondir_category)
-usrp_swig_pylibdir = $(pyexecdir)/$(usrp_swig_pylibdir_category)
-usrp_swig_swigincludedir = $(swigincludedir)
-usrp_swig_swiginclude_HEADERS = \
-       usrp_swig.i                     \
-       $(usrp_swig_swiginclude_headers)
-
-usrp_swig_pylib_LTLIBRARIES = \
-       _usrp_swig.la
-
-_usrp_swig_la_SOURCES = \
-       usrp_swig.cc                    \
-       $(usrp_swig_la_swig_sources)
-
-_usrp_swig_la_LIBADD = \
-       $(STD_SWIG_LA_LIB_ADD)          \
-       $(usrp_swig_la_swig_libadd)
-
-_usrp_swig_la_LDFLAGS = \
-       $(STD_SWIG_LA_LD_FLAGS)         \
-       $(usrp_swig_la_swig_ldflags)
-
-_usrp_swig_la_CXXFLAGS = \
-       $(STD_SWIG_CXX_FLAGS)           \
-       $(usrp_swig_la_swig_cxxflags)
-
-usrp_swig_python_PYTHON = \
-       usrp_swig.py                    \
-       $(usrp_swig_python)
+@PYTHON_TRUE@usrp_swig_swiginclude_headers = \
+@PYTHON_TRUE@  usrp_base.i             \
+@PYTHON_TRUE@  usrp_source_base.i      \
+@PYTHON_TRUE@  usrp_source_c.i         \
+@PYTHON_TRUE@  usrp_source_s.i         \
+@PYTHON_TRUE@  usrp_sink_base.i        \
+@PYTHON_TRUE@  usrp_sink_c.i           \
+@PYTHON_TRUE@  usrp_sink_s.i           \
+@PYTHON_TRUE@  usrp_standard.i
+
+@PYTHON_TRUE@SWIG_PYTHON_FLAGS = \
+@PYTHON_TRUE@  -fvirtual       \
+@PYTHON_TRUE@  -python         \
+@PYTHON_TRUE@  -modern         \
+@PYTHON_TRUE@  -keyword        \
+@PYTHON_TRUE@  -w511           \
+@PYTHON_TRUE@  -outdir .
+
+@PYTHON_TRUE@STD_SWIG_PYTHON_ARGS = \
+@PYTHON_TRUE@  $(SWIG_PYTHON_FLAGS)                    \
+@PYTHON_TRUE@  $(STD_DEFINES_AND_INCLUDES)             \
+@PYTHON_TRUE@  $(WITH_SWIG_INCLUDES)                   \
+@PYTHON_TRUE@  $(WITH_INCLUDES)
+
+@PYTHON_TRUE@STD_SWIG_LA_LD_FLAGS = \
+@PYTHON_TRUE@  $(PYTHON_LDFLAGS)       \
+@PYTHON_TRUE@  -module                 \
+@PYTHON_TRUE@  -avoid-version          \
+@PYTHON_TRUE@  $(NO_UNDEFINED)
+
+@PYTHON_TRUE@STD_SWIG_LA_LIB_ADD = \
+@PYTHON_TRUE@  -lstdc++
+
+@PYTHON_TRUE@STD_SWIG_CXX_FLAGS = @swig_CXXFLAGS@
+@PYTHON_TRUE@SUFFIXES = .i
+@PYTHON_TRUE@swig_built_sources = usrp_swig.py usrp_swig.cc
+@PYTHON_TRUE@usrp_swig_pythondir = $(pythondir)/$(usrp_swig_pythondir_category)
+@PYTHON_TRUE@usrp_swig_pylibdir = $(pyexecdir)/$(usrp_swig_pylibdir_category)
+@PYTHON_TRUE@usrp_swig_swigincludedir = $(swigincludedir)
+@PYTHON_TRUE@usrp_swig_swiginclude_HEADERS = \
+@PYTHON_TRUE@  usrp_swig.i                     \
+@PYTHON_TRUE@  $(usrp_swig_swiginclude_headers)
+
+@PYTHON_TRUE@usrp_swig_pylib_LTLIBRARIES = \
+@PYTHON_TRUE@  _usrp_swig.la
+
+@PYTHON_TRUE@_usrp_swig_la_SOURCES = \
+@PYTHON_TRUE@  usrp_swig.cc                    \
+@PYTHON_TRUE@  $(usrp_swig_la_swig_sources)
+
+@PYTHON_TRUE@_usrp_swig_la_LIBADD = \
+@PYTHON_TRUE@  $(STD_SWIG_LA_LIB_ADD)          \
+@PYTHON_TRUE@  $(usrp_swig_la_swig_libadd)
+
+@PYTHON_TRUE@_usrp_swig_la_LDFLAGS = \
+@PYTHON_TRUE@  $(STD_SWIG_LA_LD_FLAGS)         \
+@PYTHON_TRUE@  $(usrp_swig_la_swig_ldflags)
+
+@PYTHON_TRUE@_usrp_swig_la_CXXFLAGS = \
+@PYTHON_TRUE@  $(STD_SWIG_CXX_FLAGS)           \
+@PYTHON_TRUE@  $(usrp_swig_la_swig_cxxflags)
+
+@PYTHON_TRUE@usrp_swig_python_PYTHON = \
+@PYTHON_TRUE@  usrp_swig.py                    \
+@PYTHON_TRUE@  $(usrp_swig_python)
 
 
 # add some of the variables generated inside the Makefile.swig.gen
-BUILT_SOURCES = $(swig_built_sources)
+@PYTHON_TRUE@BUILT_SOURCES = $(swig_built_sources)
 
 # Do not distribute the output of SWIG
-no_dist_files = $(swig_built_sources)
+@PYTHON_TRUE@no_dist_files = $(swig_built_sources)
 all: $(BUILT_SOURCES)
        $(MAKE) $(AM_MAKEFLAGS) all-am
 
@@ -1049,7 +1063,7 @@ clean-usrp_swig_pylibLTLIBRARIES:
          rm -f "$${dir}/so_locations"; \
        done
 _usrp_swig.la: $(_usrp_swig_la_OBJECTS) $(_usrp_swig_la_DEPENDENCIES) 
-       $(_usrp_swig_la_LINK) -rpath $(usrp_swig_pylibdir) $(_usrp_swig_la_OBJECTS) $(_usrp_swig_la_LIBADD) $(LIBS)
+       $(_usrp_swig_la_LINK) $(am__usrp_swig_la_rpath) $(_usrp_swig_la_OBJECTS) $(_usrp_swig_la_LIBADD) $(LIBS)
 libgnuradio-usrp.la: $(libgnuradio_usrp_la_OBJECTS) $(libgnuradio_usrp_la_DEPENDENCIES) 
        $(libgnuradio_usrp_la_LINK) -rpath $(libdir) $(libgnuradio_usrp_la_OBJECTS) $(libgnuradio_usrp_la_LIBADD) $(LIBS)
 
@@ -1506,75 +1520,75 @@ dist-hook:
                $(RM) $(distdir)/$$file; \
        done;
 
-generate-makefile-swig $(srcdir)/Makefile.swig.gen: $(top_srcdir)/Makefile.swig.gen.t
-       @do_recreate=0; \
-       if test -f $(srcdir)/Makefile.swig.gen; then \
-               if $(RM) $(srcdir)/Makefile.swig.gen 2>/dev/null; then \
-                       if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \
-                               do_recreate=1; \
-                       fi; \
-               fi; \
-       else \
-               if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \
-                       do_recreate=1; \
-               fi; \
-       fi; \
-       if test "$$do_recreate" == "1"; then \
-               echo "Regenerating $(srcdir)/Makefile.swig.gen"; \
-               for TFILE in $(TOP_SWIG_IFILES); do \
-                       TNAME=`python -c "import os.path as op; (dN, fN) = op.split ('$$TFILE'); (fbN, fE) = op.splitext (fN); print fbN;"`; \
-                       $(SED) -e 's|@NAME@|'$$TNAME'|g;' < $(top_srcdir)/Makefile.swig.gen.t >> $(srcdir)/Makefile.swig.gen; \
-                       echo "" >> $(srcdir)/Makefile.swig.gen; \
-               done; \
-       else \
-               echo "Cannot recreate $(srcdir)/Makefile.swig.gen because the directory or file is write-protected."; \
-               exit -1; \
-       fi;
-
-usrp_swig_pythondir_category ?= gnuradio/usrp_swig
-usrp_swig_pylibdir_category ?= $(usrp_swig_pythondir_category)
-
-usrp_swig.h usrp_swig.py usrp_swig.cc: usrp_swig.i
-       trap 'rm -rf $(DEPDIR)/usrp_swig-generate-*' 1 2 13 15; \
-       if mkdir $(DEPDIR)/usrp_swig-generate-lock 2>/dev/null; then \
-               rm -f $(DEPDIR)/usrp_swig-generate-stamp; \
-               $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/usrp_swig-generate-stamp WHAT=$<; \
-               rmdir $(DEPDIR)/usrp_swig-generate-lock; \
-       else \
-               while test -d $(DEPDIR)/usrp_swig-generate-lock; do \
-                       sleep 1; \
-               done; \
-               test -f $(DEPDIR)/usrp_swig-generate-stamp; \
-               exit $$?; \
-       fi;
-
-$(DEPDIR)/usrp_swig-generate-stamp:
-       if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(usrp_swig_swig_args) \
-               -MD -MF $(DEPDIR)/usrp_swig.Std \
-               -module usrp_swig -o usrp_swig.cc $(WHAT); then \
-           if test $(host_os) = mingw32; then \
-               $(RM) $(DEPDIR)/usrp_swig.Sd; \
-               $(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp_swig.Std \
-                       > $(DEPDIR)/usrp_swig.Sd; \
-               $(RM) $(DEPDIR)/usrp_swig.Std; \
-               $(MV) $(DEPDIR)/usrp_swig.Sd $(DEPDIR)/usrp_swig.Std; \
-           fi; \
-       else \
-           $(RM) $(DEPDIR)/usrp_swig.S*; exit 1; \
-       fi;
-       $(RM) $(DEPDIR)/usrp_swig.d
-       cp $(DEPDIR)/usrp_swig.Std $(DEPDIR)/usrp_swig.d
-       echo "" >> $(DEPDIR)/usrp_swig.d
-       $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/usrp_swig.Std | \
-               awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/usrp_swig.d
-       $(RM) $(DEPDIR)/usrp_swig.Std
-       touch $(DEPDIR)/usrp_swig-generate-stamp
+@PYTHON_TRUE@generate-makefile-swig $(srcdir)/Makefile.swig.gen: $(top_srcdir)/Makefile.swig.gen.t
+@PYTHON_TRUE@  @do_recreate=0; \
+@PYTHON_TRUE@  if test -f $(srcdir)/Makefile.swig.gen; then \
+@PYTHON_TRUE@          if $(RM) $(srcdir)/Makefile.swig.gen 2>/dev/null; then \
+@PYTHON_TRUE@                  if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \
+@PYTHON_TRUE@                          do_recreate=1; \
+@PYTHON_TRUE@                  fi; \
+@PYTHON_TRUE@          fi; \
+@PYTHON_TRUE@  else \
+@PYTHON_TRUE@          if touch $(srcdir)/Makefile.swig.gen 2>/dev/null; then \
+@PYTHON_TRUE@                  do_recreate=1; \
+@PYTHON_TRUE@          fi; \
+@PYTHON_TRUE@  fi; \
+@PYTHON_TRUE@  if test "$$do_recreate" == "1"; then \
+@PYTHON_TRUE@          echo "Regenerating $(srcdir)/Makefile.swig.gen"; \
+@PYTHON_TRUE@          for TFILE in $(TOP_SWIG_IFILES); do \
+@PYTHON_TRUE@                  TNAME=`python -c "import os.path as op; (dN, fN) = op.split ('$$TFILE'); (fbN, fE) = op.splitext (fN); print fbN;"`; \
+@PYTHON_TRUE@                  $(SED) -e 's|@NAME@|'$$TNAME'|g;' < $(top_srcdir)/Makefile.swig.gen.t >> $(srcdir)/Makefile.swig.gen; \
+@PYTHON_TRUE@                  echo "" >> $(srcdir)/Makefile.swig.gen; \
+@PYTHON_TRUE@          done; \
+@PYTHON_TRUE@  else \
+@PYTHON_TRUE@          echo "Cannot recreate $(srcdir)/Makefile.swig.gen because the directory or file is write-protected."; \
+@PYTHON_TRUE@          exit -1; \
+@PYTHON_TRUE@  fi;
+
+@PYTHON_TRUE@usrp_swig_pythondir_category ?= gnuradio/usrp_swig
+@PYTHON_TRUE@usrp_swig_pylibdir_category ?= $(usrp_swig_pythondir_category)
+
+@PYTHON_TRUE@usrp_swig.h usrp_swig.py usrp_swig.cc: usrp_swig.i
+@PYTHON_TRUE@  trap 'rm -rf $(DEPDIR)/usrp_swig-generate-*' 1 2 13 15; \
+@PYTHON_TRUE@  if mkdir $(DEPDIR)/usrp_swig-generate-lock 2>/dev/null; then \
+@PYTHON_TRUE@          rm -f $(DEPDIR)/usrp_swig-generate-stamp; \
+@PYTHON_TRUE@          $(MAKE) $(AM_MAKEFLAGS) $(DEPDIR)/usrp_swig-generate-stamp WHAT=$<; \
+@PYTHON_TRUE@          rmdir $(DEPDIR)/usrp_swig-generate-lock; \
+@PYTHON_TRUE@  else \
+@PYTHON_TRUE@          while test -d $(DEPDIR)/usrp_swig-generate-lock; do \
+@PYTHON_TRUE@                  sleep 1; \
+@PYTHON_TRUE@          done; \
+@PYTHON_TRUE@          test -f $(DEPDIR)/usrp_swig-generate-stamp; \
+@PYTHON_TRUE@          exit $$?; \
+@PYTHON_TRUE@  fi;
+
+@PYTHON_TRUE@$(DEPDIR)/usrp_swig-generate-stamp:
+@PYTHON_TRUE@  if $(SWIG) $(STD_SWIG_PYTHON_ARGS) $(usrp_swig_swig_args) \
+@PYTHON_TRUE@          -MD -MF $(DEPDIR)/usrp_swig.Std \
+@PYTHON_TRUE@          -module usrp_swig -o usrp_swig.cc $(WHAT); then \
+@PYTHON_TRUE@      if test $(host_os) = mingw32; then \
+@PYTHON_TRUE@          $(RM) $(DEPDIR)/usrp_swig.Sd; \
+@PYTHON_TRUE@          $(SED) 's,\\\\,/,g' < $(DEPDIR)/usrp_swig.Std \
+@PYTHON_TRUE@                  > $(DEPDIR)/usrp_swig.Sd; \
+@PYTHON_TRUE@          $(RM) $(DEPDIR)/usrp_swig.Std; \
+@PYTHON_TRUE@          $(MV) $(DEPDIR)/usrp_swig.Sd $(DEPDIR)/usrp_swig.Std; \
+@PYTHON_TRUE@      fi; \
+@PYTHON_TRUE@  else \
+@PYTHON_TRUE@      $(RM) $(DEPDIR)/usrp_swig.S*; exit 1; \
+@PYTHON_TRUE@  fi;
+@PYTHON_TRUE@  $(RM) $(DEPDIR)/usrp_swig.d
+@PYTHON_TRUE@  cp $(DEPDIR)/usrp_swig.Std $(DEPDIR)/usrp_swig.d
+@PYTHON_TRUE@  echo "" >> $(DEPDIR)/usrp_swig.d
+@PYTHON_TRUE@  $(SED) -e '1d;s, \\,,g;s, ,,g' < $(DEPDIR)/usrp_swig.Std | \
+@PYTHON_TRUE@          awk '{ printf "%s:\n\n", $$0 }' >> $(DEPDIR)/usrp_swig.d
+@PYTHON_TRUE@  $(RM) $(DEPDIR)/usrp_swig.Std
+@PYTHON_TRUE@  touch $(DEPDIR)/usrp_swig-generate-stamp
 
 # KLUDGE: Force runtime include of a SWIG dependency file.  This is
 # not guaranteed to be portable, but will probably work.  If it works,
 # we have accurate dependencies for our swig stuff, which is good.
 
-@am__include@ @am__quote@./$(DEPDIR)/usrp_swig.d@am__quote@
+@PYTHON_TRUE@@am__include@ @am__quote@./$(DEPDIR)/usrp_swig.d@am__quote@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.