diff options
author | stevie <stevie@65a5c917-d112-43f1-993d-58c26a4786be> | 2011-05-29 21:09:16 +0000 |
---|---|---|
committer | stevie <stevie@65a5c917-d112-43f1-993d-58c26a4786be> | 2011-05-29 21:09:16 +0000 |
commit | fa7f4643201523313fd6f6b58db34077c1469ad8 (patch) | |
tree | b9f60a57ecdb1a16e826e17bc8246cc09bf65e42 /decoder/Makefile.am | |
parent | da6ffc8343221ca66789c2e9c62506e5653301ea (diff) |
Resolving conflicts caused by name change.
git-svn-id: http://op25.osmocom.org/svn/trunk@284 65a5c917-d112-43f1-993d-58c26a4786be
Diffstat (limited to 'decoder/Makefile.am')
-rw-r--r-- | decoder/Makefile.am | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/decoder/Makefile.am b/decoder/Makefile.am deleted file mode 100644 index 3ec820f..0000000 --- a/decoder/Makefile.am +++ /dev/null @@ -1,29 +0,0 @@ -# -# Copyright 2004 Free Software Foundation, Inc. -# -# This file is part of OP25 -# -# OP25 is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. -# -# OP25 is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with OP25; 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 - -EXTRA_DIST = configure config.h.in -SUBDIRS = config src -DIST_SUBDIRS = config src - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = |