[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r4323 - in gnuradio/branches/developers/eb/bsd: . gnur
From: |
eb |
Subject: |
[Commit-gnuradio] r4323 - in gnuradio/branches/developers/eb/bsd: . gnuradio-core/src/lib/filter gnuradio-core/src/lib/gengen pmt/src/lib usrp/firmware/include usrp/firmware/src/common usrp/firmware/src/usrp2 usrp/host/lib |
Date: |
Mon, 29 Jan 2007 15:30:29 -0700 (MST) |
Author: eb
Date: 2007-01-29 15:30:28 -0700 (Mon, 29 Jan 2007)
New Revision: 4323
Modified:
gnuradio/branches/developers/eb/bsd/gnuradio-core/src/lib/filter/Makefile.am
gnuradio/branches/developers/eb/bsd/gnuradio-core/src/lib/gengen/Makefile.am
gnuradio/branches/developers/eb/bsd/pmt/src/lib/Makefile.am
gnuradio/branches/developers/eb/bsd/run_tests.sh.in
gnuradio/branches/developers/eb/bsd/usrp/firmware/include/Makefile.am
gnuradio/branches/developers/eb/bsd/usrp/firmware/src/common/Makefile.am
gnuradio/branches/developers/eb/bsd/usrp/firmware/src/usrp2/Makefile.am
gnuradio/branches/developers/eb/bsd/usrp/host/lib/Makefile.am
Log:
trial fix for ticket:133
Modified:
gnuradio/branches/developers/eb/bsd/gnuradio-core/src/lib/filter/Makefile.am
===================================================================
---
gnuradio/branches/developers/eb/bsd/gnuradio-core/src/lib/filter/Makefile.am
2007-01-29 21:27:14 UTC (rev 4322)
+++
gnuradio/branches/developers/eb/bsd/gnuradio-core/src/lib/filter/Makefile.am
2007-01-29 22:30:28 UTC (rev 4323)
@@ -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/branches/developers/eb/bsd/gnuradio-core/src/lib/gengen/Makefile.am
===================================================================
---
gnuradio/branches/developers/eb/bsd/gnuradio-core/src/lib/gengen/Makefile.am
2007-01-29 21:27:14 UTC (rev 4322)
+++
gnuradio/branches/developers/eb/bsd/gnuradio-core/src/lib/gengen/Makefile.am
2007-01-29 22:30:28 UTC (rev 4323)
@@ -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/branches/developers/eb/bsd/pmt/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/eb/bsd/pmt/src/lib/Makefile.am 2007-01-29
21:27:14 UTC (rev 4322)
+++ gnuradio/branches/developers/eb/bsd/pmt/src/lib/Makefile.am 2007-01-29
22:30:28 UTC (rev 4323)
@@ -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/branches/developers/eb/bsd/run_tests.sh.in
===================================================================
--- gnuradio/branches/developers/eb/bsd/run_tests.sh.in 2007-01-29 21:27:14 UTC
(rev 4322)
+++ gnuradio/branches/developers/eb/bsd/run_tests.sh.in 2007-01-29 22:30:28 UTC
(rev 4323)
@@ -47,7 +47,7 @@
ok=yes
for file in $3/qa_*.py
do
- if ! $file
+ if ! @PYTHON@ $file
then
ok=no
fi
Modified: gnuradio/branches/developers/eb/bsd/usrp/firmware/include/Makefile.am
===================================================================
--- gnuradio/branches/developers/eb/bsd/usrp/firmware/include/Makefile.am
2007-01-29 21:27:14 UTC (rev 4322)
+++ gnuradio/branches/developers/eb/bsd/usrp/firmware/include/Makefile.am
2007-01-29 22:30:28 UTC (rev 4323)
@@ -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/branches/developers/eb/bsd/usrp/firmware/src/common/Makefile.am
===================================================================
--- gnuradio/branches/developers/eb/bsd/usrp/firmware/src/common/Makefile.am
2007-01-29 21:27:14 UTC (rev 4322)
+++ gnuradio/branches/developers/eb/bsd/usrp/firmware/src/common/Makefile.am
2007-01-29 22:30:28 UTC (rev 4323)
@@ -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/branches/developers/eb/bsd/usrp/firmware/src/usrp2/Makefile.am
===================================================================
--- gnuradio/branches/developers/eb/bsd/usrp/firmware/src/usrp2/Makefile.am
2007-01-29 21:27:14 UTC (rev 4322)
+++ gnuradio/branches/developers/eb/bsd/usrp/firmware/src/usrp2/Makefile.am
2007-01-29 22:30:28 UTC (rev 4323)
@@ -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/branches/developers/eb/bsd/usrp/host/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/eb/bsd/usrp/host/lib/Makefile.am
2007-01-29 21:27:14 UTC (rev 4322)
+++ gnuradio/branches/developers/eb/bsd/usrp/host/lib/Makefile.am
2007-01-29 22:30:28 UTC (rev 4323)
@@ -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] r4323 - in gnuradio/branches/developers/eb/bsd: . gnuradio-core/src/lib/filter gnuradio-core/src/lib/gengen pmt/src/lib usrp/firmware/include usrp/firmware/src/common usrp/firmware/src/usrp2 usrp/host/lib,
eb <=