diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2010-12-08 00:59:23 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2010-12-08 01:11:15 -0500 |
| commit | 1186ab980d1e1fe36ff869097fd0697dd41ff7ae (patch) | |
| tree | b0fd1e1bf7943cc107a6e28c54891bde5637e8fd /volk | |
| parent | 239144659b29c0a5ecd83a34e0e57387a1060ed7 (diff) | |
volk: Updating build system so that volk configures and builds from gnuradio top level dir.
Diffstat (limited to 'volk')
| -rw-r--r-- | volk/Makefile.common | 4 | ||||
| -rw-r--r-- | volk/apps/Makefile.am | 2 | ||||
| -rw-r--r-- | volk/config/lv_configure.m4 | 30 | ||||
| -rw-r--r-- | volk/configure.ac | 27 | ||||
| -rw-r--r-- | volk/include/volk/Makefile.am | 6 | ||||
| -rw-r--r-- | volk/python/Makefile.am | 65 |
6 files changed, 52 insertions, 82 deletions
diff --git a/volk/Makefile.common b/volk/Makefile.common index 3b028b147a..083f6f7101 100644 --- a/volk/Makefile.common +++ b/volk/Makefile.common @@ -1,6 +1,6 @@ # -*- Makefile -*- # -# Copyright 2004,2006,2008 Free Software Foundation, Inc. +# Copyright 2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -27,7 +27,7 @@ ourswigincludedir = $(ourincludedir)/swig # Install this stuff in the appropriate subdirectory # This usually ends up at: -# ${prefix}/lib/python${python_version}/site-packages/libvector +# ${prefix}/lib/python${python_version}/site-packages/libvolk ourpythondir = $(pythondir)/volk ourpyexecdir = $(pyexecdir)/volk diff --git a/volk/apps/Makefile.am b/volk/apps/Makefile.am index a518239712..5e9bc254f7 100644 --- a/volk/apps/Makefile.am +++ b/volk/apps/Makefile.am @@ -22,6 +22,6 @@ include $(top_srcdir)/Makefile.common # C++ stuff here -if USE_PYTHON +if PYTHON # python stuff here endif diff --git a/volk/config/lv_configure.m4 b/volk/config/lv_configure.m4 index fc6a0a5676..efcec5d3e8 100644 --- a/volk/config/lv_configure.m4 +++ b/volk/config/lv_configure.m4 @@ -1,5 +1,20 @@ -dnl all this stuff taken and modified from GNURADIO! dnl +dnl Copyright 2010 Free Software Foundation, Inc. +dnl +dnl This program is free software: you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation, either version 3 of the License, or +dnl (at your option) any later version. +dnl +dnl This program is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with this program. If not, see <http://www.gnu.org/licenses/>. +dnl + dnl LV_CONFIGURE dnl dnl Handles the bulk of the configure.ac work for an out-of-tree build @@ -18,16 +33,9 @@ dnl get called too late to be useful. m4_define([LV_CONFIGURE], [ - - AC_CONFIG_SRCDIR([config/lv_configure.m4]) - AC_CONFIG_AUX_DIR([.]) - AM_CONFIG_HEADER(config.h) - - AC_CANONICAL_BUILD - AC_CANONICAL_HOST - AC_CANONICAL_TARGET - - AM_INIT_AUTOMAKE(libvector,0.0svn) + #AC_CANONICAL_BUILD + #AC_CANONICAL_HOST + #AC_CANONICAL_TARGET LF_CONFIGURE_CC LF_CONFIGURE_CXX diff --git a/volk/configure.ac b/volk/configure.ac index eb9fbdc559..4c095cbd53 100644 --- a/volk/configure.ac +++ b/volk/configure.ac @@ -1,7 +1,26 @@ -AC_INIT(libvector,0.0svn) +dnl +dnl Copyright 2010 Free Software Foundation, Inc. +dnl +dnl This program is free software: you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation, either version 3 of the License, or +dnl (at your option) any later version. +dnl +dnl This program is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with this program. If not, see <http://www.gnu.org/licenses/>. +dnl + +AC_INIT AC_PREREQ(2.57) AC_CONFIG_AUX_DIR([.]) - +AC_CONFIG_SRCDIR([lib/test_all.cc]) +AM_CONFIG_HEADER(config.h) +AM_INIT_AUTOMAKE(volk,0.0svn) dnl This is kind of non-standard, but it sure shortens up this file :-) @@ -53,10 +72,6 @@ AC_CONFIG_FILES([\ volk.pc \ ]) - - - - AC_CONFIG_COMMANDS([run_system_cleanup], [chmod +x system_cleanup.sh && ./system_cleanup.sh $MYCPU $MYSUBCPU], [MYCPU=$MD_CPU MYSUBCPU=$MD_SUBCPU]) AC_OUTPUT diff --git a/volk/include/volk/Makefile.am b/volk/include/volk/Makefile.am index fd59ab7956..94c78ffff0 100644 --- a/volk/include/volk/Makefile.am +++ b/volk/include/volk/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2008 Free Software Foundation, Inc. +# Copyright 2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -20,7 +20,9 @@ include $(top_srcdir)/Makefile.common -ourinclude_HEADERS = \ +volkincludedir = $(prefix)/include/volk + +volkinclude_HEADERS = \ volk_complex.h \ volk_common.h \ volk_config_fixed.h \ diff --git a/volk/python/Makefile.am b/volk/python/Makefile.am index 8485c47930..8519a102ac 100644 --- a/volk/python/Makefile.am +++ b/volk/python/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2008 Free Software Foundation, Inc. +# Copyright 2010 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -33,63 +33,8 @@ dist-hook: @for file in $(swig_built_sources); do $(RM) $(distdir)/$$file; done -# if we're not using python, ignore the rest... +# Set the install location of any python scripts to /volk +volkpythondir = $(pythondir)/volk -TESTS = - - -ALL_IFILES = \ - $(LOCAL_IFILES) \ - $(NON_LOCAL_IFILES) - -NON_LOCAL_IFILES = \ - $(GNURADIO_CORE_INCLUDEDIR)/swig/gnuradio.i - -LOCAL_IFILES = \ - libvector.i \ - libvector_square_ff.i - - -# These files are built by SWIG. The first is the C++ glue. -# The second is the python wrapper that loads the _libvector shared library -# and knows how to call our extensions. - -swig_built_sources = \ - libvector_swig.cc \ - libvector_swig.py - -# This gets libvector.py installed in the right place. -# Any hand-written python should be listed here too. -ourpython_PYTHON = \ - __init__.py \ - libvector_swig.py - -# Python QA code gets listed here. It's not installed. -noinst_PYTHON = - -# This library contains the swig generated glue -ourpyexec_LTLIBRARIES = _libvector_swig.la - -# These are the source files that go into the shared library -_libvector_swig_la_SOURCES = \ - libvector_swig.cc - -# Dummy C++ source to cause C++ linking -nodist_EXTRA__libvector_swig_la_SOURCES = dummy.cc - -# magic flags -_libvector_swig_la_LDFLAGS = $(NO_UNDEFINED) -module -avoid-version - -# Link the swig generated code against our library and some python magic. -_libvector_swig_la_LIBADD = \ - ../lib/liblibvector.la \ - $(PYTHON_LDFLAGS) - - -libvector_swig.cc libvector_swig.py: $(LOCAL_IFILES) $(ALL_IFILES) - $(SWIG) $(SWIGPYTHONARGS) -module libvector_swig -o libvector_swig.cc $(srcdir)/libvector.i - - -# These swig headers get installed in ${prefix}/include/<component>/swig -ourswiginclude_HEADERS = \ - $(LOCAL_IFILES) +volkpython_PYTHON = \ + __init__.py |