Merged r10504:10528 from michaelld/fix_local_data_install into trunk. Trunk passes...

[debian/gnuradio] / gr-pager / src / Makefile.am

diff --git a/gr-pager/src/Makefile.am b/gr-pager/src/Makefile.am
index 7438d2384b11ad0e4f1fdde320a0ae0e599b15ca..7f6f5c128229f473efbd817962de706e2efe0c8e 100644 (file)
--- a/gr-pager/src/Makefile.am
+++ b/gr-pager/src/Makefile.am
@@ -1,11 +1,11 @@
 #
-# Copyright 2004,2005,2006 Free Software Foundation, Inc.
+# 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 2, or (at your option)
+# 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,
@@ -27,6 +27,11 @@ EXTRA_DIST = \
 TESTS = \
     run_tests
 
+dist_bin_SCRIPTS = \
+    usrp_flex.py \
+    usrp_flex_all.py \
+    usrp_flex_band.py
+
 noinst_PYTHON = \
     qa_pager.py
 
@@ -37,19 +42,18 @@ noinst_PYTHON = \
 ourpythondir = $(grpythondir)/pager
 ourlibdir    = $(grpyexecdir)/pager
 
-INCLUDES = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS)
-
-SWIGPYTHONARGS = $(SWIGPYTHONFLAGS) $(STD_DEFINES_AND_INCLUDES)
+AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
 ALL_IFILES = \
     $(LOCAL_IFILES) \
-    $(NON_LOCAL_IFILES)                
+    $(NON_LOCAL_IFILES)        \
+    $(srcdir)/pager_flex_frame.i
 
 NON_LOCAL_IFILES = \
     $(GNURADIO_I)
 
 LOCAL_IFILES = \
-    $(top_srcdir)/gr-pager/src/pager.i
+    $(srcdir)/pager.i
 
 # These files are built by SWIG.  The first is the C++ glue.
 # The second is the python wrapper that loads the _howto shared library
@@ -59,22 +63,26 @@ BUILT_SOURCES = \
     pager_swig.cc \
     pager_swig.py                              
 
-# This gets pgr.py installed in the right place
+# This gets imported Python objects installed in the right place
 ourpython_PYTHON = \
     __init__.py \
     pager_swig.py \
-    flex_demod.py \
-    usrp_flex.py
+    pager_utils.py \
+    flex_demod.py
 
 ourlib_LTLIBRARIES = _pager_swig.la
 
 # These are the source files that go into the shared library
 _pager_swig_la_SOURCES = \
     pager_swig.cc \
+    pager_flex_frame.cc \
     pager_slicer_fb.cc \
-    pager_flex_deframer.cc \
+    pager_flex_sync.cc \
+    pager_flex_deinterleave.cc \
+    pager_flex_parse.cc \
+    pageri_bch3221.cc \
     pageri_flex_modes.cc \
-    pageri_bch3221.cc
+    pageri_util.cc
     # Additional source modules here
 
 # magic flags
@@ -83,23 +91,29 @@ _pager_swig_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version
 # link the library against the c++ standard library
 _pager_swig_la_LIBADD = \
     $(PYTHON_LDFLAGS) \
-    $(GNURADIO_CORE_LIBS) \
+    $(GNURADIO_CORE_LA) \
     -lstdc++                   
 
 pager_swig.cc pager_swig.py: $(ALL_IFILES)
-       $(SWIG) $(SWIGPYTHONARGS) -module pager_swig -o pager_swig.cc $(LOCAL_IFILES)
+       $(SWIG) $(STD_SWIG_PYTHON_ARGS) -module pager_swig \
+               -o pager_swig.cc $(LOCAL_IFILES)
 
 # These headers get installed in ${prefix}/include/gnuradio
 grinclude_HEADERS = \
     pager_slicer_fb.h \
-    pager_flex_deframer.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_bch3221.h
+    pageri_util.h
     # Additional header files here
 
 # These swig headers get installed in ${prefix}/include/gnuradio/swig
 swiginclude_HEADERS = \
-    $(LOCAL_IFILES)
+    $(LOCAL_IFILES) \
+    pager_flex_frame.i
 
 MOSTLYCLEANFILES = $(BUILT_SOURCES) *.pyc *~ *.tmp