commit 426af479a7d51773b00c96dba01817715f02408c
parent 37674df46f5c1753ca39e274d8489edb54d90166
Author: Anselm R Garbe <anselm@garbe.us>
Date: Sat, 8 Aug 2009 09:54:20 +0100
merge
Diffstat:
3 files changed, 5 insertions(+), 30 deletions(-)
diff --git a/.hgtags b/.hgtags
@@ -1,4 +1,3 @@
49087403b7b7fc7e64f52e71fc576b92bb8aa158 1
538338114742f2e81f6c52a5a323bdf7ca0d5d86 2
-664144b8c1a4e0aae3535eb49ee0bc2d3679da5a snap
-8ab76db4077c67fe71a34f8f287b69a3adf9de03 snap
+7c1decda5b50405d3b62daa8369aa24c82e7b615 3
diff --git a/config.mk b/config.mk
@@ -4,9 +4,10 @@
PREFIX = /usr/local/plan9
MANPREFIX = ${PREFIX}/share/man
-VERSION = 200907
-# 386, arm, etc31
-OBJTYPE = x86_64
+VERSION = 3
+OBJTYPE = 386
+#OBJTYPE = arm
+#OBJTYPE = x86_64
# Linux/BSD
CFLAGS = -Wall -Wno-missing-braces -Wno-parentheses -Wno-switch -c -I. -DPREFIX="\"${PREFIX}\""
diff --git a/lib9/regex/mkfile b/lib9/regex/mkfile
@@ -1,25 +0,0 @@
-<$PLAN9/src/mkhdr
-
-LIB=libregexp9.a
-
-OFILES=\
- regcomp.$O\
- regerror.$O\
- regexec.$O\
- regsub.$O\
- regaux.$O\
- rregexec.$O\
- rregsub.$O\
-
-HFILES=\
- $PLAN9/include/regexp9.h\
- regcomp.h\
-
-<$PLAN9/src/mksyslib
-
-test: test.$O $LIB
- $CC -o test test.$O $LIB -L/usr/local/lib -lfmt -lutf
-
-test2: test2.$O $LIB
- $CC -o test2 test2.$O $LIB -L/usr/local/lib -lfmt -lutf
-