[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r4335 - in gnuradio/branches/developers/n4hy/ofdm2: .
|
From: |
n4hy |
|
Subject: |
[Commit-gnuradio] r4335 - in gnuradio/branches/developers/n4hy/ofdm2: . config gnuradio-core gnuradio-core/src/lib 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/host/lib |
|
Date: |
Mon, 29 Jan 2007 21:09:10 -0700 (MST) |
Author: n4hy
Date: 2007-01-29 21:09:09 -0700 (Mon, 29 Jan 2007)
New Revision: 4335
Removed:
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-core/src/lib/omnithread/
Modified:
gnuradio/branches/developers/n4hy/ofdm2/Makefile.common
gnuradio/branches/developers/n4hy/ofdm2/config/grc_gnuradio_core.m4
gnuradio/branches/developers/n4hy/ofdm2/config/grc_mblock.m4
gnuradio/branches/developers/n4hy/ofdm2/configure.ac
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-core/gnuradio-core.pc.in
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-core/src/lib/Makefile.am
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-core/src/lib/filter/Makefile.am
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-core/src/lib/gengen/Makefile.am
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-core/src/lib/swig/Makefile.am
gnuradio/branches/developers/n4hy/ofdm2/pmt/src/lib/Makefile.am
gnuradio/branches/developers/n4hy/ofdm2/run_tests.sh.in
gnuradio/branches/developers/n4hy/ofdm2/usrp/firmware/include/Makefile.am
gnuradio/branches/developers/n4hy/ofdm2/usrp/firmware/src/common/Makefile.am
gnuradio/branches/developers/n4hy/ofdm2/usrp/host/lib/Makefile.am
Log:
keeping up with the trunk
Modified: gnuradio/branches/developers/n4hy/ofdm2/Makefile.common
===================================================================
--- gnuradio/branches/developers/n4hy/ofdm2/Makefile.common 2007-01-30
04:03:16 UTC (rev 4334)
+++ gnuradio/branches/developers/n4hy/ofdm2/Makefile.common 2007-01-30
04:09:09 UTC (rev 4335)
@@ -50,7 +50,6 @@
-I$(top_srcdir)/gnuradio-core/src/lib/reed-solomon \
-I$(top_srcdir)/gnuradio-core/src/lib/io \
-I$(top_srcdir)/gnuradio-core/src/lib/g72x \
- -I$(top_srcdir)/gnuradio-core/src/lib/omnithread \
-I$(top_srcdir)/gnuradio-core/src/lib/swig \
-I$(top_builddir)/gnuradio-core/src/lib/swig \
$(FFTW3F_CFLAGS)
@@ -58,6 +57,7 @@
# These used to be set in PKGCONFIG but now point to the current
# build tree.
+# FIXME shouldn't -lfftw3f -lm just be extracted from libgnuradio-core.la ???
GNURADIO_CORE_LIBS = -L$(top_builddir)/gnuradio-core/src/lib \
-lgnuradio-core -lfftw3f -lm
@@ -69,15 +69,17 @@
USRP_INCLUDES = -I$(top_srcdir)/usrp/host/lib \
-I$(top_srcdir)/usrp/firmware/include
-USRP_LIBS = -L$(top_builddir)/usrp/host/lib \
- -lusrp
+USRP_LIBS = -L$(top_builddir)/usrp/host/lib -lusrp
PMT_INCLUDES = -I$(top_srcdir)/pmt/src/lib
PMT_LIBS = -L$(top_builddir)/pmt/src/lib -lpmt
+OMNITHREAD_INCLUDES = -I$(top_srcdir)/omnithread
+OMNITHREAD_LIBS = -L$(top_builddir)/omnithread -lgromnithread
+
# This used to be set in configure.ac but is now defined here for all
# Makefiles when this fragment is included.
-STD_DEFINES_AND_INCLUDES=$(DEFINES) $(GNURADIO_INCLUDES) $(BOOST_CFLAGS)
+STD_DEFINES_AND_INCLUDES=$(DEFINES) $(OMNITHREAD_INCLUDES)
$(GNURADIO_INCLUDES) $(BOOST_CFLAGS)
# Fix for BSD make not defining $(RM). We define it now in configure.ac
# using AM_PATH_PROG, but now here have to add a -f to be like GNU make
Modified: gnuradio/branches/developers/n4hy/ofdm2/config/grc_gnuradio_core.m4
===================================================================
--- gnuradio/branches/developers/n4hy/ofdm2/config/grc_gnuradio_core.m4
2007-01-30 04:03:16 UTC (rev 4334)
+++ gnuradio/branches/developers/n4hy/ofdm2/config/grc_gnuradio_core.m4
2007-01-30 04:09:09 UTC (rev 4335)
@@ -1,4 +1,4 @@
-dnl Copyright 2001,2002,2003,2004,2005,2006 Free Software Foundation, Inc.
+dnl Copyright 2001,2002,2003,2004,2005,2006,2007 Free Software Foundation, Inc.
dnl
dnl This file is part of GNU Radio
dnl
@@ -37,7 +37,6 @@
gnuradio-core/src/lib/gengen/Makefile \
gnuradio-core/src/lib/io/Makefile \
gnuradio-core/src/lib/missing/Makefile \
- gnuradio-core/src/lib/omnithread/Makefile \
gnuradio-core/src/lib/reed-solomon/Makefile \
gnuradio-core/src/lib/runtime/Makefile \
gnuradio-core/src/lib/swig/Makefile \
@@ -55,6 +54,16 @@
])
passed=yes
+ # Don't do gnuradio-core if omnithread skipped
+ # There *has* to be a better way to check if a value is in a string
+ for dir in $skipped_dirs
+ do
+ if test x$dir = xomnithread; then
+ AC_MSG_RESULT([Component gnuradio-core requires omnithread, which
is not being built.])
+ passed=no
+ fi
+ done
+
GRC_BUILD_CONDITIONAL([gnuradio-core],[
dnl run_tests is created from run_tests.in. Make it executable.
AC_CONFIG_COMMANDS([run_tests_core], [chmod +x
gnuradio-core/src/python/gnuradio/gr/run_tests])
Modified: gnuradio/branches/developers/n4hy/ofdm2/config/grc_mblock.m4
===================================================================
--- gnuradio/branches/developers/n4hy/ofdm2/config/grc_mblock.m4
2007-01-30 04:03:16 UTC (rev 4334)
+++ gnuradio/branches/developers/n4hy/ofdm2/config/grc_mblock.m4
2007-01-30 04:09:09 UTC (rev 4335)
@@ -28,6 +28,16 @@
])
passed=yes
+ # Don't do mblock if omnithread skipped
+ # There *has* to be a better way to check if a value is in a string
+ for dir in $skipped_dirs
+ do
+ if test x$dir = xomnithread; then
+ AC_MSG_RESULT([Component mblock requires omnithread, which is not
being built.])
+ passed=no
+ fi
+ done
+
# Don't do mblock if pmt skipped
# There *has* to be a better way to check if a value is in a string
for dir in $skipped_dirs
Modified: gnuradio/branches/developers/n4hy/ofdm2/configure.ac
===================================================================
--- gnuradio/branches/developers/n4hy/ofdm2/configure.ac 2007-01-30
04:03:16 UTC (rev 4334)
+++ gnuradio/branches/developers/n4hy/ofdm2/configure.ac 2007-01-30
04:09:09 UTC (rev 4335)
@@ -184,6 +184,7 @@
)
build_dirs="config"
+GRC_OMNITHREAD dnl must come before gnuradio-core and mblock
GRC_GNURADIO_CORE
GRC_USRP
GRC_GR_USRP dnl this must come after GRC_USRP
Modified:
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-core/gnuradio-core.pc.in
===================================================================
--- gnuradio/branches/developers/n4hy/ofdm2/gnuradio-core/gnuradio-core.pc.in
2007-01-30 04:03:16 UTC (rev 4334)
+++ gnuradio/branches/developers/n4hy/ofdm2/gnuradio-core/gnuradio-core.pc.in
2007-01-30 04:09:09 UTC (rev 4335)
@@ -7,5 +7,5 @@
Description: GNU Software Radio toolkit
Requires:
Version: @VERSION@
-Libs: -L${libdir} -lgnuradio-core @FFTW3F_LIBS@
+Libs: -L${libdir} -lgnuradio-core @FFTW3F_LIBS@ @OMNITHREAD_LIBS@
Cflags: -I${includedir} @DEFINES@ @PTHREAD_CFLAGS@
Modified:
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-core/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/n4hy/ofdm2/gnuradio-core/src/lib/Makefile.am
2007-01-30 04:03:16 UTC (rev 4334)
+++ gnuradio/branches/developers/n4hy/ofdm2/gnuradio-core/src/lib/Makefile.am
2007-01-30 04:09:09 UTC (rev 4335)
@@ -24,7 +24,7 @@
## Process this file with automake to produce Makefile.in
# We've got to build . before swig
-SUBDIRS = missing runtime filter general gengen g72x reed-solomon omnithread
io . swig
+SUBDIRS = missing runtime filter general gengen g72x reed-solomon io . swig
# generate libgnuradio-core.la from the convenience libraries in subdirs
@@ -35,7 +35,7 @@
libgnuradio_core_qa_la_SOURCES = bug_work_around_6.cc
libgnuradio_core_qa_la_LDFLAGS = $(NO_UNDEFINED) -version-info 0:0:0 \
- $(LIBGNURADIO_CORE_EXTRA_LDFLAGS)
+ $(LIBGNURADIO_CORE_EXTRA_LDFLAGS)
libgnuradio_core_la_LIBADD = \
filter/libfilter.la \
@@ -44,9 +44,9 @@
gengen/libgengen.la \
io/libio.la \
missing/libmissing.la \
- omnithread/libomnithread.la \
reed-solomon/librs.la \
runtime/libruntime.la \
+ $(OMNITHREAD_LIBS) \
$(FFTW3F_LIBS)
libgnuradio_core_qa_la_LIBADD = \
Modified:
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-core/src/lib/filter/Makefile.am
===================================================================
---
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-core/src/lib/filter/Makefile.am
2007-01-30 04:03:16 UTC (rev 4334)
+++
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-core/src/lib/filter/Makefile.am
2007-01-30 04:09:09 UTC (rev 4335)
@@ -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/n4hy/ofdm2/gnuradio-core/src/lib/gengen/Makefile.am
===================================================================
---
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-core/src/lib/gengen/Makefile.am
2007-01-30 04:03:16 UTC (rev 4334)
+++
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-core/src/lib/gengen/Makefile.am
2007-01-30 04:09:09 UTC (rev 4335)
@@ -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/n4hy/ofdm2/gnuradio-core/src/lib/swig/Makefile.am
===================================================================
---
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-core/src/lib/swig/Makefile.am
2007-01-30 04:03:16 UTC (rev 4334)
+++
gnuradio/branches/developers/n4hy/ofdm2/gnuradio-core/src/lib/swig/Makefile.am
2007-01-30 04:09:09 UTC (rev 4335)
@@ -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/branches/developers/n4hy/ofdm2/pmt/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/n4hy/ofdm2/pmt/src/lib/Makefile.am
2007-01-30 04:03:16 UTC (rev 4334)
+++ gnuradio/branches/developers/n4hy/ofdm2/pmt/src/lib/Makefile.am
2007-01-30 04:09:09 UTC (rev 4335)
@@ -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/n4hy/ofdm2/run_tests.sh.in
===================================================================
--- gnuradio/branches/developers/n4hy/ofdm2/run_tests.sh.in 2007-01-30
04:03:16 UTC (rev 4334)
+++ gnuradio/branches/developers/n4hy/ofdm2/run_tests.sh.in 2007-01-30
04:09:09 UTC (rev 4335)
@@ -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/n4hy/ofdm2/usrp/firmware/include/Makefile.am
===================================================================
--- gnuradio/branches/developers/n4hy/ofdm2/usrp/firmware/include/Makefile.am
2007-01-30 04:03:16 UTC (rev 4334)
+++ gnuradio/branches/developers/n4hy/ofdm2/usrp/firmware/include/Makefile.am
2007-01-30 04:09:09 UTC (rev 4335)
@@ -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/n4hy/ofdm2/usrp/firmware/src/common/Makefile.am
===================================================================
---
gnuradio/branches/developers/n4hy/ofdm2/usrp/firmware/src/common/Makefile.am
2007-01-30 04:03:16 UTC (rev 4334)
+++
gnuradio/branches/developers/n4hy/ofdm2/usrp/firmware/src/common/Makefile.am
2007-01-30 04:09:09 UTC (rev 4335)
@@ -1,5 +1,5 @@
#
-# Copyright 2004 Free Software Foundation, Inc.
+# Copyright 2003,2006 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -19,32 +19,153 @@
# Boston, MA 02110-1301, USA.
#
-EXTRA_DIST = \
+firmware2dir = $(prefix)/share/usrp/rev2
+firmware2_DATA = std.ihx
+
+# we put the same stuff in the rev4 directory
+firmware4dir = $(prefix)/share/usrp/rev4
+firmware4_DATA = std.ihx
+
+EXTRA_DIST = \
+ edit-gpif \
_startup.a51 \
blink_leds.c \
+ board_specific.c \
check_mdelay.c \
check_udelay.c \
- edit-gpif \
- fpga.h \
- fpga_load.h \
+ eeprom_boot.a51 \
+ eeprom_init.c \
+ eeprom_io.c \
+ eeprom_io.h \
fpga_load.c \
+ fpga_rev2.c \
+ fpga_rev2.h \
gpif.c \
- gpif.gpf \
init_gpif.c \
+ spi.c \
+ spi.h \
+ usb_descriptors.a51 \
usrp_common.c \
- usrp_globals.h \
- vectors.a51 \
- build_eeprom.py
+ usrp_common.h \
+ usrp_gpif.c \
+ usrp_main.c \
+ usrp_rev2_regs.h \
+ vectors.a51
+
+DEFINES=-DHAVE_USRP2
+INCLUDES=-I$(top_srcdir)/usrp/firmware/include \
+ -I$(top_srcdir)/usrp/firmware/src/usrp2 \
+ -I$(top_srcdir)/usrp/firmware/src/common \
+ -I$(top_builddir)/usrp/firmware/src/common
+
+# with EA = 0, the FX2 implements a portion of the 8051 "external memory"
+# on chip. This memory is mapped like this:
+#
+# The bottom 8K of memory (0x0000 - 0x1fff) is used for both data and
+# code accesses. There's also 512 bytes for data only from 0xe000 - 0xe1ff.
+#
+# We tell the linker to start the xdata segment at 0x1800, 6K up from
+# the bottom.
+
+MEMOPTS = --code-loc 0x0000 --code-size 0x1800 --xram-loc 0x1800 --xram-size
0x0800 \
+ -Wl '-b USBDESCSEG = 0xE000'
+
+LIBOPTS = -L ../../lib libfx2.lib
+LIBDEP = ../../lib/libfx2.lib
+
+LINKOPTS = $(MEMOPTS) $(LIBOPTS)
+
+EXECUTABLES = \
+ std.ihx \
+ blink_leds.ihx \
+ check_mdelay.ihx \
+ check_udelay.ihx \
+ eeprom_boot.ihx
+
+STARTUP = _startup.rel
+
+noinst_SCRIPTS = \
+ burn-usrp2-eeprom \
+ burn-usrp4-eeprom
+
+
+.c.rel:
+ $(XCC) $(INCLUDES) $(DEFINES) \
+ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+
+.a51.rel:
+ test -f `basename '$<'` || $(LN_S) '$<' .
+ test -f ../common/`basename '$<'` -o \
+ \! -f `dirname '$<'`/../common/`basename '$<'` \
+ || $(LN_S) `dirname '$<'`/../common/`basename '$<'`
../common/`basename '$<'`
+ $(XAS) `basename '$<'`
+
+
+EEPROM_BOOT_OBJS = eeprom_boot.rel eeprom_init.rel $(STARTUP)
+
+eeprom_boot.ihx: $(EEPROM_BOOT_OBJS) $(LIBDEP)
+ $(XCC) $(LINKOPTS) -o $@ $(EEPROM_BOOT_OBJS)
+
+burn-usrp2-eeprom: eeprom_boot.ihx
+ $(PYTHON) $(srcdir)/../common/build_eeprom.py -r2 eeprom_boot.ihx > $@
+ chmod +x $@
+
+burn-usrp4-eeprom: eeprom_boot.ihx
+ $(PYTHON) $(srcdir)/../common/build_eeprom.py -r4 eeprom_boot.ihx > $@
+ chmod +x $@
+
+
+BLINK_LEDS_OBJS = blink_leds.rel usrp_common.rel board_specific.rel spi.rel
$(STARTUP)
+
+blink_leds.ihx: $(BLINK_LEDS_OBJS) $(LIBDEP)
+ $(XCC) $(LINKOPTS) -o $@ $(BLINK_LEDS_OBJS)
+
+
+CHECK_MDELAY_OBJS = check_mdelay.rel usrp_common.rel board_specific.rel
spi.rel $(STARTUP)
+
+check_mdelay.ihx: $(CHECK_MDELAY_OBJS) $(LIBDEP)
+ $(XCC) $(LINKOPTS) -o $@ $(CHECK_MDELAY_OBJS)
+
+
+
+CHECK_UDELAY_OBJS = check_udelay.rel usrp_common.rel board_specific.rel
spi.rel $(STARTUP)
+
+check_udelay.ihx: $(CHECK_UDELAY_OBJS) $(LIBDEP)
+ $(XCC) $(LINKOPTS) -o $@ $(CHECK_UDELAY_OBJS)
+
+
+
+USRP_OBJS = \
+ vectors.rel \
+ usrp_main.rel usrp_common.rel board_specific.rel \
+ fpga_load.rel fpga_rev2.rel init_gpif.rel usrp_gpif.rel \
+ usb_descriptors.rel spi.rel eeprom_io.rel $(STARTUP)
+
+std.ihx: $(USRP_OBJS) $(LIBDEP)
+ $(XCC) $(LINKOPTS) -o $@ $(USRP_OBJS)
+
+CLEANFILES = \
+ *.ihx *.lnk *.lst *.map *.mem *.rel *.rst *.sym *.asm *.lib \
+ usrp_gpif.c usrp_gpif_inline.h \
+ burn-usrp2-eeprom \
+ burn-usrp4-eeprom
+
+DISTCLEANFILES = \
+ *.ihx *.lnk *.lst *.map *.mem *.rel *.rst *.sym *.asm *.lib
+
+# build gpif stuff
+
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 \
- usrp_gpif.c usrp_gpif_inline.h
-DISTCLEANFILES = \
- *.ihx *.lnk *.lst *.map *.mem *.rel *.rst *.sym *.asm *.lib \
- usrp_gpif.c usrp_gpif_inline.h
+# dependencies
+
+usrp_main.rel: usrp_gpif_inline.h
+#usrp_main.rel: fpga.h usrp_common.h ../../include/usrp_commands.h
usrp_gpif_inline.h ../../include/usrp_config.h usrp_rev2_regs.h
../../include/fx2regs.h
+#usrp_common.rel: usrp_common.h ../../include/usrp_commands.h
../../include/usrp_config.h usrp_rev2_regs.h ../../include/fx2regs.h
+#fpga.rel: usrp_common.h ../../include/usrp_commands.h fpga.h
../../include/usrp_config.h usrp_rev2_regs.h ../../include/fx2regs.h
+#init_gpif.rel: usrp_common.h ../../include/usrp_config.h usrp_rev2_regs.h
../../include/fx2regs.h
Modified: gnuradio/branches/developers/n4hy/ofdm2/usrp/host/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/n4hy/ofdm2/usrp/host/lib/Makefile.am
2007-01-30 04:03:16 UTC (rev 4334)
+++ gnuradio/branches/developers/n4hy/ofdm2/usrp/host/lib/Makefile.am
2007-01-30 04:09:09 UTC (rev 4335)
@@ -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] r4335 - in gnuradio/branches/developers/n4hy/ofdm2: . config gnuradio-core gnuradio-core/src/lib 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/host/lib,
n4hy <=