diff --git a/Makefile b/Makefile index 7c8dc71..c5c1271 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,9 @@ CC = gcc CFLAGS = -std=c99 -Wall -Wextra -D_XOPEN_SOURCE -DDEBUG -g ${OPTIMIZE} -INCS = -Ivm -Ivendor/gc/build/include -Ivendor `pkg-config --cflags libpcre` -LIBS = ${GC} -PKG_LIBS = `pkg-config --libs libpcre` -GC = vendor/gc/build/lib/libgc.a +INCS = -Ivm -Ivendor/gc/include -Ivendor/pcre -Ivendor +LIBS = ${GC} ${PCRE} +GC = vendor/gc/.libs/libgc.a +PCRE = vendor/pcre/.libs/libpcre.a LEG = vendor/peg/leg FREEGETOPT = vendor/freegetopt/getopt.o @@ -47,7 +47,11 @@ ${LEG}: ${GC}: @echo " make gc" - @cd vendor/gc && ./configure --prefix=`pwd`/build --disable-threads -q && make -s && make install -s + @cd vendor/gc && ./configure --disable-threads -q && make -s + +${PCRE}: + @echo " make pcre" + @cd vendor/pcre && ./configure -q && make -s test: tinyrb @ruby test/runner diff --git a/README.rdoc b/README.rdoc index ce9b3f0..ccebccf 100644 --- a/README.rdoc +++ b/README.rdoc @@ -14,20 +14,8 @@ http://github.com/macournoyer/tinyrb == Install - # If you're on Mac OS X or don't already have pkg-config - sudo port install pkg-config - - # Install PCRE for regexp stuff - # on Mac OS X - sudo port install pcre - # on Linux - sudo apt-get install libpcre3-dev - - # Build tinyrb make - - # Test it (optional) - make test + make test # optional ./tinyrb -h == What WON'T be in tinyrb (tiny patches accepted) @@ -55,5 +43,7 @@ Inspired by: kvec.h and khash.h (c) 2008, by Attractive Chaos GC Copyright 1988, 1989 Hans-J. Boehm, Alan J. Demers +PCRE Copyright (c) 1997-2008 University of Cambridge released under BSD license -(c) Marc-Andre Cournoyer +tinyrb is Copyright (c) Marc-Andre Cournoyer and +released under Ruby license