diff options
author | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2009-03-14 02:28:41 +0000 |
---|---|---|
committer | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2009-03-14 02:28:41 +0000 |
commit | c3f962a1f0a4132ad643c58774bb69b190dccc49 (patch) | |
tree | daa59a206d6fde01dc1404197e981927366af0e0 /gr-radar-mono/src | |
parent | 4eea337c46db44a6ee7560a4552e158421776777 (diff) |
Merged r10554:10595 from michaelld/am_swig_4 into trunk. Major overhaul of SWIG usage in build system, also fixes ticket:130. Trunk passes distcheck.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10596 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gr-radar-mono/src')
-rw-r--r-- | gr-radar-mono/src/fpga/lib/Makefile.am | 4 | ||||
-rw-r--r-- | gr-radar-mono/src/fpga/models/Makefile.am | 4 | ||||
-rw-r--r-- | gr-radar-mono/src/fpga/tb/Makefile.am | 4 | ||||
-rw-r--r-- | gr-radar-mono/src/fpga/top/Makefile.am | 5 | ||||
-rw-r--r-- | gr-radar-mono/src/python/Makefile.am | 2 |
5 files changed, 7 insertions, 12 deletions
diff --git a/gr-radar-mono/src/fpga/lib/Makefile.am b/gr-radar-mono/src/fpga/lib/Makefile.am index 2c5205382a..a48e4f87f4 100644 --- a/gr-radar-mono/src/fpga/lib/Makefile.am +++ b/gr-radar-mono/src/fpga/lib/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2007 Free Software Foundation, Inc. +# Copyright 2007,2009 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -31,4 +31,4 @@ EXTRA_DIST = \ fifo32_2k.v \ cordic_nco.v -MOSTLYCLEANFILES = *~ *.bak +MOSTLYCLEANFILES += *.bak diff --git a/gr-radar-mono/src/fpga/models/Makefile.am b/gr-radar-mono/src/fpga/models/Makefile.am index 1d51f485fa..ca59fe78f9 100644 --- a/gr-radar-mono/src/fpga/models/Makefile.am +++ b/gr-radar-mono/src/fpga/models/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2007 Free Software Foundation, Inc. +# Copyright 2007,2009 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -23,5 +23,3 @@ include $(top_srcdir)/Makefile.common EXTRA_DIST = \ fifo_1clk.v - -MOSTLYCLEANFILES = *~ diff --git a/gr-radar-mono/src/fpga/tb/Makefile.am b/gr-radar-mono/src/fpga/tb/Makefile.am index 44394db192..1bff8795f2 100644 --- a/gr-radar-mono/src/fpga/tb/Makefile.am +++ b/gr-radar-mono/src/fpga/tb/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2007 Free Software Foundation, Inc. +# Copyright 2007,2009 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -27,4 +27,4 @@ EXTRA_DIST = \ radar_tb.sh \ radar_tb_wave.sh -MOSTLYCLEANFILES = *~ *.vcd *.out* radar_tb +MOSTLYCLEANFILES += *.vcd *.out* radar_tb diff --git a/gr-radar-mono/src/fpga/top/Makefile.am b/gr-radar-mono/src/fpga/top/Makefile.am index 606aa6c445..f51f3def3c 100644 --- a/gr-radar-mono/src/fpga/top/Makefile.am +++ b/gr-radar-mono/src/fpga/top/Makefile.am @@ -37,7 +37,7 @@ EXTRA_DIST = \ usrp_radar_mono.qsf \ usrp_radar_mono.v -MOSTLYCLEANFILES = \ +MOSTLYCLEANFILES += \ db/* \ *.rpt \ *.summary \ @@ -45,5 +45,4 @@ MOSTLYCLEANFILES = \ *.smsg \ *.done \ *.pin \ - *.sof \ - *~ + *.sof diff --git a/gr-radar-mono/src/python/Makefile.am b/gr-radar-mono/src/python/Makefile.am index 366e817643..8a44b68102 100644 --- a/gr-radar-mono/src/python/Makefile.am +++ b/gr-radar-mono/src/python/Makefile.am @@ -29,5 +29,3 @@ dist_bin_SCRIPTS = \ dist_ourpython_PYTHON = \ radar_mono.py - -MOSTLYCLEANFILES = *~ *.pyc *.pyo |