X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=omnithread%2FMakefile.am;h=291cc8beb0eaa16201221f353cc9332f4b9ce3e6;hb=45286cd769e42c325b7c65a2f0a96757e2e97b97;hp=59ba971a445220d1930116def0122c55247edf04;hpb=42d9c6f495503d3d9d2db47a9979036c9233f976;p=debian%2Fgnuradio

diff --git a/omnithread/Makefile.am b/omnithread/Makefile.am
index 59ba971a..291cc8be 100644
--- a/omnithread/Makefile.am
+++ b/omnithread/Makefile.am
@@ -21,13 +21,15 @@
 
 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
@@ -37,11 +39,13 @@ 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
 
@@ -63,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