summaryrefslogtreecommitdiff
path: root/gruel/src
diff options
context:
space:
mode:
Diffstat (limited to 'gruel/src')
-rw-r--r--gruel/src/include/gruel/Makefile.am5
-rw-r--r--gruel/src/lib/pmt/Makefile.am2
-rw-r--r--gruel/src/lib/test_gruel.cc9
-rw-r--r--gruel/src/scheme/gnuradio/Makefile.am8
4 files changed, 11 insertions, 13 deletions
diff --git a/gruel/src/include/gruel/Makefile.am b/gruel/src/include/gruel/Makefile.am
index 67dd12995..d7ac3d332 100644
--- a/gruel/src/include/gruel/Makefile.am
+++ b/gruel/src/include/gruel/Makefile.am
@@ -21,13 +21,12 @@
include $(top_srcdir)/Makefile.common
-BUILT_SOURCES = \
- inet.h
+EXTRA_DIST += inet.h.in
gruelincludedir = $(prefix)/include/gruel
gruelinclude_HEADERS = \
- $(BUILT_SOURCES) \
+ inet.h \
msg_accepter.h \
msg_accepter_msgq.h \
msg_queue.h \
diff --git a/gruel/src/lib/pmt/Makefile.am b/gruel/src/lib/pmt/Makefile.am
index d3efc1afa..7a1f2e7d4 100644
--- a/gruel/src/lib/pmt/Makefile.am
+++ b/gruel/src/lib/pmt/Makefile.am
@@ -48,7 +48,7 @@ python_built_sources = $(GENERATED_H) $(GENERATED_CC)
PMT_SERIAL_TAGS_H = $(abs_top_builddir)/gruel/src/include/gruel/pmt_serial_tags.h
BUILT_SOURCES = $(python_built_sources) $(PMT_SERIAL_TAGS_H)
-EXTRA_DIST = $(code_generator)
+EXTRA_DIST += $(code_generator)
# ----------------------------------------------------------------
diff --git a/gruel/src/lib/test_gruel.cc b/gruel/src/lib/test_gruel.cc
index f4b9fc4e2..2c9528b0a 100644
--- a/gruel/src/lib/test_gruel.cc
+++ b/gruel/src/lib/test_gruel.cc
@@ -65,14 +65,13 @@ main(int argc, char **argv)
*/
static void
-ensure_unittest_path (const char *grpath, const char *path)
+ensure_unittest_path (const char *path)
{
struct stat statbuf;
if (stat (path, &statbuf) == 0 && S_ISDIR (statbuf.st_mode))
return;
// blindly try to make it // FIXME make this robust. C++ SUCKS!
- gr_mkdir (grpath, 0750);
gr_mkdir (path, 0750);
}
@@ -80,11 +79,9 @@ static void
get_unittest_path (const char *filename, char *fullpath, size_t pathsize)
{
char path[200];
- char grpath[200];
- snprintf (grpath, sizeof(grpath), "%s/.gnuradio", getenv ("HOME"));
- snprintf (path, sizeof(path), "%s/unittests", grpath);
+ snprintf (path, sizeof(path), "./.unittests");
snprintf (fullpath, pathsize, "%s/%s", path, filename);
- ensure_unittest_path(grpath, path);
+ ensure_unittest_path(path);
}
diff --git a/gruel/src/scheme/gnuradio/Makefile.am b/gruel/src/scheme/gnuradio/Makefile.am
index 0ce01f6f8..2f8e5c8d2 100644
--- a/gruel/src/scheme/gnuradio/Makefile.am
+++ b/gruel/src/scheme/gnuradio/Makefile.am
@@ -1,5 +1,5 @@
#
-# Copyright 2007,2009 Free Software Foundation, Inc.
+# Copyright 2007,2009,2010 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -18,12 +18,14 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
+include $(top_srcdir)/Makefile.common
+
#pkgdatadir = $(datadir)/gnuradio
-EXTRA_DIST = \
+EXTRA_DIST += \
gen-serial-tags.scm
-# really scheme source files
+# really scheme source files FIXME wrong location
dist_pkgdata_DATA = \
pmt-serial-tags.scm \
pmt-serialize.scm \