diff options
author | Harald Welte <laforge@gnumonks.org> | 2011-05-13 01:46:41 +0200 |
---|---|---|
committer | Harald Welte <laforge@gnumonks.org> | 2011-05-13 01:46:41 +0200 |
commit | 5fea9ab85029df7b3a4b16a24b4d58c353e811b2 (patch) | |
tree | 4538865b00c14cc1eca4b678a01c699973fbb2aa /gsm-receiver/Makefile.common | |
parent | 085852622cb2641fbc1fa88c85494c7951914ebd (diff) |
gsm-receiver: Migrate to more recent gnuradio autotools integration
These changes forward-port gsm-receiver to the gnuradio autotools magic
as per "gr-howto-write-a-block-3.2.2"
It also updates to libosmocore >= 0.3.0 and fixes other minor compilation
issues.
Diffstat (limited to 'gsm-receiver/Makefile.common')
-rw-r--r-- | gsm-receiver/Makefile.common | 34 |
1 files changed, 25 insertions, 9 deletions
diff --git a/gsm-receiver/Makefile.common b/gsm-receiver/Makefile.common index abaac15..4941eaa 100644 --- a/gsm-receiver/Makefile.common +++ b/gsm-receiver/Makefile.common @@ -1,6 +1,6 @@ # -*- Makefile -*- # -# Copyright 2004,2006 Free Software Foundation, Inc. +# Copyright 2004,2006,2009 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -20,13 +20,19 @@ # Boston, MA 02110-1301, USA. # +# these flags are used when compiling non-SWIG-wrapper files +# when going into non-SWIG libraries +AM_CXXFLAGS = @autoconf_default_CXXFLAGS@ + +AM_CPPFLAGS = \ + $(STD_DEFINES_AND_INCLUDES) \ + $(PYTHON_CPPFLAGS) \ + $(CPPUNIT_INCLUDES) \ + $(GNURADIO_CORE_CPPFLAGS) + #!! remove this TCH_DECODER_INCLUDEDIR = $(top_srcdir)/src/lib/decoder/openbtsstuff -MAIN_INCLUDEDIR = $(top_srcdir)/src/lib -DECODER_INCLUDEDIR = $(top_srcdir)/src/lib/decoder -DECODER_LA = $(top_builddir)/src/lib/decoder/libdecoder.la - STD_DEFINES_AND_INCLUDES = \ -I$(DECODER_INCLUDEDIR) \ -I$(MAIN_INCLUDEDIR) \ @@ -34,6 +40,11 @@ STD_DEFINES_AND_INCLUDES = \ $(LIBOSMOCORE_CFLAGS) \ -I$(TCH_DECODER_INCLUDEDIR) + +#MAIN_INCLUDEDIR = $(top_srcdir)/src/lib +#DECODER_INCLUDEDIR = $(top_srcdir)/src/lib/decoder +#DECODER_LA = $(top_builddir)/src/lib/decoder/libdecoder.la + # includes grincludedir = $(includedir)/gnuradio @@ -47,12 +58,17 @@ swigincludedir = $(grincludedir)/swig 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 +STAMPS = +MOSTLYCLEANFILES = $(BUILT_SOURCES) $(STAMPS) *.pyc *.pyo *~ *.tmp *.loT + +# Don't distribute the files defined in the varialbe 'no_dist_files' +dist-hook: + @for file in $(no_dist_files); do \ + echo $(RM) $(distdir)/$$file; \ + $(RM) $(distdir)/$$file; + done; |