commit-gnuradio
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commit-gnuradio] r3283 - in gnuradio/branches/developers/jcorgan/ticket

From: jcorgan
Subject: [Commit-gnuradio] r3283 - in gnuradio/branches/developers/jcorgan/ticket-35: gr-atsc/src/lib gr-audio-oss/src gr-audio-windows/src gr-gsm-fr-vocoder/src/lib gr-trellis/src/lib gr-usrp/src gr-video-sdl/src
Date: Mon, 14 Aug 2006 18:56:08 -0600 (MDT) 
Author: jcorgan
Date: 2006-08-14 18:56:07 -0600 (Mon, 14 Aug 2006)
New Revision: 3283

Modified:
   gnuradio/branches/developers/jcorgan/ticket-35/gr-atsc/src/lib/Makefile.am
   gnuradio/branches/developers/jcorgan/ticket-35/gr-audio-oss/src/Makefile.am
   
gnuradio/branches/developers/jcorgan/ticket-35/gr-audio-windows/src/Makefile.am
   
gnuradio/branches/developers/jcorgan/ticket-35/gr-gsm-fr-vocoder/src/lib/Makefile.am
   gnuradio/branches/developers/jcorgan/ticket-35/gr-trellis/src/lib/Makefile.am
   gnuradio/branches/developers/jcorgan/ticket-35/gr-usrp/src/Makefile.am
   gnuradio/branches/developers/jcorgan/ticket-35/gr-video-sdl/src/Makefile.am
Log:
Reworked BSD make changes to pass VPATH build.

'make distcheck' passes on i686-linux, but will fail on BSD because
$(RM) issue hasn't been resolved yet.


Modified: 
gnuradio/branches/developers/jcorgan/ticket-35/gr-atsc/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-35/gr-atsc/src/lib/Makefile.am  
2006-08-14 22:44:48 UTC (rev 3282)
+++ gnuradio/branches/developers/jcorgan/ticket-35/gr-atsc/src/lib/Makefile.am  
2006-08-15 00:56:07 UTC (rev 3283)
@@ -221,7 +221,7 @@
        $(GNURADIO_I)
 
 LOCAL_IFILES =                                 \
-       atsc.i                          
+       $(top_srcdir)/gr-atsc/src/lib/atsc.i                            
 
 # These files are built by SWIG.  The first is the C++ glue.
 # The second is the python wrapper that loads the _atsc shared library
@@ -253,7 +253,7 @@
        -lstdc++                        
 
 atsc.cc atsc.py: atsc.i $(ALL_IFILES)
-       $(SWIG) $(SWIGCPPPYTHONARGS) -module atsc -o atsc.cc atsc.i
+       $(SWIG) $(SWIGCPPPYTHONARGS) -module atsc -o atsc.cc $(LOCAL_IFILES)
 
 # These swig headers get installed in ${prefix}/include/gnuradio/swig
 swiginclude_HEADERS =                  \

Modified: 
gnuradio/branches/developers/jcorgan/ticket-35/gr-audio-oss/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-35/gr-audio-oss/src/Makefile.am 
2006-08-14 22:44:48 UTC (rev 3282)
+++ gnuradio/branches/developers/jcorgan/ticket-35/gr-audio-oss/src/Makefile.am 
2006-08-15 00:56:07 UTC (rev 3283)
@@ -32,7 +32,7 @@
 TESTS = run_tests
 
 LOCAL_IFILES =                                 \
-       audio_oss.i                             
+       $(top_srcdir)/gr-audio-oss/src/audio_oss.i
 
 NON_LOCAL_IFILES =                     \
        $(GNURADIO_I)
@@ -75,8 +75,8 @@
 
 _audio_oss_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
 
-audio_oss.cc audio_oss.py: audio_oss.i $(NON_LOCAL_IFILES)
-       $(SWIG) $(SWIGPYTHONARGS) -module audio_oss -o audio_oss.cc audio_oss.i
+audio_oss.cc audio_oss.py: $(LOCAL_IFILES) $(NON_LOCAL_IFILES)
+       $(SWIG) $(SWIGPYTHONARGS) -module audio_oss -o audio_oss.cc 
$(LOCAL_IFILES)
 
 # Don't distribute output of swig
 dist-hook:

Modified: 
gnuradio/branches/developers/jcorgan/ticket-35/gr-audio-windows/src/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jcorgan/ticket-35/gr-audio-windows/src/Makefile.am 
    2006-08-14 22:44:48 UTC (rev 3282)
+++ 
gnuradio/branches/developers/jcorgan/ticket-35/gr-audio-windows/src/Makefile.am 
    2006-08-15 00:56:07 UTC (rev 3283)
@@ -32,7 +32,7 @@
 TESTS = run_tests
 
 LOCAL_IFILES =                                 \
-       audio_windows.i                         
+       $(top_srcdir)/gr-audio-windows/src/audio_windows.i                      
        
 
 NON_LOCAL_IFILES =                     \
        $(GNURADIO_I)
@@ -76,8 +76,8 @@
 _audio_windows_la_LDFLAGS = -no-undefined -module -avoid-version \
                             $(LIBGNURADIO_CORE_EXTRA_LDFLAGS)
 
-audio_windows.cc audio_windows.py: audio_windows.i
-       $(SWIG) $(SWIGCPPPYTHONARGS) -module audio_windows -o audio_windows.cc 
$<
+audio_windows.cc audio_windows.py: $(LOCAL_IFILES)
+       $(SWIG) $(SWIGCPPPYTHONARGS) -module audio_windows -o audio_windows.cc 
$(LOCAL_IFILES)
 
 
 noinst_PYTHON = qa_audio_windows.py

Modified: 
gnuradio/branches/developers/jcorgan/ticket-35/gr-gsm-fr-vocoder/src/lib/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jcorgan/ticket-35/gr-gsm-fr-vocoder/src/lib/Makefile.am
        2006-08-14 22:44:48 UTC (rev 3282)
+++ 
gnuradio/branches/developers/jcorgan/ticket-35/gr-gsm-fr-vocoder/src/lib/Makefile.am
        2006-08-15 00:56:07 UTC (rev 3283)
@@ -44,7 +44,7 @@
 
 
 LOCAL_IFILES =                                 \
-       gsm_full_rate.i                         
+       $(top_srcdir)/gr-gsm-fr-vocoder/src/lib/gsm_full_rate.i                 
        
 
 # These files are built by SWIG.  The first is the C++ glue.
 # The second is the python wrapper that loads the _howto shared library
@@ -80,7 +80,7 @@
        -lstdc++                        
 
 gsm_full_rate.cc gsm_full_rate.py: gsm_full_rate.i $(ALL_IFILES)
-       $(SWIG) $(SWIGPYTHONARGS) -module gsm_full_rate -o gsm_full_rate.cc 
gsm_full_rate.i
+       $(SWIG) $(SWIGPYTHONARGS) -module gsm_full_rate -o gsm_full_rate.cc 
$(LOCAL_IFILES)
 
 # These headers get installed in ${prefix}/include/gnuradio
 grinclude_HEADERS =                    \

Modified: 
gnuradio/branches/developers/jcorgan/ticket-35/gr-trellis/src/lib/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jcorgan/ticket-35/gr-trellis/src/lib/Makefile.am   
    2006-08-14 22:44:48 UTC (rev 3282)
+++ 
gnuradio/branches/developers/jcorgan/ticket-35/gr-trellis/src/lib/Makefile.am   
    2006-08-15 00:56:07 UTC (rev 3283)
@@ -43,7 +43,7 @@
 
 
 LOCAL_IFILES =                                 \
-       trellis.i                       
+       $(top_srcdir)/gr-trellis/src/lib/trellis.i                      
 
 
 # These files are built by SWIG.  The first is the C++ glue.
@@ -80,8 +80,8 @@
        $(GNURADIO_CORE_LIBS)           \
        -lstdc++                        
 
-trellis.cc trellis.py: trellis.i $(ALL_IFILES)
-       $(SWIG) $(SWIGPYTHONARGS) -module trellis -o trellis.cc trellis.i
+trellis.cc trellis.py: $(ALL_IFILES)
+       $(SWIG) $(SWIGPYTHONARGS) -module trellis -o trellis.cc $(LOCAL_IFILES)
 
 # These headers get installed in ${prefix}/include/gnuradio
 grinclude_HEADERS =                    \

Modified: gnuradio/branches/developers/jcorgan/ticket-35/gr-usrp/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-35/gr-usrp/src/Makefile.am      
2006-08-14 22:44:48 UTC (rev 3282)
+++ gnuradio/branches/developers/jcorgan/ticket-35/gr-usrp/src/Makefile.am      
2006-08-15 00:56:07 UTC (rev 3283)
@@ -32,7 +32,7 @@
 TESTS = run_tests
 
 LOCAL_IFILES =                                 \
-       usrp1.i                         
+       $(top_srcdir)/gr-usrp/src/usrp1.i                               
 
 NON_LOCAL_IFILES = $(GNURADIO_I)
 
@@ -102,8 +102,8 @@
 _usrp1_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
 
 
-usrp1.cc usrp1.py: usrp1.i $(NON_LOCAL_IFILES)
-       $(SWIG) $(SWIGPYTHONARGS) -module usrp1 -o usrp1.cc usrp1.i
+usrp1.cc usrp1.py: usrp1.i $(NON_LOCAL_IFILES) $(LOCAL_IFILES)
+       $(SWIG) $(SWIGPYTHONARGS) -module usrp1 -o usrp1.cc $(LOCAL_IFILES)
 
 
 noinst_PYTHON =                                \

Modified: 
gnuradio/branches/developers/jcorgan/ticket-35/gr-video-sdl/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-35/gr-video-sdl/src/Makefile.am 
2006-08-14 22:44:48 UTC (rev 3282)
+++ gnuradio/branches/developers/jcorgan/ticket-35/gr-video-sdl/src/Makefile.am 
2006-08-15 00:56:07 UTC (rev 3283)
@@ -32,7 +32,7 @@
 TESTS = run_tests
 
 LOCAL_IFILES =                                 \
-       video_sdl.i                             
+       $(top_srcdir)/gr-video-sdl/src/video_sdl.i                              
 
 NON_LOCAL_IFILES =                     \
        $(GNURADIO_I)
@@ -75,8 +75,8 @@
 
 _video_sdl_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
 
-video_sdl.cc video_sdl.py: video_sdl.i
-       $(SWIG) $(SWIGCPPPYTHONARGS) -module video_sdl -o video_sdl.cc 
video_sdl.i
+video_sdl.cc video_sdl.py: $(ALL_IFILES)
+       $(SWIG) $(SWIGCPPPYTHONARGS) -module video_sdl -o video_sdl.cc 
$(LOCAL_IFILES)
 
 
 noinst_PYTHON = qa_video_sdl.py
reply via email to
[Prev in Thread] Current Thread [Next in Thread]