[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r3287 - in gnuradio/branches/developers/michaelld/wip:
|
From: |
michaelld |
|
Subject: |
[Commit-gnuradio] r3287 - in gnuradio/branches/developers/michaelld/wip: . gnuradio-core/src/lib/swig gr-atsc/src/lib gr-audio-oss/src gr-audio-windows/src gr-error-correcting-codes/src/lib/libecc gr-gsm-fr-vocoder/src/lib gr-trellis/src/lib gr-usrp/src gr-video-sdl/src usrp/firmware/lib usrp/firmware/src/usrp2 usrp/host/swig |
|
Date: |
Tue, 15 Aug 2006 01:50:33 -0600 (MDT) |
Author: michaelld
Date: 2006-08-15 01:50:33 -0600 (Tue, 15 Aug 2006)
New Revision: 3287
Modified:
gnuradio/branches/developers/michaelld/wip/Makefile.common
gnuradio/branches/developers/michaelld/wip/configure.ac
gnuradio/branches/developers/michaelld/wip/gnuradio-core/src/lib/swig/Makefile.am
gnuradio/branches/developers/michaelld/wip/gr-atsc/src/lib/Makefile.am
gnuradio/branches/developers/michaelld/wip/gr-audio-oss/src/Makefile.am
gnuradio/branches/developers/michaelld/wip/gr-audio-windows/src/Makefile.am
gnuradio/branches/developers/michaelld/wip/gr-error-correcting-codes/src/lib/libecc/code_metrics.cc
gnuradio/branches/developers/michaelld/wip/gr-error-correcting-codes/src/lib/libecc/code_metrics.h
gnuradio/branches/developers/michaelld/wip/gr-error-correcting-codes/src/lib/libecc/decoder_viterbi.cc
gnuradio/branches/developers/michaelld/wip/gr-error-correcting-codes/src/lib/libecc/decoder_viterbi.h
gnuradio/branches/developers/michaelld/wip/gr-gsm-fr-vocoder/src/lib/Makefile.am
gnuradio/branches/developers/michaelld/wip/gr-trellis/src/lib/Makefile.am
gnuradio/branches/developers/michaelld/wip/gr-usrp/src/Makefile.am
gnuradio/branches/developers/michaelld/wip/gr-video-sdl/src/Makefile.am
gnuradio/branches/developers/michaelld/wip/usrp/firmware/lib/Makefile.am
gnuradio/branches/developers/michaelld/wip/usrp/firmware/src/usrp2/Makefile.am
gnuradio/branches/developers/michaelld/wip/usrp/host/swig/Makefile.am
Log:
wip only: updated to 3286; updated a few files shaping the decoder.
Modified: gnuradio/branches/developers/michaelld/wip/Makefile.common
===================================================================
--- gnuradio/branches/developers/michaelld/wip/Makefile.common 2006-08-15
03:39:14 UTC (rev 3286)
+++ gnuradio/branches/developers/michaelld/wip/Makefile.common 2006-08-15
07:50:33 UTC (rev 3287)
@@ -71,3 +71,7 @@
# 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)
+
+# 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
+RM=$(RM_PROG) -f
Modified: gnuradio/branches/developers/michaelld/wip/configure.ac
===================================================================
--- gnuradio/branches/developers/michaelld/wip/configure.ac 2006-08-15
03:39:14 UTC (rev 3286)
+++ gnuradio/branches/developers/michaelld/wip/configure.ac 2006-08-15
07:50:33 UTC (rev 3287)
@@ -34,6 +34,7 @@
AC_PROG_LN_S
AC_PROG_MAKE_SET
AC_PROG_INSTALL
+AC_PATH_PROG([RM_PROG], [rm])
AC_LIBTOOL_WIN32_DLL
dnl AC_DISABLE_SHARED dnl don't build shared libraries
Modified:
gnuradio/branches/developers/michaelld/wip/gnuradio-core/src/lib/swig/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/wip/gnuradio-core/src/lib/swig/Makefile.am
2006-08-15 03:39:14 UTC (rev 3286)
+++
gnuradio/branches/developers/michaelld/wip/gnuradio-core/src/lib/swig/Makefile.am
2006-08-15 07:50:33 UTC (rev 3287)
@@ -83,7 +83,7 @@
gnuradio_swig_python.py gnuradio_swig_python.h: gnuradio_swig_python.cc
gnuradio_swig_python.cc : gnuradio.i
- if $(SWIG) $(SWIGPYTHONARGS) -MMD -MF gnuradio_swig_python.Td -module
gnuradio_swig_python -o gnuradio_swig_python.cc $< ;\
+ if $(SWIG) $(SWIGPYTHONARGS) -MMD -MF gnuradio_swig_python.Td -module
gnuradio_swig_python -o gnuradio_swig_python.cc gnuradio.i ;\
then if test $(host_os) = mingw32; \
then sed 's,\\\\,/,g' <gnuradio_swig_python.Td
>gnuradio_swig_python.d; rm -f gnuradio_swig_python.Td; \
else mv -f gnuradio_swig_python.Td gnuradio_swig_python.d; fi \
@@ -91,7 +91,7 @@
gnuradio_swig_bug_workaround.h : gnuradio_swig_python.cc
$(srcdir)/gen-swig-bug-fix
- $(srcdir)/gen-swig-bug-fix $< $@
+ $(srcdir)/gen-swig-bug-fix gnuradio_swig_python.cc $@
# ----------------------------------------------------------------
Modified: gnuradio/branches/developers/michaelld/wip/gr-atsc/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/michaelld/wip/gr-atsc/src/lib/Makefile.am
2006-08-15 03:39:14 UTC (rev 3286)
+++ gnuradio/branches/developers/michaelld/wip/gr-atsc/src/lib/Makefile.am
2006-08-15 07:50:33 UTC (rev 3287)
@@ -221,7 +221,7 @@
$(GNURADIO_I)
LOCAL_IFILES = \
- atsc.i
+ $(top_srcdir)/gr-atsc/src/lib/atsc.i
# These files are built by SWIG. The first is the C++ glue.
# The second is the python wrapper that loads the _atsc shared library
@@ -253,7 +253,7 @@
-lstdc++
atsc.cc atsc.py: atsc.i $(ALL_IFILES)
- $(SWIG) $(SWIGCPPPYTHONARGS) -module atsc -o atsc.cc $<
+ $(SWIG) $(SWIGCPPPYTHONARGS) -module atsc -o atsc.cc $(LOCAL_IFILES)
# These swig headers get installed in ${prefix}/include/gnuradio/swig
swiginclude_HEADERS = \
Modified:
gnuradio/branches/developers/michaelld/wip/gr-audio-oss/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/michaelld/wip/gr-audio-oss/src/Makefile.am
2006-08-15 03:39:14 UTC (rev 3286)
+++ gnuradio/branches/developers/michaelld/wip/gr-audio-oss/src/Makefile.am
2006-08-15 07:50:33 UTC (rev 3287)
@@ -32,7 +32,7 @@
TESTS = run_tests
LOCAL_IFILES = \
- audio_oss.i
+ $(top_srcdir)/gr-audio-oss/src/audio_oss.i
NON_LOCAL_IFILES = \
$(GNURADIO_I)
@@ -75,8 +75,8 @@
_audio_oss_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
-audio_oss.cc audio_oss.py: audio_oss.i $(NON_LOCAL_IFILES)
- $(SWIG) $(SWIGPYTHONARGS) -module audio_oss -o audio_oss.cc $<
+audio_oss.cc audio_oss.py: $(LOCAL_IFILES) $(NON_LOCAL_IFILES)
+ $(SWIG) $(SWIGPYTHONARGS) -module audio_oss -o audio_oss.cc
$(LOCAL_IFILES)
# Don't distribute output of swig
dist-hook:
Modified:
gnuradio/branches/developers/michaelld/wip/gr-audio-windows/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/michaelld/wip/gr-audio-windows/src/Makefile.am
2006-08-15 03:39:14 UTC (rev 3286)
+++ gnuradio/branches/developers/michaelld/wip/gr-audio-windows/src/Makefile.am
2006-08-15 07:50:33 UTC (rev 3287)
@@ -32,7 +32,7 @@
TESTS = run_tests
LOCAL_IFILES = \
- audio_windows.i
+ $(top_srcdir)/gr-audio-windows/src/audio_windows.i
NON_LOCAL_IFILES = \
$(GNURADIO_I)
@@ -76,8 +76,8 @@
_audio_windows_la_LDFLAGS = -no-undefined -module -avoid-version \
$(LIBGNURADIO_CORE_EXTRA_LDFLAGS)
-audio_windows.cc audio_windows.py: audio_windows.i
- $(SWIG) $(SWIGCPPPYTHONARGS) -module audio_windows -o audio_windows.cc
$<
+audio_windows.cc audio_windows.py: $(LOCAL_IFILES)
+ $(SWIG) $(SWIGCPPPYTHONARGS) -module audio_windows -o audio_windows.cc
$(LOCAL_IFILES)
noinst_PYTHON = qa_audio_windows.py
Modified:
gnuradio/branches/developers/michaelld/wip/gr-error-correcting-codes/src/lib/libecc/code_metrics.cc
===================================================================
---
gnuradio/branches/developers/michaelld/wip/gr-error-correcting-codes/src/lib/libecc/code_metrics.cc
2006-08-15 03:39:14 UTC (rev 3286)
+++
gnuradio/branches/developers/michaelld/wip/gr-error-correcting-codes/src/lib/libecc/code_metrics.cc
2006-08-15 07:50:33 UTC (rev 3287)
@@ -338,89 +338,3 @@
float min_sample,
float max_sample,
int sample_precision);
-
-#if 0
- // for compute_all_outputs
-
- d_n_code_outputs = n_code_outputs;
-
- in_l[0].resize (d_n_code_outputs);
- in_l[1].resize (d_n_code_outputs);
- in_f[0].resize (d_n_code_outputs);
- in_f[1].resize (d_n_code_outputs);
-
-
-
- if (n_code_outputs == 0) {
- std::cerr << "code_metrics::create: Error: # of code outputs "
- "must be positive.\n";
- assert (0);
- }
-
-
-template<typename pdf_fcn_io_t>
-void
-code_metrics<pdf_fcn_io_t>::compute_all_outputs
-(pdf_fcn_io_t* syms,
- std::vector<unsigned long>& out)
-{
- // use the first 'n_code_output' symbols, convert them into metrics,
- // then compute all possible (summation) combinations of them and
- // return those in the provided vector.
-
- convert (d_n_code_outputs, syms,
- (void*)(&(in_l[0][0])), (void*)(&in_l[1][0]));
-
- // assign the starting minimum metric to 0. This is safe because
- // metrics are always non-negative.
-
- unsigned long min_metric = 0;
- for (size_t m = 0; m < (((size_t)2) << d_n_code_outputs); m++) {
- size_t t_out_ndx = m;
- unsigned long t_metric = 0;
- for (size_t n = 0; n < d_n_code_outputs; n++, t_out_ndx >>= 1)
- t_metric += in_l[t_out_ndx&1][n];
- if (t_metric < min_metric)
- min_metric = t_metric;
- out[m] = t_metric;
- }
-
- // normalize so that the minimum metric equals 0
-
- for (size_t m = 0; m < d_n_code_outputs; m++)
- out[m] -= min_metric;
-}
-
-template<typename pdf_fcn_io_t>
-void
-code_metrics<pdf_fcn_io_t>::compute_all_outputs
-(pdf_fcn_io_t* syms,
- std::vector<float>& out)
-{
- // use the first 'n_code_output' symbols, convert them into metrics,
- // then compute all possible (summation) combinations of them and
- // return those in the provided vector.
-
- convert (d_n_code_outputs, syms,
- (void*)(&(in_f[0][0])), (void*)(&in_f[1][0]));
-
- // assign the starting minimum metric to 0. This is safe because
- // metrics are always non-negative.
-
- float min_metric = 0;
- for (size_t m = 0; m < (((size_t)2) << d_n_code_outputs); m++) {
- size_t t_out_ndx = m;
- float t_metric = 0;
- for (size_t n = 0; n < d_n_code_outputs; n++, t_out_ndx >>= 1)
- t_metric += in_f[t_out_ndx&1][n];
- if (t_metric < min_metric)
- min_metric = t_metric;
- out[m] = t_metric;
- }
-
- // normalize so that the minimum metric equals 0
-
- for (size_t m = 0; m < d_n_code_outputs; m++)
- out[m] -= min_metric;
-}
-#endif
Modified:
gnuradio/branches/developers/michaelld/wip/gr-error-correcting-codes/src/lib/libecc/code_metrics.h
===================================================================
---
gnuradio/branches/developers/michaelld/wip/gr-error-correcting-codes/src/lib/libecc/code_metrics.h
2006-08-15 03:39:14 UTC (rev 3286)
+++
gnuradio/branches/developers/michaelld/wip/gr-error-correcting-codes/src/lib/libecc/code_metrics.h
2006-08-15 07:50:33 UTC (rev 3287)
@@ -39,18 +39,7 @@
pdf_fcn_io_t max_sample,
int sample_precision = 0);
-#if 0
template<typename pdf_fcn_io_t>
-class code_metrics_decoder;
-
-template<typename pdf_fcn_io_t>
-libecc_code_metrics_create_decoder
-(code_convolutional_trellis* trellis,
- code_metrics_table<pdf_fcn_io_t>* table = 0,
- int sample_precision = 0);
-#endif
-
-template<typename pdf_fcn_io_t>
class code_metrics_table
{
/*
@@ -158,15 +147,4 @@
std::vector<metric_t> d_metric_table_0_bit, d_metric_table_1_bit;
};
-#if 0
- // compute all output-bit combinations of the incoming symbols' metrics
-
- void compute_all_outputs (pdf_fcn_io_t* syms, std::vector<unsigned long>&
out);
- void compute_all_outputs (pdf_fcn_io_t* syms, std::vector<float>& out);
-
- size_t d_n_code_outputs;
- std::vector<unsigned long> in_l[2];
- std::vector<float> in_f[2];
-#endif
-
#endif /* INCLUDED_CODE_METRICS_H */
Modified:
gnuradio/branches/developers/michaelld/wip/gr-error-correcting-codes/src/lib/libecc/decoder_viterbi.cc
===================================================================
---
gnuradio/branches/developers/michaelld/wip/gr-error-correcting-codes/src/lib/libecc/decoder_viterbi.cc
2006-08-15 03:39:14 UTC (rev 3286)
+++
gnuradio/branches/developers/michaelld/wip/gr-error-correcting-codes/src/lib/libecc/decoder_viterbi.cc
2006-08-15 07:50:33 UTC (rev 3287)
@@ -55,6 +55,69 @@
#include <mld/mld_timer.h>
#include <mld/n2bs.h>
+
+#if 0
+// at instantiation
+
+ // for compute_all_outputs
+
+ in_l[0].resize (d_n_code_outputs);
+ in_l[1].resize (d_n_code_outputs);
+ in_f[0].resize (d_n_code_outputs);
+ in_f[1].resize (d_n_code_outputs);
+#endif
+
+#if 0
+template<typename pdf_fcn_io_t, typename computation_t>
+void
+code_metrics<pdf_fcn_io_t>::compute_all_outputs
+(pdf_fcn_io_t* syms,
+ std::vector<computation_t>& out)
+{
+ // use the first 'n_code_output' symbols, convert them into metrics,
+ // then call the other "compute_all_outputs"
+
+ convert (d_n_code_outputs, syms,
+ (void*)(&(in_c[0][0])), (void*)(&in_c[1][0]));
+
+ compute_all_outputs (&(in_c[0][0]), out);
+}
+
+template<typename metric_t, typename computation_t>
+void
+code_metrics<metric_t>::compute_all_outputs
+(metric_t** metrics,
+ std::vector<computation_t>& out)
+{
+ // compute all possible (summation) combinations of the metrics
+ // using <computation_t>-precision (e.g. "float") computations and
+ // return those in the provided vector.
+
+ // the input metrics must be a [2][d_n_code_outputs] "matrix", with
+ // the [0][] and [1][] entries representing p(0|sym) and p(1|sym),
+ // respectively.
+
+ // assign the starting minimum metric to 0. This is safe because
+ // metrics are always non-negative.
+
+ computation_t min_metric = 0;
+ for (size_t m = 0; m < (((size_t)1) << d_n_code_outputs); m++) {
+ size_t t_out_ndx = m;
+ computation_t t_metric = 0;
+ for (size_t n = 0; n < d_n_code_outputs; n++, t_out_ndx >>= 1)
+ t_metric += metrics[t_out_ndx&1][n];
+ if (t_metric < min_metric)
+ min_metric = t_metric;
+ out[m] = t_metric;
+ }
+
+ // normalize so that the minimum metric equals 0
+
+ for (size_t m = 0; m < d_n_code_outputs; m++)
+ out[m] -= min_metric;
+}
+#endif
+
decoder_viterbi::decoder_viterbi
(int sample_precision,
const encoder_convolutional* l_encoder)
Modified:
gnuradio/branches/developers/michaelld/wip/gr-error-correcting-codes/src/lib/libecc/decoder_viterbi.h
===================================================================
---
gnuradio/branches/developers/michaelld/wip/gr-error-correcting-codes/src/lib/libecc/decoder_viterbi.h
2006-08-15 03:39:14 UTC (rev 3286)
+++
gnuradio/branches/developers/michaelld/wip/gr-error-correcting-codes/src/lib/libecc/decoder_viterbi.h
2006-08-15 07:50:33 UTC (rev 3287)
@@ -26,6 +26,27 @@
#include "decoder.h"
#include "encoder_convolutional.h"
+#if 0
+template<typename pdf_fcn_io_t>
+class code_metrics_decoder;
+
+template<typename pdf_fcn_io_t>
+libecc_code_metrics_create_decoder
+(code_convolutional_trellis* trellis,
+ code_metrics_table<pdf_fcn_io_t>* table = 0,
+ int sample_precision = 0);
+
+
+ // compute all output-bit combinations of the incoming symbols' metrics
+
+ void compute_all_outputs (pdf_fcn_io_t* syms, std::vector<unsigned long>&
out);
+ void compute_all_outputs (pdf_fcn_io_t* syms, std::vector<float>& out);
+
+ size_t d_n_code_outputs;
+ std::vector<unsigned long> in_l[2];
+ std::vector<float> in_f[2];
+#endif
+
class decoder_viterbi : public decoder
{
public:
Modified:
gnuradio/branches/developers/michaelld/wip/gr-gsm-fr-vocoder/src/lib/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/wip/gr-gsm-fr-vocoder/src/lib/Makefile.am
2006-08-15 03:39:14 UTC (rev 3286)
+++
gnuradio/branches/developers/michaelld/wip/gr-gsm-fr-vocoder/src/lib/Makefile.am
2006-08-15 07:50:33 UTC (rev 3287)
@@ -44,7 +44,7 @@
LOCAL_IFILES = \
- gsm_full_rate.i
+ $(top_srcdir)/gr-gsm-fr-vocoder/src/lib/gsm_full_rate.i
# These files are built by SWIG. The first is the C++ glue.
# The second is the python wrapper that loads the _howto shared library
@@ -80,7 +80,7 @@
-lstdc++
gsm_full_rate.cc gsm_full_rate.py: gsm_full_rate.i $(ALL_IFILES)
- $(SWIG) $(SWIGPYTHONARGS) -module gsm_full_rate -o gsm_full_rate.cc $<
+ $(SWIG) $(SWIGPYTHONARGS) -module gsm_full_rate -o gsm_full_rate.cc
$(LOCAL_IFILES)
# These headers get installed in ${prefix}/include/gnuradio
grinclude_HEADERS = \
Modified:
gnuradio/branches/developers/michaelld/wip/gr-trellis/src/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/michaelld/wip/gr-trellis/src/lib/Makefile.am
2006-08-15 03:39:14 UTC (rev 3286)
+++ gnuradio/branches/developers/michaelld/wip/gr-trellis/src/lib/Makefile.am
2006-08-15 07:50:33 UTC (rev 3287)
@@ -43,7 +43,7 @@
LOCAL_IFILES = \
- trellis.i
+ $(top_srcdir)/gr-trellis/src/lib/trellis.i
# These files are built by SWIG. The first is the C++ glue.
@@ -80,8 +80,8 @@
$(GNURADIO_CORE_LIBS) \
-lstdc++
-trellis.cc trellis.py: trellis.i $(ALL_IFILES)
- $(SWIG) $(SWIGPYTHONARGS) -module trellis -o trellis.cc $<
+trellis.cc trellis.py: $(ALL_IFILES)
+ $(SWIG) $(SWIGPYTHONARGS) -module trellis -o trellis.cc $(LOCAL_IFILES)
# These headers get installed in ${prefix}/include/gnuradio
grinclude_HEADERS = \
Modified: gnuradio/branches/developers/michaelld/wip/gr-usrp/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/michaelld/wip/gr-usrp/src/Makefile.am
2006-08-15 03:39:14 UTC (rev 3286)
+++ gnuradio/branches/developers/michaelld/wip/gr-usrp/src/Makefile.am
2006-08-15 07:50:33 UTC (rev 3287)
@@ -32,7 +32,7 @@
TESTS = run_tests
LOCAL_IFILES = \
- usrp1.i
+ $(top_srcdir)/gr-usrp/src/usrp1.i
NON_LOCAL_IFILES = $(GNURADIO_I)
@@ -102,8 +102,8 @@
_usrp1_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
-usrp1.cc usrp1.py: usrp1.i $(NON_LOCAL_IFILES)
- $(SWIG) $(SWIGPYTHONARGS) -module usrp1 -o usrp1.cc $<
+usrp1.cc usrp1.py: usrp1.i $(NON_LOCAL_IFILES) $(LOCAL_IFILES)
+ $(SWIG) $(SWIGPYTHONARGS) -module usrp1 -o usrp1.cc $(LOCAL_IFILES)
noinst_PYTHON = \
Modified:
gnuradio/branches/developers/michaelld/wip/gr-video-sdl/src/Makefile.am
===================================================================
--- gnuradio/branches/developers/michaelld/wip/gr-video-sdl/src/Makefile.am
2006-08-15 03:39:14 UTC (rev 3286)
+++ gnuradio/branches/developers/michaelld/wip/gr-video-sdl/src/Makefile.am
2006-08-15 07:50:33 UTC (rev 3287)
@@ -32,7 +32,7 @@
TESTS = run_tests
LOCAL_IFILES = \
- video_sdl.i
+ $(top_srcdir)/gr-video-sdl/src/video_sdl.i
NON_LOCAL_IFILES = \
$(GNURADIO_I)
@@ -75,8 +75,8 @@
_video_sdl_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
-video_sdl.cc video_sdl.py: video_sdl.i
- $(SWIG) $(SWIGCPPPYTHONARGS) -module video_sdl -o video_sdl.cc $<
+video_sdl.cc video_sdl.py: $(ALL_IFILES)
+ $(SWIG) $(SWIGCPPPYTHONARGS) -module video_sdl -o video_sdl.cc
$(LOCAL_IFILES)
noinst_PYTHON = qa_video_sdl.py
Modified:
gnuradio/branches/developers/michaelld/wip/usrp/firmware/lib/Makefile.am
===================================================================
--- gnuradio/branches/developers/michaelld/wip/usrp/firmware/lib/Makefile.am
2006-08-15 03:39:14 UTC (rev 3286)
+++ gnuradio/branches/developers/michaelld/wip/usrp/firmware/lib/Makefile.am
2006-08-15 07:50:33 UTC (rev 3287)
@@ -57,13 +57,9 @@
all: libfx2.lib
-%.rel : %.c
+.c.rel:
$(XCC) $(INCLUDES) $(DEFINES) -c $< -o $@
-%.rel : %.a51
- $(XAS) $<
-
-
$(LIBRARY): $(LIBOBJS)
-rm -f $(LIBRARY)
touch $(LIBRARY)
Modified:
gnuradio/branches/developers/michaelld/wip/usrp/firmware/src/usrp2/Makefile.am
===================================================================
---
gnuradio/branches/developers/michaelld/wip/usrp/firmware/src/usrp2/Makefile.am
2006-08-15 03:39:14 UTC (rev 3286)
+++
gnuradio/branches/developers/michaelld/wip/usrp/firmware/src/usrp2/Makefile.am
2006-08-15 07:50:33 UTC (rev 3287)
@@ -90,11 +90,11 @@
burn-usrp4-eeprom
-%.rel : %.c
+.c.rel:
$(XCC) $(INCLUDES) $(DEFINES) \
-c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-%.rel : %.a51
+.a51.rel:
test -f `basename '$<'` || ln -s '$<' .
test -f ../common/`basename '$<'` -o \
\! -f `dirname '$<'`/../common/`basename '$<'` \
@@ -108,11 +108,11 @@
$(XCC) $(LINKOPTS) -o $@ $(EEPROM_BOOT_OBJS)
burn-usrp2-eeprom: eeprom_boot.ihx
- $(srcdir)/../common/build_eeprom.py -r2 $< > $@
+ $(srcdir)/../common/build_eeprom.py -r2 eeprom_boot.ihx > $@
chmod +x $@
burn-usrp4-eeprom: eeprom_boot.ihx
- $(srcdir)/../common/build_eeprom.py -r4 $< > $@
+ $(srcdir)/../common/build_eeprom.py -r4 eeprom_boot.ihx > $@
chmod +x $@
Modified: gnuradio/branches/developers/michaelld/wip/usrp/host/swig/Makefile.am
===================================================================
--- gnuradio/branches/developers/michaelld/wip/usrp/host/swig/Makefile.am
2006-08-15 03:39:14 UTC (rev 3286)
+++ gnuradio/branches/developers/michaelld/wip/usrp/host/swig/Makefile.am
2006-08-15 07:50:33 UTC (rev 3287)
@@ -71,7 +71,7 @@
prims.cc usrp_prims.py : prims.i ../../firmware/include/fpga_regs_common.h
../../firmware/include/fpga_regs_standard.h
- $(SWIG) $(SWIGPYTHONARGS) -module usrp_prims -o prims.cc $<
+ $(SWIG) $(SWIGPYTHONARGS) -module usrp_prims -o prims.cc prims.i
MOSTLYCLEANFILES = \
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r3287 - in gnuradio/branches/developers/michaelld/wip: . gnuradio-core/src/lib/swig gr-atsc/src/lib gr-audio-oss/src gr-audio-windows/src gr-error-correcting-codes/src/lib/libecc gr-gsm-fr-vocoder/src/lib gr-trellis/src/lib gr-usrp/src gr-video-sdl/src usrp/firmware/lib usrp/firmware/src/usrp2 usrp/host/swig,
michaelld <=