[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r4415 - in gnuradio/branches/releases/3.0: . gnuradio-
|
From: |
jcorgan |
|
Subject: |
[Commit-gnuradio] r4415 - in gnuradio/branches/releases/3.0: . gnuradio-core/src/lib/filter gnuradio-core/src/lib/general gnuradio-core/src/lib/swig usrp/firmware/include usrp/firmware/src/common usrp/firmware/src/usrp2 usrp/host/lib |
|
Date: |
Wed, 7 Feb 2007 12:07:29 -0700 (MST) |
Author: jcorgan
Date: 2007-02-07 12:07:29 -0700 (Wed, 07 Feb 2007)
New Revision: 4415
Modified:
gnuradio/branches/releases/3.0/gnuradio-core/src/lib/filter/Makefile.am
gnuradio/branches/releases/3.0/gnuradio-core/src/lib/general/Makefile.am
gnuradio/branches/releases/3.0/gnuradio-core/src/lib/swig/Makefile.am
gnuradio/branches/releases/3.0/run_tests.sh.in
gnuradio/branches/releases/3.0/usrp/firmware/include/Makefile.am
gnuradio/branches/releases/3.0/usrp/firmware/src/common/Makefile.am
gnuradio/branches/releases/3.0/usrp/firmware/src/usrp2/Makefile.am
gnuradio/branches/releases/3.0/usrp/host/lib/Makefile.am
Log:
Applied relevant portions of changeset r4325:4326 on trunk to release branch.
Modified:
gnuradio/branches/releases/3.0/gnuradio-core/src/lib/filter/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.0/gnuradio-core/src/lib/filter/Makefile.am
2007-02-07 19:05:53 UTC (rev 4414)
+++ gnuradio/branches/releases/3.0/gnuradio-core/src/lib/filter/Makefile.am
2007-02-07 19:07:29 UTC (rev 4415)
@@ -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/releases/3.0/gnuradio-core/src/lib/general/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.0/gnuradio-core/src/lib/general/Makefile.am
2007-02-07 19:05:53 UTC (rev 4414)
+++ gnuradio/branches/releases/3.0/gnuradio-core/src/lib/general/Makefile.am
2007-02-07 19:07:29 UTC (rev 4415)
@@ -1,5 +1,5 @@
#
-# Copyright 2001,2002,2004,2006 Free Software Foundation, Inc.
+# Copyright 2001,2002,2004,2006,2007 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -91,7 +91,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/releases/3.0/gnuradio-core/src/lib/swig/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.0/gnuradio-core/src/lib/swig/Makefile.am
2007-02-07 19:05:53 UTC (rev 4414)
+++ gnuradio/branches/releases/3.0/gnuradio-core/src/lib/swig/Makefile.am
2007-02-07 19:07:29 UTC (rev 4415)
@@ -96,6 +96,75 @@
# ----------------------------------------------------------------
+<<<<<<< .working
+=======
+_gnuradio_swig_py_filter_la_SOURCES = \
+ gnuradio_swig_py_filter.cc
+
+
+_gnuradio_swig_py_filter_la_LIBADD = \
+ $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la \
+ $(PYTHON_LDFLAGS) \
+ -lstdc++
+
+_gnuradio_swig_py_filter_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+
+
+# KLUDGE: Force filter include of gnuradio_swig_py_filter.d dependency file.
+# This is not guaranteed to be portable, but will probably work.
+# If it works, we have accurate dependencies for our swig stuff, which is good.
address@hidden@ @address@hidden/address@hidden@
+
+gnuradio_swig_py_filter.py gnuradio_swig_py_filter.h:
gnuradio_swig_py_filter.cc
+
+gnuradio_swig_py_filter.cc : sw_filter.i
+ if $(SWIG) $(SWIGPYTHONARGS) -MMD -MF gnuradio_swig_py_filter.Td
-module gnuradio_swig_py_filter -o gnuradio_swig_py_filter.cc sw_filter.i ;\
+ then if test $(host_os) = mingw32; \
+ then sed 's,\\\\,/,g' <gnuradio_swig_py_filter.Td
>gnuradio_swig_py_filter.d; rm -f gnuradio_swig_py_filter.Td; \
+ else mv -f gnuradio_swig_py_filter.Td gnuradio_swig_py_filter.d;
fi \
+ else rm -f gnuradio_swig_py_filter.Td; exit 1; fi
+
+
+# ----------------------------------------------------------------
+# Part 5: sw_io.i -> gnuradio_swig_py_io
+#
+
+_gnuradio_swig_py_io_la_SOURCES = \
+ gnuradio_swig_py_io.cc
+
+
+_gnuradio_swig_py_io_la_LIBADD = \
+ $(top_builddir)/gnuradio-core/src/lib/libgnuradio-core.la \
+ $(PYTHON_LDFLAGS) \
+ -lstdc++
+
+_gnuradio_swig_py_io_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+
+
+# KLUDGE: Force io include of gnuradio_swig_py_io.d dependency file.
+# This is not guaranteed to be portable, but will probably work.
+# If it works, we have accurate dependencies for our swig stuff, which is good.
address@hidden@ @address@hidden/address@hidden@
+
+gnuradio_swig_py_io.py gnuradio_swig_py_io.h: gnuradio_swig_py_io.cc
+
+gnuradio_swig_py_io.cc : sw_io.i
+ if $(SWIG) $(SWIGPYTHONARGS) -MMD -MF gnuradio_swig_py_io.Td -module
gnuradio_swig_py_io -o gnuradio_swig_py_io.cc sw_io.i ;\
+ then if test $(host_os) = mingw32; \
+ then sed 's,\\\\,/,g' <gnuradio_swig_py_io.Td
>gnuradio_swig_py_io.d; rm -f gnuradio_swig_py_io.Td; \
+ else mv -f gnuradio_swig_py_io.Td gnuradio_swig_py_io.d; fi \
+ else rm -f gnuradio_swig_py_io.Td; exit 1; fi
+
+
+# ----------------------------------------------------------------
+# 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
+ $(PYTHON) $(srcdir)/gen-swig-bug-fix gnuradio_swig_py_runtime.cc $@
+
+# ----------------------------------------------------------------
+
+>>>>>>> .merge-right.r4326
# Don't distribute output of swig
dist-hook:
@for file in $(BUILT_SOURCES); do echo $(RM) $(distdir)/$$file; done
Modified: gnuradio/branches/releases/3.0/run_tests.sh.in
===================================================================
--- gnuradio/branches/releases/3.0/run_tests.sh.in 2007-02-07 19:05:53 UTC
(rev 4414)
+++ gnuradio/branches/releases/3.0/run_tests.sh.in 2007-02-07 19:07:29 UTC
(rev 4415)
@@ -44,7 +44,7 @@
ok=yes
for file in $3/qa_*.py
do
- if ! $file
+ if ! @PYTHON@ $file
then
ok=no
fi
Modified: gnuradio/branches/releases/3.0/usrp/firmware/include/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.0/usrp/firmware/include/Makefile.am
2007-02-07 19:05:53 UTC (rev 4414)
+++ gnuradio/branches/releases/3.0/usrp/firmware/include/Makefile.am
2007-02-07 19:07:29 UTC (rev 4415)
@@ -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/releases/3.0/usrp/firmware/src/common/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.0/usrp/firmware/src/common/Makefile.am
2007-02-07 19:05:53 UTC (rev 4414)
+++ gnuradio/branches/releases/3.0/usrp/firmware/src/common/Makefile.am
2007-02-07 19:07:29 UTC (rev 4415)
@@ -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/releases/3.0/usrp/firmware/src/usrp2/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.0/usrp/firmware/src/usrp2/Makefile.am
2007-02-07 19:05:53 UTC (rev 4414)
+++ gnuradio/branches/releases/3.0/usrp/firmware/src/usrp2/Makefile.am
2007-02-07 19:07:29 UTC (rev 4415)
@@ -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/releases/3.0/usrp/host/lib/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.0/usrp/host/lib/Makefile.am 2007-02-07
19:05:53 UTC (rev 4414)
+++ gnuradio/branches/releases/3.0/usrp/host/lib/Makefile.am 2007-02-07
19:07:29 UTC (rev 4415)
@@ -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] r4415 - in gnuradio/branches/releases/3.0: . gnuradio-core/src/lib/filter gnuradio-core/src/lib/general gnuradio-core/src/lib/swig usrp/firmware/include usrp/firmware/src/common usrp/firmware/src/usrp2 usrp/host/lib,
jcorgan <=