[Commit-gnuradio] r3205 - in gnuradio/branches/developers/jcorgan/ticket-10: . config gr-audio-windows/src

[jcorgan]

Author: jcorgan
Date: 2006-08-07 00:00:10 -0600 (Mon, 07 Aug 2006)
New Revision: 3205

Modified:
   gnuradio/branches/developers/jcorgan/ticket-10/config/grc_gr_audio_windows.m4
   gnuradio/branches/developers/jcorgan/ticket-10/configure.ac
   
gnuradio/branches/developers/jcorgan/ticket-10/gr-audio-windows/src/Makefile.am
   
gnuradio/branches/developers/jcorgan/ticket-10/gr-audio-windows/src/run_tests.in
Log:
gr-audio-windows *should* complete VPATH build, but this is not tested.


Modified: 
gnuradio/branches/developers/jcorgan/ticket-10/config/grc_gr_audio_windows.m4
===================================================================
--- 
gnuradio/branches/developers/jcorgan/ticket-10/config/grc_gr_audio_windows.m4   
    2006-08-07 05:55:14 UTC (rev 3204)
+++ 
gnuradio/branches/developers/jcorgan/ticket-10/config/grc_gr_audio_windows.m4   
    2006-08-07 06:00:10 UTC (rev 3205)
@@ -30,6 +30,9 @@
     AC_HAVE_LIBRARY(winmm,[],[succeeded=no])
 
     if test $succeeded = yes; then
+       WINAUDIO_LIBS=-lwinmm
+       AC_SUBST(WINAUDIO_LIBS)
+
        dnl run_tests is created from run_tests.in.  Make it executable.
         AC_CONFIG_COMMANDS([run_tests_windows], [chmod +x 
gr-audio-windows/src/run_tests])
         subdirs="$subdirs gr-audio-windows"

Modified: gnuradio/branches/developers/jcorgan/ticket-10/configure.ac
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-10/configure.ac 2006-08-07 
05:55:14 UTC (rev 3204)
+++ gnuradio/branches/developers/jcorgan/ticket-10/configure.ac 2006-08-07 
06:00:10 UTC (rev 3205)
@@ -155,7 +155,7 @@
 GRC_GR_AUDIO_OSS
 GRC_GR_AUDIO_OSX               dnl ***NOT TESTED***
 GRC_GR_AUDIO_PORTAUDIO         dnl ***NOT TESTED***
-#GRC_GR_AUDIO_WINDOWS          dnl ***NOT TESTED***
+GRC_GR_AUDIO_WINDOWS           dnl ***NOT TESTED***
 GRC_GR_ATSC
 #GRC_GR_COMEDI
 #GRC_GR_ERROR_CORRECTING_CODES

Modified: 
gnuradio/branches/developers/jcorgan/ticket-10/gr-audio-windows/src/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jcorgan/ticket-10/gr-audio-windows/src/Makefile.am 
    2006-08-07 05:55:14 UTC (rev 3204)
+++ 
gnuradio/branches/developers/jcorgan/ticket-10/gr-audio-windows/src/Makefile.am 
    2006-08-07 06:00:10 UTC (rev 3205)
@@ -35,7 +35,7 @@
        audio_windows.i                         
 
 NON_LOCAL_IFILES =                     \
-       $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i
+       $(GNURADIO_I)
 
 ALL_IFILES =                           \
        $(LOCAL_IFILES)                 \
@@ -71,7 +71,7 @@
 _audio_windows_la_LIBADD =             \
        $(PYTHON_LDFLAGS)               \
        $(GNURADIO_CORE_LIBS)           \
-       -lwinmm                         \
+       $(WINAUDIO_LIBS)                \
        -lstdc++                                
 
 _audio_windows_la_LDFLAGS = -no-undefined -module -avoid-version \

Modified: 
gnuradio/branches/developers/jcorgan/ticket-10/gr-audio-windows/src/run_tests.in
===================================================================
--- 
gnuradio/branches/developers/jcorgan/ticket-10/gr-audio-windows/src/run_tests.in
    2006-08-07 05:55:14 UTC (rev 3204)
+++ 
gnuradio/branches/developers/jcorgan/ticket-10/gr-audio-windows/src/run_tests.in
    2006-08-07 06:00:10 UTC (rev 3205)
@@ -18,9 +18,9 @@
 address@hidden@/gr-audio-windows/src
 
 # Where to look for GNU Radio python modules in current build tree
-# FIXME this is wrong on a distcheck.  We really need to ask gnuradio-core
-# where it put its python files.
address@hidden@/gnuradio-core/src/python/:@abs_top_builddir@/gnuradio-core/src/lib/swig/:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
address@hidden@/gnuradio-core/src/python
+grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig
+grpythonbld=$grpythonbld:@abs_top_builddir@/gnuradio-core/src/lib/swig/.libs
 
 PYTHONPATH="$grpythonbld:$libbld:$libbld/.libs:$libsrc:$py:$PYTHONPATH"
 export PYTHONPATH