X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=charset%2FMakefile;h=6c3d1c386a9b621fece00f9106ffa92b9bbcd866;hb=dd79339e61140f94f3602e8bbdee78e838f9090c;hp=fab75f42cf7e479bcc7967750ba0e7332f544eeb;hpb=ac9212c1d03bd23f6322bef39a4a0384b5afcc5d;p=libucw.git

diff --git a/charset/Makefile b/charset/Makefile
index fab75f42..6c3d1c38 100644
--- a/charset/Makefile
+++ b/charset/Makefile
@@ -1,37 +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
-
-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
@@ -40,12 +16,7 @@ buildall: cleanall
 	misc/gentab _U_unaccent word <misc/u-unacc >U-unacc.h
 	misc/mksig >misc/u-sig
 	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
-
-tags:
-	etags *.[ch]
-
-clean:
-	rm -f .stamp misc/u-* test
+clean_charsets:
+	rm -f misc/u-* U-*.h chartable.h