Changeset 4415

Timestamp:

02/07/07 12:07:29

Author:

jcorgan

Message:

Applied relevant portions of changeset r4325:4326 on trunk to release branch.

Files:

• gnuradio/branches/releases/3.0/gnuradio-core/src/lib/filter/Makefile.am (modified) (1 diff)
• gnuradio/branches/releases/3.0/gnuradio-core/src/lib/general/Makefile.am (modified) (2 diffs)
• gnuradio/branches/releases/3.0/gnuradio-core/src/lib/swig/Makefile.am (modified) (1 diff)
• gnuradio/branches/releases/3.0/run_tests.sh.in (modified) (1 diff)
• gnuradio/branches/releases/3.0/usrp/firmware/include/Makefile.am (modified) (1 diff)
• gnuradio/branches/releases/3.0/usrp/firmware/src/common/Makefile.am (modified) (1 diff)
• gnuradio/branches/releases/3.0/usrp/firmware/src/usrp2/Makefile.am (modified) (2 diffs)
• gnuradio/branches/releases/3.0/usrp/host/lib/Makefile.am (modified) (1 diff)

gnuradio/branches/releases/3.0/gnuradio-core/src/lib/filter/Makefile.am

@@ -70 +70 @@
-
-$(GENERATED_H) $(GENERATED_I) $(GENERATED_CC): $(CODE_GENERATOR)
-
+PYTHON) $(
-
-

gnuradio/branches/releases/3.0/gnuradio-core/src/lib/general/Makefile.am

@@ -1 +1 @@
-#
-
+,2007
-# 
-# This file is part of GNU Radio
@@ -92 +92 @@
-
-$(GENERATED_H) $(GENERATED_I) $(GENERATED_CC): $(CODE_GENERATOR)
-
+PYTHON $
-
-

gnuradio/branches/releases/3.0/gnuradio-core/src/lib/swig/Makefile.am

@@ -97 +97 @@
-# ----------------------------------------------------------------
-
+<<<<<<< .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.
+@am__include@ @am__quote@./gnuradio_swig_py_filter.d@am__quote@
+
+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.
+@am__include@ @am__quote@./gnuradio_swig_py_io.d@am__quote@
+
+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:

gnuradio/branches/releases/3.0/run_tests.sh.in

@@ -45 +45 @@
-for file in $3/qa_*.py
-do
-
+@PYTHON@ 
-  then
-    ok=no

gnuradio/branches/releases/3.0/usrp/firmware/include/Makefile.am

@@ -54 +54 @@
-
-fpga_regs_common.v: fpga_regs_common.h generate_regs.py 
-
+PYTHON) $(
-
-fpga_regs_standard.v: fpga_regs_standard.h generate_regs.py
-
+PYTHON) $(

gnuradio/branches/releases/3.0/usrp/firmware/src/common/Makefile.am

@@ -40 +40 @@
-
-usrp_gpif.c usrp_gpif_inline.h : gpif.c
-
+PYTHON) $(
-
-CLEANFILES = \

gnuradio/branches/releases/3.0/usrp/firmware/src/usrp2/Makefile.am

@@ -109 +109 @@
-
-burn-usrp2-eeprom: eeprom_boot.ihx
-
+PYTHON) $(
-        chmod +x $@
-
-burn-usrp4-eeprom: eeprom_boot.ihx
-
+PYTHON) $(
-        chmod +x $@
-
@@ -160 +160 @@
-
-usrp_gpif.c usrp_gpif_inline.h : gpif.c
-
+PYTHON) $(
-
-

gnuradio/branches/releases/3.0/usrp/host/lib/Makefile.am

@@ -147 +147 @@
-
-usrp_dbid.py usrp_dbid.h usrp_dbid.cc: gen_usrp_dbid.py usrp_dbid.dat
-
+PYTHON) $(
-
-MOSTLYCLEANFILES = \