diff options
| author | Johnathan Corgan | 2012-04-07 19:32:10 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2012-04-07 19:32:10 -0700 |
| commit | 9bef26c9271a7b9253075bda3c1fc7c8078c0343 (patch) | |
| tree | a6c1329bb902c95c8ab9970f38ec5fb46d79167c /gr-howto-write-a-block/grc | |
| parent | f621a52f779381cfe550b4278b83e701a747944c (diff) | |
| parent | ef72dc714840dfb8fe3f918dda243f74453b6cc7 (diff) | |
| download | gnuradio-9bef26c9271a7b9253075bda3c1fc7c8078c0343.tar.gz gnuradio-9bef26c9271a7b9253075bda3c1fc7c8078c0343.tar.bz2 gnuradio-9bef26c9271a7b9253075bda3c1fc7c8078c0343.zip | |
Merge branch 'next'
Diffstat (limited to 'gr-howto-write-a-block/grc')
| -rw-r--r-- | gr-howto-write-a-block/grc/.gitignore | 2 | ||||
| -rw-r--r-- | gr-howto-write-a-block/grc/CMakeLists.txt (renamed from gr-howto-write-a-block/grc/Makefile.am) | 17 |
2 files changed, 6 insertions, 13 deletions
diff --git a/gr-howto-write-a-block/grc/.gitignore b/gr-howto-write-a-block/grc/.gitignore deleted file mode 100644 index b336cc7ce..000000000 --- a/gr-howto-write-a-block/grc/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/Makefile -/Makefile.in diff --git a/gr-howto-write-a-block/grc/Makefile.am b/gr-howto-write-a-block/grc/CMakeLists.txt index 32dcf1b9e..cc43db7ba 100644 --- a/gr-howto-write-a-block/grc/Makefile.am +++ b/gr-howto-write-a-block/grc/CMakeLists.txt @@ -1,5 +1,4 @@ -# -# Copyright 2009 Free Software Foundation, Inc. +# Copyright 2011 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -17,13 +16,9 @@ # along with GNU Radio; see the file COPYING. If not, write to # the Free Software Foundation, Inc., 51 Franklin Street, # Boston, MA 02110-1301, USA. -# - -include $(top_srcdir)/Makefile.common - -grcblocksdir = $(grc_blocksdir) - -dist_grcblocks_DATA = \ - howto_square_ff.xml \ - howto_square2_ff.xml +install(FILES + howto_square_ff.xml + howto_square2_ff.xml + DESTINATION share/gnuradio/grc/blocks +) |