diff options
| author | Nick Foster | 2011-01-10 15:25:19 -0800 |
|---|---|---|
| committer | Nick Foster | 2011-01-10 15:25:19 -0800 |
| commit | 70e978b7fdc0285b56ed3ec7be3f10dc3d922504 (patch) | |
| tree | 75231113034c1ac75277fbe444c02e9b600b2a7a /grc/Makefile.am | |
| parent | 0e92b93f21fc9c324c379bc318120d414e7422cc (diff) | |
| parent | bb438e7d12c5767123f8abed5810f284a5f18bf8 (diff) | |
| download | gnuradio-70e978b7fdc0285b56ed3ec7be3f10dc3d922504.tar.gz gnuradio-70e978b7fdc0285b56ed3ec7be3f10dc3d922504.tar.bz2 gnuradio-70e978b7fdc0285b56ed3ec7be3f10dc3d922504.zip | |
Merge branch 'next' of http://gnuradio.org/git/gnuradio into next
Diffstat (limited to 'grc/Makefile.am')
| -rw-r--r-- | grc/Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/grc/Makefile.am b/grc/Makefile.am index 2b5dc730b..330777bb7 100644 --- a/grc/Makefile.am +++ b/grc/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2008, 2009 Free Software Foundation, Inc. +# Copyright 2008,2009,2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -41,9 +41,9 @@ ourpython_PYTHON = __init__.py etcdir = $(gr_prefsdir) dist_etc_DATA = grc.conf -EXTRA_DIST = $(srcdir)/grc.conf.in +EXTRA_DIST += $(srcdir)/grc.conf.in -BUILT_SOURCES = grc.conf +BUILT_SOURCES += grc.conf grc.conf: $(srcdir)/grc.conf.in Makefile sed \ |