X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=inline;f=charset%2FMakefile;h=b944a79f1dbd79afe9740fc8e11427a607f991ff;hb=0f650a174990401b13a732a1008385a71e69cb8b;hp=5cdd48983521aa14508674d5153e8ea8e8336c13;hpb=036b9b800610a335a249db7e35547d556d54d272;p=libucw.git

diff --git a/charset/Makefile b/charset/Makefile
index 5cdd4898..b944a79f 100644
--- a/charset/Makefile
+++ b/charset/Makefile
@@ -1,19 +1,14 @@
-# Makefile for the Sherlock Charset Data Files (c) 1997 Martin Mares <mj@atrey.karlin.mff.cuni.cz>
+# Makefile for the Sherlock Charset Library (c) 1997--2002 Martin Mares <mj@ucw.cz>
 
-all: .stamp
+DIRS+=charset
 
-.stamp:
-	mkdir -p $(TOPDIR)/run/char
-	ln -sf `pwd`/set $(TOPDIR)/run/char
-	ln -sf `pwd`/exp $(TOPDIR)/run/char
-	touch .stamp
+LIBCHARSET_MODS=toupper tolower tocat toligatures unaccent charconv setnames fb-charconv
 
-buildall:
-	rm -rf exp
-	mkdir exp
-	for a in `find set -type f` ; do b=`basename $$a` ; echo $$b ; misc/mkexpands $$b >exp/$$b ; done
+obj/charset/libcharset.a: $(addsuffix .o,$(addprefix obj/charset/,$(LIBCHARSET_MODS)))
+obj/charset/libcharset.so: $(addsuffix .oo,$(addprefix obj/charset/,$(LIBCHARSET_MODS)))
 
-tags:
+build_charsets:
+	cd charset && sh misc/generate
 
-clean:
-	rm -f .stamp
+clean::
+	rm -f charset/misc/u-*