Merged r10501:10505 from michaelld/omnithread into trunk. Moves omnithread header files into /gnuradio. Trunk passes distcheck.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10506 221aa14e-8319-0410-a670-987f0aec2ac5
author: jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> 2009-02-25 19:04:35 +0000
committer: jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> 2009-02-25 19:04:35 +0000
commit: c48f42b58c67eefd19ea1a803329bcf62eac06e9 (patch)
tree: d03af64023553b5f340ae676a918793e2ab39068 /omnithread
parent: 203024bad3191ea14eff902549e6b4d95e08e43c (diff)
16 files changed, 48 insertions, 24 deletions
diff --git a/omnithread/Makefile.am b/omnithread/Makefile.am
index d0dde72b2a..88df2714da 100644
--- a/omnithread/Makefile.am
+++ b/omnithread/Makefile.am
@@ -21,6 +21,8 @@
 
 include $(top_srcdir)/Makefile.common
 
+SUBDIRS = gnuradio
+
 # This is the omnithread package,
 #   extracted from the omniORB-4.0.1 distribution
 
@@ -66,13 +68,3 @@ EXTRA_DIST =				\
 	threaddata.cc			\
 	vxWorks.cc			\
 	dir.mk
-
-grinclude_HEADERS =			\
-	omnithread.h			\
-	omni_time.h			\
-	ot_mach.h			\
-	ot_nt.h				\
-	ot_posix.h			\
-	ot_pthread_nt.h			\
-	ot_solaris.h			\
-	ot_VxThread.h			
diff --git a/omnithread/gnuradio/Makefile.am b/omnithread/gnuradio/Makefile.am
new file mode 100644
index 0000000000..1ec5612999
--- /dev/null
+++ b/omnithread/gnuradio/Makefile.am
@@ -0,0 +1,32 @@
+#
+# Copyright 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 3, or (at your option)
+# any later version.
+# 
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+# 
+
+include $(top_srcdir)/Makefile.common
+
+grinclude_HEADERS =			\
+	omnithread.h			\
+	omni_time.h			\
+	ot_mach.h			\
+	ot_nt.h				\
+	ot_posix.h			\
+	ot_pthread_nt.h			\
+	ot_solaris.h			\
+	ot_VxThread.h			
diff --git a/omnithread/omni_time.h b/omnithread/gnuradio/omni_time.h
index bfb1516104..bfb1516104 100644
--- a/omnithread/omni_time.h
+++ b/omnithread/gnuradio/omni_time.h
diff --git a/omnithread/omnithread.h b/omnithread/gnuradio/omnithread.h
index 26e42b0e1a..8e8162b102 100644
--- a/omnithread/omnithread.h
+++ b/omnithread/gnuradio/omnithread.h
@@ -77,10 +77,10 @@ class omni_thread;
 #endif
 
 #if defined(OMNITHREAD_POSIX)
-#include <ot_posix.h>
+#include <gnuradio/ot_posix.h>
 
 #elif defined(OMNITHREAD_NT)
-#include <ot_nt.h>
+#include <gnuradio/ot_nt.h>
 
 #ifdef _MSC_VER
 
@@ -111,7 +111,7 @@ class omni_thread;
  // _MSC_VER
  
 #elif defined(__vxWorks__)
-#include <ot_VxThread.h>
+#include <gnuradio/ot_VxThread.h>
 
 #elif defined(__sunos__)
 #if __OSVERSION__ != 5
@@ -122,17 +122,17 @@ class omni_thread;
 #endif
 #endif
 #ifdef UseSolarisThreads
-#include <ot_solaris.h>
+#include <gnuradio/ot_solaris.h>
 #else
-#include <ot_posix.h>
+#include <gnuradio/ot_posix.h>
 #endif
 
 #elif defined(__rtems__)
-#include <ot_posix.h>
+#include <gnuradio/ot_posix.h>
 #include <sched.h>
 
 #elif defined(__macos__)
-#include <ot_posix.h>
+#include <gnuradio/ot_posix.h>
 #include <sched.h>
 
 #else
diff --git a/omnithread/ot_VxThread.h b/omnithread/gnuradio/ot_VxThread.h
index e96c036cce..e96c036cce 100644
--- a/omnithread/ot_VxThread.h
+++ b/omnithread/gnuradio/ot_VxThread.h
diff --git a/omnithread/ot_mach.h b/omnithread/gnuradio/ot_mach.h
index 76361926ca..76361926ca 100644
--- a/omnithread/ot_mach.h
+++ b/omnithread/gnuradio/ot_mach.h
diff --git a/omnithread/ot_nt.h b/omnithread/gnuradio/ot_nt.h
index 551ccf2f14..551ccf2f14 100644
--- a/omnithread/ot_nt.h
+++ b/omnithread/gnuradio/ot_nt.h
diff --git a/omnithread/ot_posix.h b/omnithread/gnuradio/ot_posix.h
index 666ccc0890..666ccc0890 100644
--- a/omnithread/ot_posix.h
+++ b/omnithread/gnuradio/ot_posix.h
diff --git a/omnithread/ot_pthread_nt.h b/omnithread/gnuradio/ot_pthread_nt.h
index 324b5257f6..324b5257f6 100644
--- a/omnithread/ot_pthread_nt.h
+++ b/omnithread/gnuradio/ot_pthread_nt.h
diff --git a/omnithread/ot_solaris.h b/omnithread/gnuradio/ot_solaris.h
index f4fea0b112..f4fea0b112 100644
--- a/omnithread/ot_solaris.h
+++ b/omnithread/gnuradio/ot_solaris.h
diff --git a/omnithread/mach.cc b/omnithread/mach.cc
index 8759bb4ce4..aa0465f41e 100644
--- a/omnithread/mach.cc
+++ b/omnithread/mach.cc
@@ -31,7 +31,7 @@
 #include <errno.h>
 #include <sys/time.h>
 #include <mach/cthreads.h>
-#include "omnithread.h"
+#include "gnuradio/omnithread.h"
 
 #define DB(x) // x
 // #include <iostream> or #include <iostream.h> if DB is on.
diff --git a/omnithread/nt.cc b/omnithread/nt.cc
index 3853f01080..2c97d62139 100644
--- a/omnithread/nt.cc
+++ b/omnithread/nt.cc
@@ -33,7 +33,7 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <WinError.h>
-#include <omnithread.h>
+#include <gnuradio/omnithread.h>
 #include <process.h>
 
 #define DB(x) // x 
diff --git a/omnithread/omni_time.cc b/omnithread/omni_time.cc
index 8703245bff..4920a68399 100644
--- a/omnithread/omni_time.cc
+++ b/omnithread/omni_time.cc
@@ -22,8 +22,8 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <omni_time.h>
-#include <omnithread.h>
+#include <gnuradio/omni_time.h>
+#include <gnuradio/omnithread.h>
 #include <math.h>
 #include <assert.h>
 
diff --git a/omnithread/posix.cc b/omnithread/posix.cc
index 7325166c6c..5574a8a0dd 100644
--- a/omnithread/posix.cc
+++ b/omnithread/posix.cc
@@ -49,7 +49,7 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <time.h>
-#include <omnithread.h>
+#include <gnuradio/omnithread.h>
 
 #if (PthreadDraftVersion == 0)
 #error "PthreadDraftVersion not defined.  If not sure, define it to 10"
diff --git a/omnithread/solaris.cc b/omnithread/solaris.cc
index b0139d29df..eedaaa99f6 100644
--- a/omnithread/solaris.cc
+++ b/omnithread/solaris.cc
@@ -26,7 +26,7 @@
 
 #include <stdlib.h>
 #include <errno.h>
-#include <omnithread.h>
+#include <gnuradio/omnithread.h>
 
 #define DB(x) // x 
 // #include <iostream> or #include <iostream.h> if DB is on.
diff --git a/omnithread/vxWorks.cc b/omnithread/vxWorks.cc
index 25634ce938..aaff6cdb20 100644
--- a/omnithread/vxWorks.cc
+++ b/omnithread/vxWorks.cc
@@ -56,7 +56,7 @@
 #include <stdio.h>
 #include <errno.h>
 #include <time.h>
-#include <omnithread.h>
+#include <gnuradio/omnithread.h>
 #include <sysLib.h>
 
 #include <assert.h>		// assert
author	jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5>	2009-02-25 19:04:35 +0000
committer	jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5>	2009-02-25 19:04:35 +0000
commit	c48f42b58c67eefd19ea1a803329bcf62eac06e9 (patch)
tree	d03af64023553b5f340ae676a918793e2ab39068 /omnithread
parent	203024bad3191ea14eff902549e6b4d95e08e43c (diff)