Update list of header files to be installed for dispatch and os.

Move stubs.h to stubs_internal.h and include it from internal.h
(so we don't need to install stubs to get a complete set of header files).

Author: dgrove-oss

dispatch/Makefile.am

@@ -6,6 +6,7 @@ dispatchdir=$(includedir)/dispatch
 
 dispatch_HEADERS=	\
 	base.h			\
+	block.h			\
 	data.h			\
 	dispatch.h		\
 	group.h			\

os/Makefile.am

@@ -5,7 +5,9 @@
 osdir=$(includedir)/os
 
 os_HEADERS=	\
-	object.h
+	object.h \
+	base.h \
+	linux_base.h
 
 noinst_HEADERS=	\
 	object_private.h

os/linux_base.h

@@ -118,8 +118,4 @@ struct voucher_offsets_s {
 #define LINUX_PORT_ERROR()  do { printf("LINUX_PORT_ERROR_CALLED %s:%d: %s\n",__FILE__,__LINE__,__FUNCTION__); } while (0)
 
 
-// Functions we are stubbing out
-#include<os/stubs.h>
-
-
 #endif /* __OS_LINUX_BASE__ */

src/internal.h

@@ -82,6 +82,7 @@
 
 
 #include <os/object.h>
+#include "stubs_internal.h"
 #include <dispatch/time.h>
 #include <dispatch/object.h>
 #include <dispatch/queue.h>

os/stubs.h renamed to src/stubs_internal.h

@@ -1,7 +1,8 @@
-#ifndef __OS_STUBS__
-#define __OS_STUBS__
-
+// forward declarations for functions we are stubbing out
+// in the intial linux port.
 
+#ifndef __DISPATCH__STUBS__INTERNAL
+#define __DISPATCH__STUBS__INTERNAL
 
 int sysctlbyname(const char *name, void *oldp, size_t *oldlenp,
 		 void *newp, size_t newlen);