[Commit-gnuradio] r3213 - in gnuradio/branches/developers/jcorgan/ticket-10: . config gr-video-sdl/src

[jcorgan]

Author: jcorgan
Date: 2006-08-07 08:26:35 -0600 (Mon, 07 Aug 2006)
New Revision: 3213

Modified:
   gnuradio/branches/developers/jcorgan/ticket-10/config/grc_gr_video_sdl.m4
   gnuradio/branches/developers/jcorgan/ticket-10/configure.ac
   gnuradio/branches/developers/jcorgan/ticket-10/gr-video-sdl/src/Makefile.am
   gnuradio/branches/developers/jcorgan/ticket-10/gr-video-sdl/src/run_tests.in
Log:
gr-video-sdl completes VPATH build.

Modified: 
gnuradio/branches/developers/jcorgan/ticket-10/config/grc_gr_video_sdl.m4
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-10/config/grc_gr_video_sdl.m4   
2006-08-07 14:19:43 UTC (rev 3212)
+++ gnuradio/branches/developers/jcorgan/ticket-10/config/grc_gr_video_sdl.m4   
2006-08-07 14:26:35 UTC (rev 3213)
@@ -32,8 +32,11 @@
     AM_PATH_SDL($SDL_VERSION,[],[succeeded=no])
 
     if test $succeeded = yes; then
-        AM_CFLAGS="$AM_CFLAGS $SDL_CFLAGS"
-        AM_LDFLAGS="$AM_LDFLAGS $SDL_LIBS"
+        #AM_CFLAGS="$AM_CFLAGS $SDL_CFLAGS"
+        #AM_LDFLAGS="$AM_LDFLAGS $SDL_LIBS"
+       AC_SUBST(SDL_CFLAGS)
+       AC_SUBST(SDL_LIBS)
+
        dnl run_tests is created from run_tests.in.  Make it executable.
         AC_CONFIG_COMMANDS([run_tests_sdl], [chmod +x 
gr-video-sdl/src/run_tests])
         subdirs="$subdirs gr-video-sdl"

Modified: gnuradio/branches/developers/jcorgan/ticket-10/configure.ac
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-10/configure.ac 2006-08-07 
14:19:43 UTC (rev 3212)
+++ gnuradio/branches/developers/jcorgan/ticket-10/configure.ac 2006-08-07 
14:26:35 UTC (rev 3213)
@@ -162,7 +162,7 @@
 GRC_GR_GSM_FR_VOCODER
 GRC_GR_RADAR
 GRC_GR_RADIO_ASTRONOMY
-#GRC_GR_VIDEO_SDL
+GRC_GR_VIDEO_SDL
 #GRC_GR_WXGUI
 GRC_PMT
 

Modified: 
gnuradio/branches/developers/jcorgan/ticket-10/gr-video-sdl/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-10/gr-video-sdl/src/Makefile.am 
2006-08-07 14:19:43 UTC (rev 3212)
+++ gnuradio/branches/developers/jcorgan/ticket-10/gr-video-sdl/src/Makefile.am 
2006-08-07 14:26:35 UTC (rev 3213)
@@ -35,7 +35,7 @@
        video_sdl.i                             
 
 NON_LOCAL_IFILES =                     \
-       $(top_srcdir)/gnuradio-core/src/lib/swig/gnuradio.i
+       $(GNURADIO_I)
 
 ALL_IFILES =                           \
        $(LOCAL_IFILES)                 \

Modified: 
gnuradio/branches/developers/jcorgan/ticket-10/gr-video-sdl/src/run_tests.in
===================================================================
--- 
gnuradio/branches/developers/jcorgan/ticket-10/gr-video-sdl/src/run_tests.in    
    2006-08-07 14:19:43 UTC (rev 3212)
+++ 
gnuradio/branches/developers/jcorgan/ticket-10/gr-video-sdl/src/run_tests.in    
    2006-08-07 14:26:35 UTC (rev 3213)
@@ -18,9 +18,9 @@
 address@hidden@/gr-video-sdl/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