diff options
author | Matt Ettus | 2009-10-06 00:33:39 -0700 |
---|---|---|
committer | Matt Ettus | 2009-10-06 00:33:39 -0700 |
commit | 3f8026a00c261c788357b3a04f5b338a6cda4d0e (patch) | |
tree | da08ade9266b2205c79967601f201e22da6cbe9b /config/Makefile.am | |
parent | 61926130bef20051001f97abfae4c16ffc7963f6 (diff) | |
parent | c6b4290d73069e4e4f0f71b04a65b9670318e86d (diff) | |
download | gnuradio-3f8026a00c261c788357b3a04f5b338a6cda4d0e.tar.gz gnuradio-3f8026a00c261c788357b3a04f5b338a6cda4d0e.tar.bz2 gnuradio-3f8026a00c261c788357b3a04f5b338a6cda4d0e.zip |
Merge branch 'master' of http://gnuradio.org/git/gnuradio
Diffstat (limited to 'config/Makefile.am')
-rw-r--r-- | config/Makefile.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/Makefile.am b/config/Makefile.am index 3aead353a..eb1056eb6 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -83,6 +83,7 @@ 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 \ @@ -97,6 +98,7 @@ m4macros = \ gr_subversion.m4 \ gr_swig.m4 \ gr_sysv_shm.m4 \ + gr_version.m4 \ lf_cc.m4 \ lf_cxx.m4 \ lf_warnings.m4 \ |