X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=omnithread%2FMakefile.am;h=291cc8beb0eaa16201221f353cc9332f4b9ce3e6;hb=22a2621d0d11316a1d8562c5fddd03f162c40d36;hp=526cae0e9f7a558c8bf8ebebc1163230d575d2d5;hpb=8af32097a1ebd90ca344e0e96616fd3be7a00af6;p=debian%2Fgnuradio

diff --git a/omnithread/Makefile.am b/omnithread/Makefile.am
index 526cae0e..291cc8be 100644
--- a/omnithread/Makefile.am
+++ b/omnithread/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2003 Free Software Foundation, Inc.
+# Copyright 2003,2008 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -21,13 +21,16 @@
 
 include $(top_srcdir)/Makefile.common
 
+SUBDIRS = gnuradio
+
 # This is the omnithread package,
 #   extracted from the omniORB-4.0.1 distribution
 
 # we should do some configure hacking to determine these on the fly
 OMNITHREAD_DEFINES = -DPthreadDraftVersion=10
 
-INCLUDES = $(DEFINES) $(OMNITHREAD_DEFINES) $(OMNITHREAD_INCLUDES)
+AM_CPPFLAGS = $(DEFINES) $(OMNITHREAD_DEFINES) $(OMNITHREAD_INCLUDES) \
+	 $(WITH_INCLUDES)
 
 # we call it libgromnithread to avoid a collision with libomnithread on Debian
 lib_LTLIBRARIES = libgromnithread.la
@@ -36,15 +39,17 @@ lib_LTLIBRARIES = libgromnithread.la
 
 if OMNITHREAD_POSIX
 libgromnithread_la_SOURCES =		\
+	omni_time.cc \
 	posix.cc
 endif
 
 if OMNITHREAD_NT
 libgromnithread_la_SOURCES =		\
+	omni_time.cc \
 	nt.cc
 endif
 
-libgromnithread_la_LDFLAGS = $(NO_UNDEFINED) -avoid-version 
+libgromnithread_la_LDFLAGS = $(NO_UNDEFINED) 
 
 libgromnithread_la_LIBADD =		\
 	$(PTHREAD_LIBS)
@@ -62,13 +67,5 @@ EXTRA_DIST =				\
 	solaris.cc			\
 	threaddata.cc			\
 	vxWorks.cc			\
-	dir.mk
-
-grinclude_HEADERS =			\
-	omnithread.h			\
-	ot_mach.h			\
-	ot_nt.h				\
-	ot_posix.h			\
-	ot_pthread_nt.h			\
-	ot_solaris.h			\
-	ot_VxThread.h			
+	dir.mk				\
+	README