diff options
| author | Tom Rondeau | 2011-03-20 12:31:10 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2011-03-20 12:31:10 -0400 |
| commit | 972fc99ad6984e50731ec0dd97ccfec71829139b (patch) | |
| tree | dcbbe06ca254169c122b88600816e504643880dc /gcell | |
| parent | 3c3aff088447942053e96ae30b766b00d4cd0202 (diff) | |
| parent | 4d1426b8db5be20583a6efb380d564a55a28fd09 (diff) | |
| download | gnuradio-972fc99ad6984e50731ec0dd97ccfec71829139b.tar.gz gnuradio-972fc99ad6984e50731ec0dd97ccfec71829139b.tar.bz2 gnuradio-972fc99ad6984e50731ec0dd97ccfec71829139b.zip | |
Merge branch 'master' of gnuradio.org:gnuradio
Diffstat (limited to 'gcell')
| -rw-r--r-- | gcell/apps/test_all.cc | 7 | ||||
| -rw-r--r-- | gcell/ibm/Makefile.am | 2 | ||||
| -rw-r--r-- | gcell/lib/wrapper/Makefile.am | 3 |
3 files changed, 5 insertions, 7 deletions
diff --git a/gcell/apps/test_all.cc b/gcell/apps/test_all.cc index 0b608e13b..fc3afd8ca 100644 --- a/gcell/apps/test_all.cc +++ b/gcell/apps/test_all.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2007,2010 Free Software Foundation, Inc. + * Copyright 2007,2010,2011 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -29,11 +29,8 @@ int main(int argc, char **argv) { - char path[200]; - get_unittest_path ("gcell_all.xml", path, 200); - CppUnit::TextTestRunner runner; - std::ofstream xmlfile(path); + std::ofstream xmlfile(get_unittest_path("gcell_all.xml").c_str()); CppUnit::XmlOutputter *xmlout = new CppUnit::XmlOutputter(&runner.result(), xmlfile); runner.addTest(qa_gcell_runtime::suite()); diff --git a/gcell/ibm/Makefile.am b/gcell/ibm/Makefile.am index 8013e6a3a..6438c7331 100644 --- a/gcell/ibm/Makefile.am +++ b/gcell/ibm/Makefile.am @@ -20,7 +20,7 @@ include $(top_srcdir)/Makefile.common -EXTRA_DIST = \ +EXTRA_DIST += \ ./README \ ./sync/ppu_source/atomic_add.h \ ./sync/ppu_source/atomic_add_return.h \ diff --git a/gcell/lib/wrapper/Makefile.am b/gcell/lib/wrapper/Makefile.am index 0676ebb70..5ec7e5615 100644 --- a/gcell/lib/wrapper/Makefile.am +++ b/gcell/lib/wrapper/Makefile.am @@ -20,7 +20,8 @@ include $(top_srcdir)/Makefile.common -AM_CPPFLAGS = $(DEFINES) $(GCELL_INCLUDES) $(FFTW3F_CFLAGS) $(WITH_INCLUDES) +# $(WITH_INCLUDES) must _always_ be last +AM_CPPFLAGS = $(DEFINES) $(GCELL_INCLUDES) $(FFTW3F_CPPFLAGS) $(WITH_INCLUDES) noinst_LTLIBRARIES = libwrapper.la libwrapper-qa.la |