New Makefiles.

diff --git a/charset/Makefile b/charset/Makefile
index ad9911cb359a48fc36d9470d8d95e432cc0eb739..6c3d1c386a9b621fece00f9106ffa92b9bbcd866 100644 (file)
--- a/charset/Makefile
+++ b/charset/Makefile
@@ -1,40 +1,13 @@
-# Makefile for the Sherlock UniCode Library (c) 1997 Martin Mares <mj@atrey.karlin.mff.cuni.cz>
+# Makefile for the Sherlock Charset Library (c) 1997--2000 Martin Mares <mj@ucw.cz>
 
-CLIB=../lib/libunicode.a
+DIRS+=charset
 
-OBJS=toupper.o tolower.o tocat.o utf8.o unaccent.o tosig.o strlen.o debug.o \
+UNI_OBJS=toupper.o tolower.o tocat.o utf8.o unaccent.o tosig.o strlen.o debug.o \
        charconv.o setnames.o
 
-all: .stamp $(CLIB)
+obj/charset/libcharset.a: $(addprefix obj/charset/,$(UNI_OBJS))
 
-.stamp:
-       mkdir -p $(TOPDIR)/run/char
-       ln -sf `pwd`/set $(TOPDIR)/run/char
-       touch .stamp
-
-$(CLIB): $(OBJS)
-       rm -f $(CLIB)
-       ar rcs $(CLIB) $(OBJS)
-
-toupper.o: toupper.c unicode.h U-upper.h
-tolower.o: tolower.c unicode.h U-lower.h
-tocat.o: tocat.c unicode.h U-cat.h
-utf8.o: utf8.c unicode.h
-unaccent.o: unaccent.c unicode.h U-unacc.h
-tosig.o: tosig.c unicode.h U-sig.h
-strlen.o: strlen.c unicode.h
-debug.o: debug.c unicode.h
-charconv.o: charconv.c charconv.h chartable.h
-setnames.o: setnames.c charconv.h
-
-test: test.o $(CLIB) $(TOPDIR)/lib/libsh.a
-       $(CC) $(LDFLAGS) test.o -o test -lsh -lunicode
-
-test.o: test.c unicode.h
-
-buildall: cleanall
-       mkdir exp
-       for a in `find set -type f -maxdepth 1` ; do b=`basename $$a` ; echo $$b ; misc/mkexpands $$b >exp/$$b ; done
+build_charsets: clean_charsets
        misc/unisplit
        misc/gentab _U_cat byte <misc/u-cat >U-cat.h
        misc/gentab _U_lower word <misc/u-lower >U-lower.h
@@ -45,11 +18,5 @@ buildall: cleanall
        misc/gentab _U_sig byte <misc/u-sig >U-sig.h
        misc/tabgen <misc/chartable.in >chartable.h
 
-cleanall:
-       rm -rf exp misc/u-* U-*.h chartable.h
-
-tags:
-       etags *.[ch]
-
-clean:
-       rm -f .stamp misc/u-* test
+clean_charsets:
+       rm -f misc/u-* U-*.h chartable.h

diff --git a/lib/Makefile b/lib/Makefile
new file mode 100644 (file)
index 0000000..0370209
--- /dev/null
+++ b/lib/Makefile
@@ -0,0 +1,14 @@
+# Makefile for the Sherlock Library (c) 1997--2000 Martin Mares <mj@ucw.cz>
+
+DIRS+=lib
+PROGS+=obj/lib/db-test obj/lib/db-rebuild
+
+SHLIB_OBJS=alloc.o alloc_str.o ctmatch.o db.o fastbuf.o fb-file.o fb-mem.o lists.o \
+       log.o log2.o md5.o md5hex.o mmap.o pagecache.o patimatch.o patmatch.o pool.o \
+       prime.o random.o realloc.o regex.o temp.o timer.o url.o wildmatch.o \
+       wordsplit.o
+
+obj/lib/libsh.a: $(addprefix obj/lib/,$(SHLIB_OBJS))
+
+obj/lib/db-test: obj/lib/db-test.o obj/lib/libsh.a
+obj/lib/db-rebuild: obj/lib/db-rebuild.o obj/lib/libsh.a