Changeset 9773

Show
Ignore:
Timestamp:
10/10/08 20:55:09
Author:
jcorgan
Message:

Merged r9666:9737 from jcorgan/dsss into jcorgan/ss

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • gnuradio/branches/developers/jcorgan/ss/Makefile.common

    r9625 r9773  
    3535grpythondir = $(pythondir)/gnuradio 
    3636grpyexecdir = $(pyexecdir)/gnuradio 
     37 
     38# Install data files in the appropriate subdirectory 
     39# This usually ends up at: 
     40#   ${prefix}/share/gnuradio 
     41grdatadir = $(datadir)/gnuradio 
    3742 
    3843# Install the non-gnuradio usrp stuff in the appropriate subdirectory 
    …… 
    120125# Base directory for documentation (docdir undefined in autoconf < 1.60) 
    121126gr_docdir = $(if $(docdir),$(docdir),$(datadir)/doc/$(PACKAGE))-$(VERSION) 
     127 

  • gnuradio/branches/developers/jcorgan/ss/config/Makefile.am

    r9528 r9773  
    5757        grc_gr_audio_windows.m4 \ 
    5858        grc_gr_comedi.m4 \ 
     59        grc_gr_dsss.m4 \ 
    5960        grc_gr_gcell.m4 \ 
    6061        grc_gr_gpio.m4 \ 

  • gnuradio/branches/developers/jcorgan/ss/configure.ac

    r9768 r9773  
    270270GRC_GCELL 
    271271GRC_GNURADIO_CORE 
     272GRC_GR_DSSS 
    272273GRC_PMT 
    273274GRC_MBLOCK                      dnl this must come after GRC_PMT 

  • gnuradio/branches/developers/jcorgan/ss/run_tests.sh.in

    r9407 r9773  
    1515 
    1616# Where to find my swig generated shared library 
    17 mylibdir=$2/src:$2/src/.libs:$2/src/lib:$2/src/lib/.libs 
     17mylibdir=$2/src:$2/src/.libs:$2/src/lib:$2/src/lib/.libs:$2/python/.libs 
    1818 
    1919# Where to find my swig generated python module 
    20 mysrcdir=$1/src:$1/src/lib 
     20mysrcdir=$1/src:$1/src/lib:$1/python 
    2121 
    2222# Where to find my hand written python modules 
    23 mypydir=$1/src:$1/src/python 
     23mypydir=$1/src:$1/src/python:$1/python 
    2424 
    2525# Where to find core's swig generated shared libraries,