@@ -16,19 +16,23 @@ all: options $(OUTPUT_LIB) $(OUTPUT_A) options: @echo libebb build options: + @echo "CC = ${CC}" @echo "CFLAGS = ${CFLAGS}" @echo "LDFLAGS = ${LDFLAGS}" @echo "LDOPT = ${LDOPT}" @echo "SUFFIX = ${SUFFIX}" @echo "SONAME = ${SONAME}" - @echo "CC = ${CC}" + @echo $(OUTPUT_LIB): $(OBJ) - $(LINKER) -o $(OUTPUT_LIB) $(OBJ) $(SONAME) $(LIBS) + @echo LINK $@ + @$(LINKER) -o $(OUTPUT_LIB) $(OBJ) $(SONAME) $(LIBS) $(OUTPUT_A): $(OBJ) - $(AR) cru $(OUTPUT_A) $(OBJ) - $(RANLIB) $(OUTPUT_A) + @echo AR $@ + @$(AR) cru $(OUTPUT_A) $(OBJ) + @echo RANLIB $@ + @$(RANLIB) $(OUTPUT_A) .c.o: @echo CC $< @@ -37,7 +41,8 @@ $(OUTPUT_A): $(OBJ) ${OBJ}: ebb.h ebb_request_parser.h rbtree.h config.mk ebb_request_parser.c: ebb_request_parser.rl - ragel -s -G2 $< -o $@ + @echo RAGEL $< + @ragel -s -G2 $< -o $@ test: test_request_parser test_rbtree time ./test_request_parser @@ -56,7 +61,7 @@ examples/hello_world: examples/hello_world.o $(OUTPUT_A) clean: @echo cleaning - @rm -f ${OBJ} libebb-${VERSION}.tar.gz test_rbtree test_request_parser examples/hello_world + @rm -f ${OBJ} $(OUTPUT_A) $(OUTPUT_LIB) libebb-${VERSION}.tar.gz test_rbtree test_request_parser examples/hello_world clobber: clean @echo clobbering Makefile @@ -3,6 +3,8 @@ see doc/index.html and examples/hello_world.c for explanation webpage: http://tinyclouds.org/libebb/ git repository: http://github.com/ry/libebb/tree/master +To build libebb please edit config.mk to reflect your system's parameters. + (The MIT) LICENSE Copyright © 2008 Ryan Dahl (ry@tinyclouds.org) README @@ -4,12 +4,12 @@ VERSION = 0.1 # Customize below to fit your system # paths -PREFIX = /usr/local +PREFIX = $(HOME)/local MANPREFIX = ${PREFIX}/share/man # libev -EVINC = /usr/local/include -EVLIB = /usr/local/lib +EVINC = $(HOME)/local/libev/include +EVLIB = $(HOME)/local/libev/lib # GnuTLS, comment if you don't want it (necessary for HTTPS) GNUTLSLIB = /usr/lib @@ -18,9 +18,9 @@ GNUTLSLIBS = -L${GNUTLSLIB} -lgnutls GNUTLSFLAGS = -DHAVE_GNUTLS # libeio, comment if you don't want it (necessary for sendfile) -EIOLIB = /usr/lib -EIOINC = /usr/include -EIOLIBS = -L${EIOLIB} -lgnutls +EIOLIB = $(HOME)/local/libeio/lib +EIOINC = $(HOME)/local/libeio/include +EIOLIBS = -L${EIOLIB} -leio EIOFLAGS = -DHAVE_EIO # includes and libs config.mk @@ -38,10 +38,10 @@ static node sibling(node n); static node uncle(node n); static void verify_properties(rbtree t); static void verify_property_1(node root); -static void verify_property_2(node root); +/* static void verify_property_2(node root); */ static color node_color(node n); static void verify_property_4(node root); -static void verify_property_5(node root); +/* static void verify_property_5(node root); */ static void verify_property_5_helper(node n, int black_count, int* black_count_path); static node lookup_node(rbtree t, void* key); @@ -102,9 +102,11 @@ void verify_property_1(node n) { verify_property_1(n->right); } +/* void verify_property_2(node root) { assert(node_color(root) == BLACK); } +*/ color node_color(node n) { return n == NULL ? BLACK : n->color; @@ -121,10 +123,12 @@ void verify_property_4(node n) { verify_property_4(n->right); } +/* void verify_property_5(node root) { int black_count_path = -1; verify_property_5_helper(root, 0, &black_count_path); } +*/ void verify_property_5_helper(node n, int black_count, int* path_black_count) { if (node_color(n) == BLACK) { rbtree.c 66deeed8d38eea84c532ea6d5b7d7c496c794584 Ryan ry@tinyclouds.org http://github.com/ry/libebb/commit/0930228c74a8f1a99be6894cab8b78d6dfa076e3 0930228c74a8f1a99be6894cab8b78d6dfa076e3 2008-08-20T04:03:35-07:00 2008-08-20T04:03:35-07:00 more work fixing up the build system 36875b81c1963053efca4f6d558d9df588beb976 Ryan ry@tinyclouds.org