diff options
| author | Tom Rondeau | 2011-10-18 20:46:04 -0700 |
|---|---|---|
| committer | Tom Rondeau | 2011-10-18 20:46:04 -0700 |
| commit | 52b42b9e958be6908ab5279bbe4ecea8b2464ee8 (patch) | |
| tree | 3340aef44ae5fd7607f659e27b9b02de3d13670e /gnuradio-core/src/lib/general/Makefile.am | |
| parent | 3b08bd8312f7499a3ffcaba147f5fe7a66f91ba4 (diff) | |
| parent | 6474548641d8b611adf6c5a08aa3da06508d77bf (diff) | |
| download | gnuradio-52b42b9e958be6908ab5279bbe4ecea8b2464ee8.tar.gz gnuradio-52b42b9e958be6908ab5279bbe4ecea8b2464ee8.tar.bz2 gnuradio-52b42b9e958be6908ab5279bbe4ecea8b2464ee8.zip | |
Merge branch 'master' into next
Conflicts:
gnuradio-core/src/lib/general/general.i
Diffstat (limited to 'gnuradio-core/src/lib/general/Makefile.am')
| -rw-r--r-- | gnuradio-core/src/lib/general/Makefile.am | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gnuradio-core/src/lib/general/Makefile.am b/gnuradio-core/src/lib/general/Makefile.am index 5915ff45b..0e52b7b79 100644 --- a/gnuradio-core/src/lib/general/Makefile.am +++ b/gnuradio-core/src/lib/general/Makefile.am @@ -139,6 +139,7 @@ libgeneral_la_SOURCES = \ gr_test.cc \ gr_threshold_ff.cc \ gr_throttle.cc \ + gr_transcendental.cc \ gr_uchar_to_float.cc \ gr_vco_f.cc \ gr_vector_to_stream.cc \ @@ -290,6 +291,7 @@ grinclude_HEADERS = \ gr_test.h \ gr_threshold_ff.h \ gr_throttle.h \ + gr_transcendental.h \ gr_uchar_to_float.h \ gr_vco.h \ gr_vco_f.h \ @@ -437,6 +439,7 @@ swiginclude_HEADERS = \ gr_test.i \ gr_threshold_ff.i \ gr_throttle.i \ + gr_transcendental.i \ gr_uchar_to_float.i \ gr_vco_f.i \ gr_vector_to_stream.i \ |