diff options
| author | Tom Rondeau | 2010-11-29 13:01:07 -0500 |
|---|---|---|
| committer | Tom Rondeau | 2010-11-29 13:01:07 -0500 |
| commit | 970d0eff587c0dfa04543473f9525b45e0f7bb2d (patch) | |
| tree | 6c9089678147053501611a3eadaf31ef4d803f87 /gnuradio-core/src/lib/general/Makefile.am | |
| parent | b245c628f4f5e252740e0248a33c0266640cb0bb (diff) | |
| parent | 34a9654fa10efcf360fde9c42c624739abaabbc5 (diff) | |
| download | gnuradio-970d0eff587c0dfa04543473f9525b45e0f7bb2d.tar.gz gnuradio-970d0eff587c0dfa04543473f9525b45e0f7bb2d.tar.bz2 gnuradio-970d0eff587c0dfa04543473f9525b45e0f7bb2d.zip | |
Merge branch 'tagging' into next
Diffstat (limited to 'gnuradio-core/src/lib/general/Makefile.am')
| -rw-r--r-- | gnuradio-core/src/lib/general/Makefile.am | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/gnuradio-core/src/lib/general/Makefile.am b/gnuradio-core/src/lib/general/Makefile.am index 3d8a42805..0e9109d6c 100644 --- a/gnuradio-core/src/lib/general/Makefile.am +++ b/gnuradio-core/src/lib/general/Makefile.am @@ -175,7 +175,10 @@ libgeneral_la_SOURCES = \ gr_descrambler_bb.cc \ gr_scrambler_bb.cc \ gr_probe_mpsk_snr_c.cc \ - gr_probe_density_b.cc + gr_probe_density_b.cc \ + gr_annotator_alltoall.cc \ + gr_annotator_1to1.cc \ + gr_burst_tagger.cc libgeneral_qa_la_SOURCES = \ qa_general.cc \ @@ -344,7 +347,10 @@ grinclude_HEADERS = \ gr_descrambler_bb.h \ gr_scrambler_bb.h \ gr_probe_mpsk_snr_c.h \ - gr_probe_density_b.h + gr_probe_density_b.h \ + gr_annotator_alltoall.h \ + gr_annotator_1to1.h \ + gr_burst_tagger.h noinst_HEADERS = \ qa_general.h \ @@ -484,5 +490,8 @@ swiginclude_HEADERS = \ gr_descrambler_bb.i \ gr_scrambler_bb.i \ gr_probe_mpsk_snr_c.i \ - gr_probe_density_b.i + gr_probe_density_b.i \ + gr_annotator_alltoall.i \ + gr_annotator_1to1.i \ + gr_burst_tagger.i endif |