[Commit-gnuradio] r3192 - in gnuradio/branches/developers/jcorgan/ticket-10: . config gr-audio-oss/src gr-radio-astronomy/src/python

[jcorgan]

Author: jcorgan
Date: 2006-08-06 13:52:00 -0600 (Sun, 06 Aug 2006)
New Revision: 3192

Modified:
   gnuradio/branches/developers/jcorgan/ticket-10/Makefile.common
   gnuradio/branches/developers/jcorgan/ticket-10/TODO.build
   gnuradio/branches/developers/jcorgan/ticket-10/config/grc_gr_audio_oss.m4
   gnuradio/branches/developers/jcorgan/ticket-10/gr-audio-oss/src/Makefile.am
   
gnuradio/branches/developers/jcorgan/ticket-10/gr-radio-astronomy/src/python/Makefile.am
Log:
Trial fix for ticket 10.  This branch has had trunk merged into it as
of r3191.


Modified: gnuradio/branches/developers/jcorgan/ticket-10/Makefile.common
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-10/Makefile.common      
2006-08-06 18:06:22 UTC (rev 3191)
+++ gnuradio/branches/developers/jcorgan/ticket-10/Makefile.common      
2006-08-06 19:52:00 UTC (rev 3192)
@@ -36,27 +36,33 @@
 # swig flags
 SWIGPYTHONFLAGS = -fvirtual -python -modern
 
+# Where to find gnuradio include files in the current build tree
 GNURADIO_INCLUDES = -I$(top_srcdir)/gnuradio-core/src/lib/runtime \
                    -I$(top_srcdir)/gnuradio-core/src/lib/general \
                    -I$(top_srcdir)/gnuradio-core/src/lib/filter \
                     -I$(top_srcdir)/gnuradio-core/src/lib/reed-solomon \
                    -I$(top_srcdir)/gnuradio-core/src/lib/io \
                    -I$(top_srcdir)/gnuradio-core/src/lib/g72x \
-                   -I$(top_srcdir)/gnuradio-core/src/lib/atsc \
                    -I$(top_srcdir)/gnuradio-core/src/lib/omnithread \
                    -I$(top_srcdir)/gnuradio-core/src/lib/swig \
                     -I$(top_builddir)/gnuradio-core/src/lib/swig \
                    $(FFTW3F_CFLAGS)
 
+# These used to be set in PKGCONFIG but now point to the current
+# build tree.
 GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \
                      -lgnuradio-core -lfftw3f -lm
 
 GNURADIO_I = $(top_builddir)/gnuradio-core/src/lib/swig/gnuradio.i
 
+# The below used to be set in PKGCONFIG but now point to the current
+# build tree.
 USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \
                -I$(top_srcdir)/usrp/firmware/include
 
 USRP_LIBS = -L$(top_builddir)/usrp/host/lib \
            -lusrp
 
+# 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) $(GNURADIO_INCLUDES) $(BOOST_CFLAGS)

Modified: gnuradio/branches/developers/jcorgan/ticket-10/TODO.build
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-10/TODO.build   2006-08-06 
18:06:22 UTC (rev 3191)
+++ gnuradio/branches/developers/jcorgan/ticket-10/TODO.build   2006-08-06 
19:52:00 UTC (rev 3192)
@@ -1,13 +1,11 @@
 Overall:
 
-* VPATH builds fail, starting with usrp.
-
 * Change a Makefile.am in a subdir, must manually go back up and re-run
 configure. Otherwise it gets run somehow incorrectly.
 
 * Fix overuse of LIBS vs. LIBADD, LDADD, or LDFLAGS, allong with xxx_
 
-* Make dist and distcheck have not been tested.
+* Use common run_tests.in file.  This is now ticket 3.
 
 dtools:
 
@@ -15,7 +13,7 @@
 
 gnuradio-core/doc:
 
-* Make hasn't been tested yet in this directory.
+* Make in this directory fails, logged as ticket 8.
 
 gnuradio-core/src/gen_interpolator_taps:
 
@@ -51,20 +49,5 @@
 
 * Make not tested in this directory
 
-usrp/firmware/include:
+All:
 
-* Refactor include directory specification in Makefile.am into 
-Makefile.common for use elsewhere
-
-usrp/firmware/lib:
-
-* Use refactored include directory specification from Makefile.common
-
-gr-usrp/src:
-
-* Use refactored gnuradio.i specification from Makefile.common
-
-* USRP_LIBS and USRP_INCLUDES are hardcoded.  These used to come out of 
-PKGCONFIG in the old system.
-
-* Use common run_tests.in

Modified: 
gnuradio/branches/developers/jcorgan/ticket-10/config/grc_gr_audio_oss.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-10/config/grc_gr_audio_oss.m4   
2006-08-06 18:06:22 UTC (rev 3191)
+++ gnuradio/branches/developers/jcorgan/ticket-10/config/grc_gr_audio_oss.m4   
2006-08-06 19:52:00 UTC (rev 3192)
@@ -28,11 +28,20 @@
 
     succeeded=yes
 
-    dnl needed for NetBSD
-    dnl FIXME: conditionalize on NetBSD platform
-    dnl AC_HAVE_LIBRARY(ossaudio,[],[succeeded=no])
-    AC_CHECK_HEADER(sys/soundcard.h,[],[succeeded=no])
+    case $target in
+       *-*-netbsd*)
+           AC_HAVE_LIBRARY(ossaudio,[],[succeeded=no])
+           if test $succeeded = yes; then
+               OSS_LIBS=-lossaudio
+               AC_MSG_RESULT([Using OSS library $OSS_LIBS])
+           fi
+           ;;
+       *)
+           AC_CHECK_HEADER(sys/soundcard.h,[],[succeeded=no])
+    esac
+
     if test $succeeded = yes; then
+       AC_SUBST(OSS_LIBS)
        dnl run_tests is created from run_tests.in.  Make it executable.
         AC_CONFIG_COMMANDS([run_tests_oss], [chmod +x 
gr-audio-oss/src/run_tests])
         subdirs="$subdirs gr-audio-oss"

Modified: 
gnuradio/branches/developers/jcorgan/ticket-10/gr-audio-oss/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-10/gr-audio-oss/src/Makefile.am 
2006-08-06 18:06:22 UTC (rev 3191)
+++ gnuradio/branches/developers/jcorgan/ticket-10/gr-audio-oss/src/Makefile.am 
2006-08-06 19:52:00 UTC (rev 3192)
@@ -71,6 +71,7 @@
 
 _audio_oss_la_LIBADD =                         \
        $(PYTHON_LDFLAGS)               \
+       $(OSS_LIBS)                     \
        -lstdc++                                
 
 _audio_oss_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version

Modified: 
gnuradio/branches/developers/jcorgan/ticket-10/gr-radio-astronomy/src/python/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jcorgan/ticket-10/gr-radio-astronomy/src/python/Makefile.am
    2006-08-06 18:06:22 UTC (rev 3191)
+++ 
gnuradio/branches/developers/jcorgan/ticket-10/gr-radio-astronomy/src/python/Makefile.am
    2006-08-06 19:52:00 UTC (rev 3192)
@@ -32,7 +32,9 @@
 wxguipythondir  = $(grpythondir)/wxgui
 wxguilibdir     = $(grpyexecdir)/wxgui
 
-EXTRA_DIST = run_tests.in
+EXTRA_DIST = run_tests.in              \
+            usrp_ra_receiver.py        \
+            usrp_psr_receiver.py
 
 
 TESTS =                                \