CGI: make_out_args() handles undefs correctly.

[libucw.git] / charset / Makefile

diff --git a/charset/Makefile b/charset/Makefile
index 115b0bb1abb8a20a7ef84407cfd5d7e01fa81afb..8e121369474edae8b577c067cf6f94c836c547fc 100644 (file)
--- a/charset/Makefile
+++ b/charset/Makefile
@@ -1,20 +1,22 @@
-# Makefile for the Sherlock Charset Library (c) 1997--2002 Martin Mares <mj@ucw.cz>
+# Makefile for the Sherlock Charset Library (c) 1997--2007 Martin Mares <mj@ucw.cz>
 
 DIRS+=charset
 
-LIBCHARSET_MODS=toupper tolower tocat toligatures unaccent charconv setnames fb-charconv
-LIBCHARSET_INCLUDES=charconv.h unicat.h fb-charconv.h
+LIBCHARSET_MODS=toupper tolower tocat toligatures unaccent charconv setnames fb-charconv stk-charconv mp-charconv
+LIBCHARSET_INCLUDES=charconv.h unicat.h fb-charconv.h stk-charconv.h mp-charconv.h
 
-obj/charset/libcharset.a: $(addsuffix .o,$(addprefix obj/charset/,$(LIBCHARSET_MODS)))
-obj/charset/libcharset.so: $(addsuffix .oo,$(addprefix obj/charset/,$(LIBCHARSET_MODS)))
+$(o)/charset/libcharset.a: $(addsuffix .o,$(addprefix $(o)/charset/,$(LIBCHARSET_MODS)))
+$(o)/charset/libcharset.so: $(addsuffix .oo,$(addprefix $(o)/charset/,$(LIBCHARSET_MODS)))
+$(o)/charset/libcharset.pc: $(LIBUCW)
 
-INCLUDES+=obj/charset/.include-stamp
-obj/charset/.include-stamp: $(addprefix charset/,$(LIBCHARSET_INCLUDES))
-       build/install-includes charset run/include/charset $(?F)
-       touch obj/charset/.include-stamp
+API_LIBS+=libcharset
+API_INCLUDES+=$(o)/charset/.include-stamp
+$(o)/charset/.include-stamp: $(addprefix $(s)/charset/,$(LIBCHARSET_INCLUDES))
+$(o)/charset/.include-stamp: IDST=charset
+run/lib/pkgconfig/libcharset.pc: $(o)/charset/libcharset.pc
 
 build_charsets:
-       cd charset && sh misc/generate
+       cd $(s)/charset && sh misc/generate
 
 clean::
-       rm -f charset/misc/u-*
+       rm -f $(s)/charset/misc/u-*