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

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

From: jcorgan
Subject: [Commit-gnuradio] r3280 - in gnuradio/branches/developers/jcorgan/ticket-35: gnuradio-core/src/lib/swig gr-atsc/src/lib gr-audio-oss/src gr-gsm-fr-vocoder/src/lib gr-trellis/src/lib gr-usrp/src gr-video-sdl/src usrp/firmware/lib usrp/firmware/src/usrp2 usrp/host/swig
Date: Mon, 14 Aug 2006 13:52:10 -0600 (MDT) 
Author: jcorgan
Date: 2006-08-14 13:52:10 -0600 (Mon, 14 Aug 2006)
New Revision: 3280

Modified:
   
gnuradio/branches/developers/jcorgan/ticket-35/gnuradio-core/src/lib/swig/Makefile.am
   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-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
   gnuradio/branches/developers/jcorgan/ticket-35/usrp/firmware/lib/Makefile.am
   
gnuradio/branches/developers/jcorgan/ticket-35/usrp/firmware/src/usrp2/Makefile.am
   gnuradio/branches/developers/jcorgan/ticket-35/usrp/host/swig/Makefile.am
Log:
Applied bsdmake.patch supplied by gdt. Trial fix for ticket:35.

Modified: 
gnuradio/branches/developers/jcorgan/ticket-35/gnuradio-core/src/lib/swig/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jcorgan/ticket-35/gnuradio-core/src/lib/swig/Makefile.am
       2006-08-14 15:57:24 UTC (rev 3279)
+++ 
gnuradio/branches/developers/jcorgan/ticket-35/gnuradio-core/src/lib/swig/Makefile.am
       2006-08-14 19:52:10 UTC (rev 3280)
@@ -83,7 +83,7 @@
 gnuradio_swig_python.py gnuradio_swig_python.h: gnuradio_swig_python.cc
 
 gnuradio_swig_python.cc : gnuradio.i
-       if $(SWIG) $(SWIGPYTHONARGS) -MMD -MF gnuradio_swig_python.Td -module 
gnuradio_swig_python -o gnuradio_swig_python.cc $< ;\
+       if $(SWIG) $(SWIGPYTHONARGS) -MMD -MF gnuradio_swig_python.Td -module 
gnuradio_swig_python -o gnuradio_swig_python.cc gnuradio.i ;\
        then if test $(host_os) = mingw32; \
             then sed 's,\\\\,/,g' <gnuradio_swig_python.Td 
>gnuradio_swig_python.d; rm -f gnuradio_swig_python.Td; \
             else mv -f gnuradio_swig_python.Td gnuradio_swig_python.d; fi \
@@ -91,7 +91,7 @@
 
 
 gnuradio_swig_bug_workaround.h : gnuradio_swig_python.cc 
$(srcdir)/gen-swig-bug-fix
-       $(srcdir)/gen-swig-bug-fix $< $@
+       $(srcdir)/gen-swig-bug-fix gnuradio_swig_python.cc $@
 
 
 # ----------------------------------------------------------------

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 15:57:24 UTC (rev 3279)
+++ gnuradio/branches/developers/jcorgan/ticket-35/gr-atsc/src/lib/Makefile.am  
2006-08-14 19:52:10 UTC (rev 3280)
@@ -253,7 +253,7 @@
        -lstdc++                        
 
 atsc.cc atsc.py: atsc.i $(ALL_IFILES)
-       $(SWIG) $(SWIGCPPPYTHONARGS) -module atsc -o atsc.cc $<
+       $(SWIG) $(SWIGCPPPYTHONARGS) -module atsc -o atsc.cc atsc.i
 
 # 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 15:57:24 UTC (rev 3279)
+++ gnuradio/branches/developers/jcorgan/ticket-35/gr-audio-oss/src/Makefile.am 
2006-08-14 19:52:10 UTC (rev 3280)
@@ -76,7 +76,7 @@
 _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 $<
+       $(SWIG) $(SWIGPYTHONARGS) -module audio_oss -o audio_oss.cc audio_oss.i
 
 # Don't distribute output of swig
 dist-hook:

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 15:57:24 UTC (rev 3279)
+++ 
gnuradio/branches/developers/jcorgan/ticket-35/gr-gsm-fr-vocoder/src/lib/Makefile.am
        2006-08-14 19:52:10 UTC (rev 3280)
@@ -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 $<
+       $(SWIG) $(SWIGPYTHONARGS) -module gsm_full_rate -o gsm_full_rate.cc 
gsm_full_rate.i
 
 # 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 15:57:24 UTC (rev 3279)
+++ 
gnuradio/branches/developers/jcorgan/ticket-35/gr-trellis/src/lib/Makefile.am   
    2006-08-14 19:52:10 UTC (rev 3280)
@@ -81,7 +81,7 @@
        -lstdc++                        
 
 trellis.cc trellis.py: trellis.i $(ALL_IFILES)
-       $(SWIG) $(SWIGPYTHONARGS) -module trellis -o trellis.cc $<
+       $(SWIG) $(SWIGPYTHONARGS) -module trellis -o trellis.cc trellis.i
 
 # 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 15:57:24 UTC (rev 3279)
+++ gnuradio/branches/developers/jcorgan/ticket-35/gr-usrp/src/Makefile.am      
2006-08-14 19:52:10 UTC (rev 3280)
@@ -103,7 +103,7 @@
 
 
 usrp1.cc usrp1.py: usrp1.i $(NON_LOCAL_IFILES)
-       $(SWIG) $(SWIGPYTHONARGS) -module usrp1 -o usrp1.cc $<
+       $(SWIG) $(SWIGPYTHONARGS) -module usrp1 -o usrp1.cc usrp1.i
 
 
 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 15:57:24 UTC (rev 3279)
+++ gnuradio/branches/developers/jcorgan/ticket-35/gr-video-sdl/src/Makefile.am 
2006-08-14 19:52:10 UTC (rev 3280)
@@ -76,7 +76,7 @@
 _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 $<
+       $(SWIG) $(SWIGCPPPYTHONARGS) -module video_sdl -o video_sdl.cc 
video_sdl.i
 
 
 noinst_PYTHON = qa_video_sdl.py

Modified: 
gnuradio/branches/developers/jcorgan/ticket-35/usrp/firmware/lib/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jcorgan/ticket-35/usrp/firmware/lib/Makefile.am    
    2006-08-14 15:57:24 UTC (rev 3279)
+++ 
gnuradio/branches/developers/jcorgan/ticket-35/usrp/firmware/lib/Makefile.am    
    2006-08-14 19:52:10 UTC (rev 3280)
@@ -57,13 +57,9 @@
 
 all: libfx2.lib
 
-%.rel : %.c
+.c.rel:
        $(XCC) $(INCLUDES) $(DEFINES) -c $< -o $@
 
-%.rel : %.a51
-       $(XAS) $<
-
-
 $(LIBRARY): $(LIBOBJS)
        -rm -f $(LIBRARY)
        touch $(LIBRARY)

Modified: 
gnuradio/branches/developers/jcorgan/ticket-35/usrp/firmware/src/usrp2/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jcorgan/ticket-35/usrp/firmware/src/usrp2/Makefile.am
  2006-08-14 15:57:24 UTC (rev 3279)
+++ 
gnuradio/branches/developers/jcorgan/ticket-35/usrp/firmware/src/usrp2/Makefile.am
  2006-08-14 19:52:10 UTC (rev 3280)
@@ -90,11 +90,11 @@
        burn-usrp4-eeprom
 
 
-%.rel : %.c
+.c.rel:
        $(XCC) $(INCLUDES) $(DEFINES) \
                -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
 
-%.rel : %.a51
+.a51.rel:
        test -f `basename '$<'` || ln -s '$<' .
        test -f ../common/`basename '$<'` -o \
                \! -f `dirname '$<'`/../common/`basename '$<'` \
@@ -108,11 +108,11 @@
        $(XCC) $(LINKOPTS) -o $@ $(EEPROM_BOOT_OBJS)
 
 burn-usrp2-eeprom: eeprom_boot.ihx
-       $(srcdir)/../common/build_eeprom.py -r2 $< > $@
+       $(srcdir)/../common/build_eeprom.py -r2 eeprom_boot.ihx > $@
        chmod +x $@
 
 burn-usrp4-eeprom: eeprom_boot.ihx
-       $(srcdir)/../common/build_eeprom.py -r4 $< > $@
+       $(srcdir)/../common/build_eeprom.py -r4 eeprom_boot.ihx > $@
        chmod +x $@
 
 

Modified: 
gnuradio/branches/developers/jcorgan/ticket-35/usrp/host/swig/Makefile.am
===================================================================
--- gnuradio/branches/developers/jcorgan/ticket-35/usrp/host/swig/Makefile.am   
2006-08-14 15:57:24 UTC (rev 3279)
+++ gnuradio/branches/developers/jcorgan/ticket-35/usrp/host/swig/Makefile.am   
2006-08-14 19:52:10 UTC (rev 3280)
@@ -71,7 +71,7 @@
 
 
 prims.cc usrp_prims.py : prims.i ../../firmware/include/fpga_regs_common.h 
../../firmware/include/fpga_regs_standard.h
-       $(SWIG) $(SWIGPYTHONARGS) -module usrp_prims -o prims.cc $<
+       $(SWIG) $(SWIGPYTHONARGS) -module usrp_prims -o prims.cc prims.i
 
 
 MOSTLYCLEANFILES = \
reply via email to
[Prev in Thread] Current Thread [Next in Thread]