Changes related to Oniguruma addition and directory layout change.

1 files changed, 27 insertions, 8 deletions

diff --git a/Makefile b/Makefile
index b4e3277..9c017c3 100755
--- a/Makefile
+++ b/Makefile
@@ -2,25 +2,44 @@
 
 # See src/*.mak for user-definable settings
 
-all: build_pcre test_pcre build_posix test_posix
+POSIX = src/posix
+PCRE = src/pcre
+ONIG = src/oniguruma
+
+all: build test
+
+build: build_pcre build_posix build_onig
+
+test: test_pcre test_posix test_onig
+
+clean: clean_pcre clean_posix clean_onig
 
 build_pcre:
-	make -C src -f rex_pcre.mak
+	make -C $(PCRE) -f rex_pcre.mak
 
 build_posix:
-	make -C src -f rex_posix.mak
+	make -C $(POSIX) -f rex_posix.mak
+
+build_onig:
+	make -C $(ONIG) -f rex_onig.mak
 
 test_pcre:
-	cd test && lua ./runtest.lua -d../src pcre
+	cd test && lua ./runtest.lua -d../$(PCRE) pcre
 
 test_posix:
-	cd test && lua ./runtest.lua -d../src posix
+	cd test && lua ./runtest.lua -d../$(POSIX) posix
+
+test_onig:
+	cd test && lua ./runtest.lua -d../$(ONIG) onig
 
 clean_pcre:
-	make -C src -f rex_pcre.mak clean
+	make -C $(PCRE) -f rex_pcre.mak clean
 
 clean_posix:
-	make -C src -f rex_posix.mak clean
+	make -C $(POSIX) -f rex_posix.mak clean
 
-.PHONY: all build_pcre test_pcre build_posix test_posix clean_pcre clean_posix
+clean_onig:
+	make -C $(ONIG) -f rex_onig.mak clean
 
+.PHONY: all build test clean build_pcre test_pcre clean_pcre build_posix \
+  test_posix clean_posix build_onig test_onig clean_onig