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.common | |
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.common')
-rw-r--r-- | decoder/Makefile.common | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/decoder/Makefile.common b/decoder/Makefile.common deleted file mode 100644 index cfa5b18..0000000 --- a/decoder/Makefile.common +++ /dev/null @@ -1,43 +0,0 @@ -# -*- Makefile -*- -# -# Copyright 2004,2006 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. -# - -# includes -grincludedir = $(includedir)/gnuradio - -# swig includes -swigincludedir = $(grincludedir)/swig - -# Install this stuff in the appropriate subdirectory -# This usually ends up at: -# ${prefix}/lib/python${python_version}/site-packages/gnuradio - -grpythondir = $(pythondir)/gnuradio -grpyexecdir = $(pyexecdir)/gnuradio - -# swig flags -SWIGPYTHONFLAGS = -fvirtual -python -modern -SWIGGRFLAGS = -I$(GNURADIO_CORE_INCLUDEDIR)/swig -I$(GNURADIO_CORE_INCLUDEDIR) - -# Don't assume that make predefines $(RM), because BSD make does -# not. We define it now in configure.ac using AM_PATH_PROG, but now -# here have to add a -f to be like GNU make. -RM=$(RM_PROG) -f |