some #include restructuring

moo/lib/Makefile.am

@@ -37,7 +37,6 @@ pkgincludedir = $(includedir)
 
 pkginclude_HEADERS = \
 	moo.h \
-	moo-bct.h \
 	moo-cmn.h \
 	moo-opt.h \
 	moo-rbt.h \
@@ -54,8 +53,8 @@ pkglib_LTLIBRARIES = libmoo.la libmoox.la
 # libmoo
 ##################################################
 libmoo_la_SOURCES = \
+	bct-lab.h \
 	moo.h \
-	moo-bct.h \
 	moo-cmn.h \
 	moo-rbt.h \
 	moo-utl.h \

moo/lib/Makefile.in

@@ -450,7 +450,6 @@ LIBADD_LIB_COMMON =
 @WIN32_TRUE@	$(am__append_1) $(am__append_2)
 pkginclude_HEADERS = \
 	moo.h \
-	moo-bct.h \
 	moo-cmn.h \
 	moo-opt.h \
 	moo-rbt.h \
@@ -463,8 +462,8 @@ pkglib_LTLIBRARIES = libmoo.la libmoox.la
 # libmoo
 ##################################################
 libmoo_la_SOURCES = \
+	bct-lab.h \
 	moo.h \
-	moo-bct.h \
 	moo-cmn.h \
 	moo-rbt.h \
 	moo-utl.h \

moo/lib/exec.c

@@ -5471,7 +5471,8 @@ static int __execute (moo_t* moo)
 #if defined(HAVE_LABELS_AS_VALUES)
 	static void* inst_table[256] = 
 	{
-		#include "moo-bct.h"
+		/* import bytecode label addresses */
+		#include "bct-lab.h"
 	};
 
 #	define BEGIN_DISPATCH_LOOP() __begin_inst_dispatch: 

moo/lib/moo-cmn.h

@@ -32,15 +32,15 @@
 /*#define MOO_HAVE_CFG_H*/
 
 #if defined(MOO_HAVE_CFG_H)
-#	include "moo-cfg.h"
+#	include <moo-cfg.h>
 #elif defined(_WIN32)
-#	include "moo-msw.h"
+#	include <moo-msw.h>
 #elif defined(__OS2__)
-#	include "moo-os2.h"
+#	include <moo-os2.h>
 #elif defined(__DOS__)
-#	include "moo-dos.h"
+#	include <moo-dos.h>
 #elif defined(macintosh)
-#	include "moo-mac.h" /* class mac os */
+#	include <moo-mac.h> /* class mac os */
 #else
 #	error UNSUPPORTED SYSTEM
 #endif

moo/lib/moo-opt.h

@@ -27,7 +27,7 @@
 #ifndef _MOO_OPT_H_
 #define _MOO_OPT_H_
 
-#include "moo-cmn.h"
+#include <moo-cmn.h>
 
 /** \file
  * This file defines functions and data structures to process 

moo/lib/moo-prv.h

@@ -27,8 +27,8 @@
 #ifndef _MOO_PRV_H_
 #define _MOO_PRV_H_
 
-#include "moo.h"
+#include <moo.h>
-#include "moo-utl.h"
+#include <moo-utl.h>
 
 /* you can define this to either 1 or 2 */
 #define MOO_BCODE_LONG_PARAM_SIZE 2

moo/lib/moo-rbt.h

@@ -27,7 +27,7 @@
 #ifndef _MOO_RBT_H_
 #define _MOO_RBT_H_
 
-#include "moo-cmn.h"
+#include <moo-cmn.h>
 
 /** \file
  * This file provides a red-black tree encapsulated in the #moo_rbt_t type that
@@ -37,9 +37,7 @@
  * This sample code adds a series of keys and values and print them
  * in descending key order.
  * \code
- * #include <moo/cmn/rbt.h>
+ * #include <moo-rbt.h>
- * #include <moo/cmn/mem.h>
- * #include <moo/cmn/sio.h>
  * 
  * static moo_rbt_walk_t walk (moo_rbt_t* rbt, moo_rbt_pair_t* pair, void* ctx)
  * {

moo/lib/moo-utl.h

@@ -27,7 +27,7 @@
 #ifndef _MOO_UTL_H_
 #define _MOO_UTL_H_
 
-#include "moo-cmn.h"
+#include <moo-cmn.h>
 #include <stdarg.h>
 
 /* =========================================================================

moo/lib/moo.h

@@ -27,8 +27,8 @@
 #ifndef _MOO_H_
 #define _MOO_H_
 
-#include "moo-cmn.h"
+#include <moo-cmn.h>
-#include "moo-rbt.h"
+#include <moo-rbt.h>
 #include <stdarg.h>
 
 /* TODO: move this macro out to the build files.... */

moo/lib/opt-impl.h

@@ -28,8 +28,8 @@
 /* this file is supposed to be included by opt.c multiple times */
 
 
-#include "moo-opt.h"
+#include <moo-opt.h>
-#include "moo-utl.h"
+#include <moo-utl.h>
 
 /* 
  * moo_getopt is based on BSD getopt.

moo/lib/opt.c

@@ -24,8 +24,8 @@
     THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "moo-opt.h"
+#include <moo-opt.h>
-#include "moo-utl.h"
+#include <moo-utl.h>
 
 #define BADCH   '?'
 #define BADARG  ':'

moo/lib/poll-msw.h

@@ -1,7 +1,7 @@
 #ifndef _POLL_MSW_H_
 #define _POLL_MSW_H_
 
-#include "moo.h"
+#include <moo.h>
 
 #if !defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0600)
 /* Event types that can be polled for.  These bits may be set in `events'

moo/lib/rbt.c

@@ -24,7 +24,7 @@
     THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "moo-rbt.h"
+#include <moo-rbt.h>
 #include "moo-prv.h"
 
 #define copier_t        moo_rbt_copier_t