[Commit-gnuradio] r4326 - in gnuradio/trunk: . gnuradio-core/src/lib/fil

commit-gnuradio

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commit-gnuradio] r4326 - in gnuradio/trunk: . gnuradio-core/src/lib/fil

From:	eb
Subject:	[Commit-gnuradio] r4326 - in gnuradio/trunk: . gnuradio-core/src/lib/filter gnuradio-core/src/lib/gengen gnuradio-core/src/lib/swig pmt/src/lib usrp/firmware/include usrp/firmware/src/common usrp/firmware/src/usrp2 usrp/host/lib
Date:	Mon, 29 Jan 2007 17:34:14 -0700 (MST)

Author: eb
Date: 2007-01-29 17:34:14 -0700 (Mon, 29 Jan 2007)
New Revision: 4326

Modified:
   gnuradio/trunk/gnuradio-core/src/lib/filter/Makefile.am
   gnuradio/trunk/gnuradio-core/src/lib/gengen/Makefile.am
   gnuradio/trunk/gnuradio-core/src/lib/swig/Makefile.am
   gnuradio/trunk/pmt/src/lib/Makefile.am
   gnuradio/trunk/run_tests.sh.in
   gnuradio/trunk/usrp/firmware/include/Makefile.am
   gnuradio/trunk/usrp/firmware/src/common/Makefile.am
   gnuradio/trunk/usrp/firmware/src/usrp2/Makefile.am
   gnuradio/trunk/usrp/host/lib/Makefile.am
Log:
Fix for ticket:133, merged from eb/bsd 4322:4324.


Modified: gnuradio/trunk/gnuradio-core/src/lib/filter/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/filter/Makefile.am     2007-01-29 
23:21:25 UTC (rev 4325)
+++ gnuradio/trunk/gnuradio-core/src/lib/filter/Makefile.am     2007-01-30 
00:34:14 UTC (rev 4326)
@@ -69,7 +69,7 @@
 
 
 $(GENERATED_H) $(GENERATED_I) $(GENERATED_CC): $(CODE_GENERATOR)
-       PYTHONPATH=$(top_srcdir)/gnuradio-core/src/python srcdir=$(srcdir) 
$(srcdir)/generate_all.py
+       PYTHONPATH=$(top_srcdir)/gnuradio-core/src/python srcdir=$(srcdir) 
$(PYTHON) $(srcdir)/generate_all.py
 
 
 BUILT_SOURCES = $(GENERATED_H) $(GENERATED_I) $(GENERATED_CC)

Modified: gnuradio/trunk/gnuradio-core/src/lib/gengen/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/gengen/Makefile.am     2007-01-29 
23:21:25 UTC (rev 4325)
+++ gnuradio/trunk/gnuradio-core/src/lib/gengen/Makefile.am     2007-01-30 
00:34:14 UTC (rev 4326)
@@ -92,7 +92,7 @@
 
 
 $(GENERATED_H) $(GENERATED_I) $(GENERATED_CC): $(CODE_GENERATOR)
-       PYTHONPATH=$(top_srcdir)/gnuradio-core/src/python srcdir=$(srcdir) 
$(srcdir)/generate_all.py
+       PYTHONPATH=$(top_srcdir)/gnuradio-core/src/python srcdir=$(srcdir) 
$(PYTHON) $(srcdir)/generate_all.py
 
 
 BUILT_SOURCES = $(GENERATED_H) $(GENERATED_I) $(GENERATED_CC)

Modified: gnuradio/trunk/gnuradio-core/src/lib/swig/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/swig/Makefile.am       2007-01-29 
23:21:25 UTC (rev 4325)
+++ gnuradio/trunk/gnuradio-core/src/lib/swig/Makefile.am       2007-01-30 
00:34:14 UTC (rev 4326)
@@ -268,7 +268,7 @@
 # FIXME As of swig 1.3.31, this still seems to be required...
 
 gnuradio_swig_bug_workaround.h : gnuradio_swig_py_runtime.cc 
$(srcdir)/gen-swig-bug-fix
-       $(srcdir)/gen-swig-bug-fix gnuradio_swig_py_runtime.cc $@
+       $(PYTHON) $(srcdir)/gen-swig-bug-fix gnuradio_swig_py_runtime.cc $@
 
 # ----------------------------------------------------------------
 

Modified: gnuradio/trunk/pmt/src/lib/Makefile.am
===================================================================
--- gnuradio/trunk/pmt/src/lib/Makefile.am      2007-01-29 23:21:25 UTC (rev 
4325)
+++ gnuradio/trunk/pmt/src/lib/Makefile.am      2007-01-30 00:34:14 UTC (rev 
4326)
@@ -46,7 +46,7 @@
 
 
 $(GENERATED_H) $(GENERATED_I) $(GENERATED_CC): $(CODE_GENERATOR)
-       PYTHONPATH=$(top_srcdir)/pmt/src/lib srcdir=$(srcdir) 
$(srcdir)/generate_unv.py
+       PYTHONPATH=$(top_srcdir)/pmt/src/lib srcdir=$(srcdir) $(PYTHON) 
$(srcdir)/generate_unv.py
 
 BUILT_SOURCES = $(GENERATED_H) $(GENERATED_CC)
 

Modified: gnuradio/trunk/run_tests.sh.in
===================================================================
--- gnuradio/trunk/run_tests.sh.in      2007-01-29 23:21:25 UTC (rev 4325)
+++ gnuradio/trunk/run_tests.sh.in      2007-01-30 00:34:14 UTC (rev 4326)
@@ -47,7 +47,7 @@
 ok=yes
 for file in $3/qa_*.py
 do
-  if ! $file
+  if ! @PYTHON@ $file
   then
     ok=no
   fi  

Modified: gnuradio/trunk/usrp/firmware/include/Makefile.am
===================================================================
--- gnuradio/trunk/usrp/firmware/include/Makefile.am    2007-01-29 23:21:25 UTC 
(rev 4325)
+++ gnuradio/trunk/usrp/firmware/include/Makefile.am    2007-01-30 00:34:14 UTC 
(rev 4326)
@@ -53,7 +53,7 @@
        $(CODE_GENERATOR)
 
 fpga_regs_common.v: fpga_regs_common.h generate_regs.py 
-       PYTHONPATH=$(top_srcdir)/usrp/firmware/include 
$(srcdir)/generate_regs.py fpga_regs_common.h $@
+       PYTHONPATH=$(top_srcdir)/usrp/firmware/include $(PYTHON) 
$(srcdir)/generate_regs.py fpga_regs_common.h $@
 
 fpga_regs_standard.v: fpga_regs_standard.h generate_regs.py
-       PYTHONPATH=$(top_srcdir)/usrp/firmware/include 
$(srcdir)/generate_regs.py fpga_regs_standard.h $@
+       PYTHONPATH=$(top_srcdir)/usrp/firmware/include $(PYTHON) 
$(srcdir)/generate_regs.py fpga_regs_standard.h $@

Modified: gnuradio/trunk/usrp/firmware/src/common/Makefile.am
===================================================================
--- gnuradio/trunk/usrp/firmware/src/common/Makefile.am 2007-01-29 23:21:25 UTC 
(rev 4325)
+++ gnuradio/trunk/usrp/firmware/src/common/Makefile.am 2007-01-30 00:34:14 UTC 
(rev 4326)
@@ -39,7 +39,7 @@
 all: usrp_gpif.c
 
 usrp_gpif.c usrp_gpif_inline.h : gpif.c
-       srcdir=$(srcdir) $(srcdir)/edit-gpif $(srcdir)/gpif.c usrp_gpif.c 
usrp_gpif_inline.h
+       srcdir=$(srcdir) $(PYTHON) $(srcdir)/edit-gpif $(srcdir)/gpif.c 
usrp_gpif.c usrp_gpif_inline.h
 
 CLEANFILES = \
        *.ihx *.lnk *.lst *.map *.mem *.rel *.rst *.sym *.asm *.lib \

Modified: gnuradio/trunk/usrp/firmware/src/usrp2/Makefile.am
===================================================================
--- gnuradio/trunk/usrp/firmware/src/usrp2/Makefile.am  2007-01-29 23:21:25 UTC 
(rev 4325)
+++ gnuradio/trunk/usrp/firmware/src/usrp2/Makefile.am  2007-01-30 00:34:14 UTC 
(rev 4326)
@@ -108,11 +108,11 @@
        $(XCC) $(LINKOPTS) -o $@ $(EEPROM_BOOT_OBJS)
 
 burn-usrp2-eeprom: eeprom_boot.ihx
-       $(srcdir)/../common/build_eeprom.py -r2 eeprom_boot.ihx > $@
+       $(PYTHON) $(srcdir)/../common/build_eeprom.py -r2 eeprom_boot.ihx > $@
        chmod +x $@
 
 burn-usrp4-eeprom: eeprom_boot.ihx
-       $(srcdir)/../common/build_eeprom.py -r4 eeprom_boot.ihx > $@
+       $(PYTHON) $(srcdir)/../common/build_eeprom.py -r4 eeprom_boot.ihx > $@
        chmod +x $@
 
 
@@ -159,7 +159,7 @@
 all: usrp_gpif.c
 
 usrp_gpif.c usrp_gpif_inline.h : gpif.c
-       srcdir=$(srcdir) $(srcdir)/edit-gpif $(srcdir)/gpif.c usrp_gpif.c 
usrp_gpif_inline.h
+       srcdir=$(srcdir) $(PYTHON) $(srcdir)/edit-gpif $(srcdir)/gpif.c 
usrp_gpif.c usrp_gpif_inline.h
 
 
 # dependencies

Modified: gnuradio/trunk/usrp/host/lib/Makefile.am
===================================================================
--- gnuradio/trunk/usrp/host/lib/Makefile.am    2007-01-29 23:21:25 UTC (rev 
4325)
+++ gnuradio/trunk/usrp/host/lib/Makefile.am    2007-01-30 00:34:14 UTC (rev 
4326)
@@ -146,7 +146,7 @@
        dump_data.py
 
 usrp_dbid.py usrp_dbid.h usrp_dbid.cc: gen_usrp_dbid.py usrp_dbid.dat
-       PYTHONPATH=$(top_srcdir)/usrp/src srcdir=$(srcdir) 
$(srcdir)/gen_usrp_dbid.py $(srcdir)/usrp_dbid.dat
+       PYTHONPATH=$(top_srcdir)/usrp/src srcdir=$(srcdir) $(PYTHON) 
$(srcdir)/gen_usrp_dbid.py $(srcdir)/usrp_dbid.dat
 
 MOSTLYCLEANFILES = \
        $(BUILT_SOURCES) *~ *.pyc

[Prev in Thread]

Current Thread

[Next in Thread]

[Commit-gnuradio] r4326 - in gnuradio/trunk: . gnuradio-core/src/lib/filter gnuradio-core/src/lib/gengen gnuradio-core/src/lib/swig pmt/src/lib usrp/firmware/include usrp/firmware/src/common usrp/firmware/src/usrp2 usrp/host/lib, eb <=

Prev by Date: [Commit-gnuradio] r4325 - gnuradio/branches/developers/n4hy/ofdm2/gnuradio-examples/python/usrp
Next by Date: [Commit-gnuradio] r4327 - gnuradio/branches/developers/eb
Previous by thread: [Commit-gnuradio] r4325 - gnuradio/branches/developers/n4hy/ofdm2/gnuradio-examples/python/usrp
Next by thread: [Commit-gnuradio] r4327 - gnuradio/branches/developers/eb
Index(es):
- Date
- Thread