X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2FMakefile;h=669f356b152925c7fc69cfa4a9acf64312d85857;hb=e42cd882d7970eb0b01bc9b058e0446996212cb4;hp=2ee53e141c8b180106d115045182b4c38f6aee3c;hpb=a1f74b39f32118bc29bd83e73564143000aeb951;p=libucw.git

diff --git a/lib/Makefile b/lib/Makefile
index 2ee53e14..669f356b 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -33,7 +33,8 @@ LIBUCW_MODS= \
 	qache \
 	string \
 	bbuf \
-	getopt
+	getopt \
+	xml
 
 LIBUCW_INCLUDES= \
 	lib.h config.h threads.h \
@@ -59,8 +60,9 @@ LIBUCW_INCLUDES= \
 	md5.h \
 	base64.h base224.h \
 	qache.h \
-	kmp.h kmp-search.h \
-	partmap.h
+	kmp.h kmp-search.h binsearch.h \
+	partmap.h \
+	xml.h
 
 ifdef CONFIG_UCW_THREADS
 # Some modules require threading
@@ -86,6 +88,11 @@ $(o)/lib/libucw.so: $(addsuffix .oo,$(LIBUCW_MOD_PATHS))
 $(o)/lib/hashfunc.o $(o)/lib/hashfunc.oo: CFLAGS += -funroll-loops
 $(o)/lib/lizard.o: CFLAGS += $(COPT2) -funroll-loops
 
+$(o)/lib/xml.o: $(o)/lib/xml-ucat.h
+$(o)/lib/xml-ucat.h: $(s)/lib/xml-ucat.pl
+	$(M)GEN $@
+	$(Q)$< >$@
+
 $(o)/lib/db-test: $(o)/lib/db-test.o $(LIBUCW)
 $(o)/lib/db-tool: $(o)/lib/db-tool.o $(LIBUCW)
 $(o)/lib/conf-test: $(o)/lib/conf-test.o $(LIBUCW)
@@ -122,10 +129,8 @@ endif
 
 API_LIBS+=libucw
 API_INCLUDES+=$(o)/lib/.include-stamp
-# XXX: We do not have a dependency on autoconf.h, but it is generated by configure
-# before make ever starts, so this is safe.
-$(o)/lib/.include-stamp: $(addprefix $(s)/lib/,$(LIBUCW_INCLUDES))
-	$(Q)$(s)/build/install-includes $(<D) run/include/lib $(?F)
+$(o)/lib/.include-stamp: $(addprefix $(s)/lib/,$(LIBUCW_INCLUDES)) obj/autoconf.h
+	$(Q)$(s)/build/install-includes $(<D) run/include/lib $(LIBUCW_INCLUDES)
 	$(Q)$(s)/build/install-includes obj run/include/lib autoconf.h
 	$(Q)touch $@
 run/lib/pkgconfig/libucw.pc: $(o)/lib/libucw.pc