From b8a177591928973eb863cc3690fb381306830bbd Mon Sep 17 00:00:00 2001 From: eb Date: Tue, 30 Jan 2007 00:34:14 +0000 Subject: [PATCH] Fix for ticket:133, merged from eb/bsd 4322:4324. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@4326 221aa14e-8319-0410-a670-987f0aec2ac5 --- gnuradio-core/src/lib/filter/Makefile.am | 2 +- gnuradio-core/src/lib/gengen/Makefile.am | 2 +- gnuradio-core/src/lib/swig/Makefile.am | 2 +- pmt/src/lib/Makefile.am | 2 +- run_tests.sh.in | 2 +- usrp/firmware/include/Makefile.am | 4 ++-- usrp/firmware/src/common/Makefile.am | 2 +- usrp/firmware/src/usrp2/Makefile.am | 6 +++--- usrp/host/lib/Makefile.am | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/gnuradio-core/src/lib/filter/Makefile.am b/gnuradio-core/src/lib/filter/Makefile.am index 7eb519d0..32be2704 100644 --- a/gnuradio-core/src/lib/filter/Makefile.am +++ b/gnuradio-core/src/lib/filter/Makefile.am @@ -69,7 +69,7 @@ include Makefile.gen $(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) diff --git a/gnuradio-core/src/lib/gengen/Makefile.am b/gnuradio-core/src/lib/gengen/Makefile.am index a338e39b..d3fa84cf 100644 --- a/gnuradio-core/src/lib/gengen/Makefile.am +++ b/gnuradio-core/src/lib/gengen/Makefile.am @@ -92,7 +92,7 @@ include Makefile.gen $(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) diff --git a/gnuradio-core/src/lib/swig/Makefile.am b/gnuradio-core/src/lib/swig/Makefile.am index 6bb2ca81..ed141902 100644 --- a/gnuradio-core/src/lib/swig/Makefile.am +++ b/gnuradio-core/src/lib/swig/Makefile.am @@ -268,7 +268,7 @@ gnuradio_swig_py_io.cc : sw_io.i # 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 $@ # ---------------------------------------------------------------- diff --git a/pmt/src/lib/Makefile.am b/pmt/src/lib/Makefile.am index 60f889c4..837068c5 100644 --- a/pmt/src/lib/Makefile.am +++ b/pmt/src/lib/Makefile.am @@ -46,7 +46,7 @@ GENERATED_CC = \ $(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) diff --git a/run_tests.sh.in b/run_tests.sh.in index 4e7d69e4..faec6d16 100644 --- a/run_tests.sh.in +++ b/run_tests.sh.in @@ -47,7 +47,7 @@ export GR_DONT_LOAD_PREFS ok=yes for file in $3/qa_*.py do - if ! $file + if ! @PYTHON@ $file then ok=no fi diff --git a/usrp/firmware/include/Makefile.am b/usrp/firmware/include/Makefile.am index 7214820b..f0b082df 100644 --- a/usrp/firmware/include/Makefile.am +++ b/usrp/firmware/include/Makefile.am @@ -53,7 +53,7 @@ EXTRA_DIST = \ $(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 $@ diff --git a/usrp/firmware/src/common/Makefile.am b/usrp/firmware/src/common/Makefile.am index b62baf59..701bc48c 100644 --- a/usrp/firmware/src/common/Makefile.am +++ b/usrp/firmware/src/common/Makefile.am @@ -39,7 +39,7 @@ EXTRA_DIST = \ 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 \ diff --git a/usrp/firmware/src/usrp2/Makefile.am b/usrp/firmware/src/usrp2/Makefile.am index cd81a89c..de7164b4 100644 --- a/usrp/firmware/src/usrp2/Makefile.am +++ b/usrp/firmware/src/usrp2/Makefile.am @@ -108,11 +108,11 @@ eeprom_boot.ihx: $(EEPROM_BOOT_OBJS) $(LIBDEP) $(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 @@ DISTCLEANFILES = \ 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 diff --git a/usrp/host/lib/Makefile.am b/usrp/host/lib/Makefile.am index be4b4e7f..83f2984e 100644 --- a/usrp/host/lib/Makefile.am +++ b/usrp/host/lib/Makefile.am @@ -146,7 +146,7 @@ noinst_PYTHON = \ 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 -- 2.30.2