projects
/
debian
/
gnuradio
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged eb/gcell -r8215:8243 into trunk. This adds gr-gcell, the GNU
[debian/gnuradio]
/
config
/
Makefile.am
diff --git
a/config/Makefile.am
b/config/Makefile.am
index f2ad470e124b0f7cc437b881c8379148837cac33..4e87bc4589a4cd843db12e271e893e55d2fa55d8 100644
(file)
--- a/
config/Makefile.am
+++ b/
config/Makefile.am
@@
-5,7
+5,7
@@
#
# GNU Radio is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
#
# GNU Radio is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version
2
, or (at your option)
+# the Free Software Foundation; either version
3
, or (at your option)
# any later version.
#
# GNU Radio is distributed in the hope that it will be useful,
# any later version.
#
# GNU Radio is distributed in the hope that it will be useful,
@@
-15,8
+15,8
@@
#
# You should have received a copy of the GNU General Public License
# along with GNU Radio; see the file COPYING. If not, write to
#
# You should have received a copy of the GNU General Public License
# along with GNU Radio; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 5
9 Temple Place - Suite 330
,
-# Boston, MA 0211
1-1307
, USA.
+# the Free Software Foundation, Inc., 5
1 Franklin Street
,
+# Boston, MA 0211
0-1301
, USA.
#
include $(top_srcdir)/Makefile.common
#
include $(top_srcdir)/Makefile.common
@@
-29,8
+29,9
@@
m4macros = \
acx_pthread.m4 \
bnv_have_qt.m4 \
cppunit.m4 \
acx_pthread.m4 \
bnv_have_qt.m4 \
cppunit.m4 \
- gr_as.m4 \
gr_boost.m4 \
gr_boost.m4 \
+ grc_build.m4 \
+ grc_gcell.m4 \
grc_gnuradio_core.m4 \
grc_gnuradio_examples.m4 \
grc_gr_atsc.m4 \
grc_gnuradio_core.m4 \
grc_gnuradio_examples.m4 \
grc_gr_atsc.m4 \
@@
-41,10
+42,12
@@
m4macros = \
grc_gr_audio_portaudio.m4 \
grc_gr_audio_windows.m4 \
grc_gr_comedi.m4 \
grc_gr_audio_portaudio.m4 \
grc_gr_audio_windows.m4 \
grc_gr_comedi.m4 \
- grc_gr_error_correcting_codes.m4 \
+ grc_gr_gcell.m4 \
+ grc_gr_gpio.m4 \
grc_gr_gsm_fr_vocoder.m4 \
grc_gr_gsm_fr_vocoder.m4 \
- grc_gr_radar.m4 \
+ grc_gr_radar
_mono
.m4 \
grc_gr_radio_astronomy.m4 \
grc_gr_radio_astronomy.m4 \
+ grc_gr_sounder.m4 \
grc_gr_trellis.m4 \
grc_gr_usrp.m4 \
grc_gr_video_sdl.m4 \
grc_gr_trellis.m4 \
grc_gr_usrp.m4 \
grc_gr_video_sdl.m4 \
@@
-56,6
+59,7
@@
m4macros = \
gr_check_usrp.m4 \
grc_pmt.m4 \
grc_usrp.m4 \
gr_check_usrp.m4 \
grc_pmt.m4 \
grc_usrp.m4 \
+ grc_gr_msdd6000.m4 \
gr_doxygen.m4 \
gr_fortran.m4 \
gr_gprof.m4 \
gr_doxygen.m4 \
gr_fortran.m4 \
gr_gprof.m4 \
@@
-67,6
+71,7
@@
m4macros = \
gr_require_mc4020.m4 \
gr_scripting.m4 \
gr_set_md_cpu.m4 \
gr_require_mc4020.m4 \
gr_scripting.m4 \
gr_set_md_cpu.m4 \
+ gr_subversion.m4 \
gr_swig.m4 \
gr_sysv_shm.m4 \
gr_x86_64.m4 \
gr_swig.m4 \
gr_sysv_shm.m4 \
gr_x86_64.m4 \