Skip to content

Commit

Permalink
Update Makefile and REAME for new bundled PCRE lib.
Browse files Browse the repository at this point in the history
  • Loading branch information
macournoyer committed Apr 10, 2009
1 parent 62ec6c6 commit 55499ce
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 19 deletions.
14 changes: 9 additions & 5 deletions 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

Expand Down Expand Up @@ -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
Expand Down
18 changes: 4 additions & 14 deletions README.rdoc
Expand Up @@ -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)
Expand Down Expand Up @@ -55,5 +43,7 @@ Inspired by:

kvec.h and khash.h (c) 2008, by Attractive Chaos <attractivechaos@aol.co.uk>
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 <macournoyer@gmail.com>
tinyrb is Copyright (c) Marc-Andre Cournoyer <macournoyer@gmail.com> and
released under Ruby license

0 comments on commit 55499ce

Please sign in to comment.