From: Johnathan Corgan <jcorgan@corganenterprises.com>
Date: Sat, 12 Dec 2009 17:34:35 +0000 (-0800)
Subject: Merge branch 'wip/pager' of git@gnuradio.org:jcorgan
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=bdf985aa55ed90394f9015ac7577892dba7e5cae;p=debian%2Fgnuradio

Merge branch 'wip/pager' of git@gnuradio.org:jcorgan

Merge-fix: Fix erroneous EXTRA_DIST in lib/
Merge-fix: Don't install usrp_rx_flex.py (unfinished)
---

bdf985aa55ed90394f9015ac7577892dba7e5cae
diff --cc gr-pager/apps/Makefile.am
index 00000000,0e9f1215..7b495fd2
mode 000000,100644..100644
--- a/gr-pager/apps/Makefile.am
+++ b/gr-pager/apps/Makefile.am
@@@ -1,0 -1,35 +1,36 @@@
+ #
+ # Copyright 2009 Free Software Foundation, Inc.
+ # 
+ # This file is part of GNU Radio
+ # 
+ # GNU Radio 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.
+ # 
+ # GNU Radio 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 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
+ 
+ if PYTHON
+ 
+ dist_bin_SCRIPTS = \
+ 	usrp_flex.py \
+ 	usrp_flex_all.py \
 -	usrp_flex_band.py \
++	usrp_flex_band.py
++
++noinst_PYTHON = \
+ 	usrp_rx_flex.py
+ endif
+ 
+ EXTRA_DIST = \
+ 	usrp_rx_flex.grc
 -
diff --cc gr-pager/lib/Makefile.am
index 00000000,42053eb1..1d8a43b3
mode 000000,100644..100644
--- a/gr-pager/lib/Makefile.am
+++ b/gr-pager/lib/Makefile.am
@@@ -1,0 -1,55 +1,53 @@@
+ #
+ # Copyright 2004,2005,2006,2008,2009 Free Software Foundation, Inc.
+ # 
+ # This file is part of GNU Radio
+ # 
+ # GNU Radio 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.
+ # 
+ # GNU Radio 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 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
+ 
 -EXTRA_DIST = run_tests.in
 -
+ AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
+ 
+ # These headers get installed in ${prefix}/include/gnuradio
+ grinclude_HEADERS = \
+ 	pager_slicer_fb.h \
+ 	pager_flex_sync.h \
+ 	pager_flex_deinterleave.h \
+ 	pager_flex_parse.h \
+ 	pager_flex_frame.h \
+ 	pageri_bch3221.h \
+ 	pageri_flex_modes.h \
+ 	pageri_util.h
+ 
+ lib_LTLIBRARIES = libgnuradio-pager.la
+ 
+ libgnuradio_pager_la_SOURCES = \
+ 	pager_flex_frame.cc \
+ 	pager_slicer_fb.cc \
+ 	pager_flex_sync.cc \
+ 	pager_flex_deinterleave.cc \
+ 	pager_flex_parse.cc \
+ 	pageri_bch3221.cc \
+ 	pageri_flex_modes.cc \
+ 	pageri_util.cc
+ 
+ libgnuradio_pager_la_LIBADD =	\
+ 	$(GNURADIO_CORE_LA)
+ 
+ libgnuradio_pager_la_LDFLAGS =	\
+ 	$(NO_UNDEFINED)