Merge branch 'master' into udp

[debian/gnuradio] / config / Makefile.am

diff --git a/config/Makefile.am b/config/Makefile.am
index 3aead353a986872239918021825d2be08a3bf119..959b8f014b00e5e4cca53a300763cb82fc8188b5 100644 (file)
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2001,2006,2008,2009 Free Software Foundation, Inc.
+# Copyright 2001,2006,2008,2009,2010 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -68,9 +68,7 @@ m4macros = \
        grc_gr_trellis.m4 \
        grc_gr_usrp.m4 \
        grc_gr_video_sdl.m4 \
-       grc_gr_vrt.m4 \
        grc_gr_wxgui.m4 \
-       grc_mblock.m4 \
        grc_gruel.m4 \
        grc_vrt.m4 \
        gr_check_createfilemapping.m4 \
@@ -83,11 +81,11 @@ m4macros = \
        gr_doxygen.m4 \
        gr_fortran.m4 \
        gr_gcell.m4 \
+       gr_git.m4 \
        gr_gprof.m4 \
        gr_lib64.m4 \
        gr_libgnuradio_core_extra_ldflags.m4 \
        gr_no_undefined.m4 \
-       gr_omnithread.m4 \
        gr_pwin32.m4 \
        gr_python.m4 \
        gr_require_mc4020.m4 \
@@ -97,6 +95,7 @@ m4macros = \
        gr_subversion.m4 \
        gr_swig.m4 \
        gr_sysv_shm.m4 \
+       gr_version.m4 \
        lf_cc.m4 \
        lf_cxx.m4 \
        lf_warnings.m4 \