diff options
| author | Tom Rondeau | 2012-02-14 19:43:51 -0500 |
|---|---|---|
| committer | Tom Rondeau | 2012-02-14 19:43:51 -0500 |
| commit | 4f0b3fbe765b9f4ce744e2c2c182715fc63756e2 (patch) | |
| tree | 93665d11dbbec89ab376d4aead5ff321644f64ba /gnuradio-core/src/lib/general | |
| parent | ba3f1a4e8d5879c91eb5c47cc7e7c3ac73b1989d (diff) | |
| parent | 2eaa0a6e1e57cfc374c258c317ecb469fc49bf53 (diff) | |
| download | gnuradio-4f0b3fbe765b9f4ce744e2c2c182715fc63756e2.tar.gz gnuradio-4f0b3fbe765b9f4ce744e2c2c182715fc63756e2.tar.bz2 gnuradio-4f0b3fbe765b9f4ce744e2c2c182715fc63756e2.zip | |
Merge branch 'safe_align' of vortex.corganenterprises.com:gnuradio-trondeau into safe_align
Diffstat (limited to 'gnuradio-core/src/lib/general')
| -rw-r--r-- | gnuradio-core/src/lib/general/Makefile.am | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gnuradio-core/src/lib/general/Makefile.am b/gnuradio-core/src/lib/general/Makefile.am index ea3b31fd3..5b4a702e1 100644 --- a/gnuradio-core/src/lib/general/Makefile.am +++ b/gnuradio-core/src/lib/general/Makefile.am @@ -129,8 +129,8 @@ libgeneral_la_SOURCES = \ gr_reverse.cc \ gr_rms_cf.cc \ gr_rms_ff.cc \ + gr_short_to_char.cc \ gr_short_to_float.cc \ - gr_short_to_int.cc \ gr_int_to_float.cc \ gr_simple_correlator.cc \ gr_simple_framer.cc \ @@ -194,8 +194,8 @@ libgeneral_qa_la_SOURCES = \ grinclude_HEADERS = \ gr_core_api.h \ complex_vec_test.h \ - gr_add.h \ gr_additive_scrambler_bb.h \ + gr_add_ff.h \ gr_agc_cc.h \ gr_agc_ff.h \ gr_agc2_cc.h \ @@ -339,7 +339,7 @@ grinclude_HEADERS = \ gri_int_to_float.h \ gri_lfsr_15_1_0.h \ gri_lfsr_32k.h \ - gri_short_to_char.h \ + gri_short_to_float.h \ gri_uchar_to_float.h \ malloc16.h \ random.h \ @@ -368,8 +368,8 @@ noinst_HEADERS = \ swiginclude_HEADERS = \ complex_vec_test.i \ general.i \ - gr_add.i \ gr_additive_scrambler_bb.i \ + gr_add_ff.i \ gr_agc_cc.i \ gr_agc_ff.i \ gr_agc2_cc.i \ |