summaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authorKenneth Mortensen <mortensenit@users.noreply.github.com>2015-01-05 16:36:52 +0100
committerKenneth Mortensen <mortensenit@users.noreply.github.com>2015-01-05 16:36:52 +0100
commit191817b42ad86a250bbff02895e9646f51531672 (patch)
tree521d6b1a9a30a657d84c80ca9660c24c4db8ee86 /Makefile.am
parentfcc439f1387887110ccbf0e9e6a6d116eba315ac (diff)
parent94c1f63b6fd07d74f3325274dd19fd6beaf53965 (diff)
downloaddabmod-191817b42ad86a250bbff02895e9646f51531672.tar.gz
dabmod-191817b42ad86a250bbff02895e9646f51531672.tar.bz2
dabmod-191817b42ad86a250bbff02895e9646f51531672.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am6
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index f599871..c0b3024 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,7 @@
# Copyright (C) 2007, 2008, 2009, 2010 Her Majesty the Queen in Right
# of Canada (Communications Research Center Canada)
+#
+# Copyright (C) 2014 Matthias P. Braendli, http://mpb.li
# This file is part of ODR-DabMod.
#
@@ -16,8 +18,8 @@
# You should have received a copy of the GNU General Public License
# along with ODR-DabMod. If not, see <http://www.gnu.org/licenses/>.
-SUBDIRS =src lib
+SUBDIRS = src lib
ACLOCAL_AMFLAGS = -I m4
-EXTRA_DIST =COPYING NEWS README AUTHORS ChangeLog TODO doc
+EXTRA_DIST = COPYING NEWS README.md AUTHORS ChangeLog TODO doc