autoconf.cfg: recognize correctly quad-core models of Intel Xeon cpus

[libucw.git] / sherlock / xml / Makefile

diff --git a/sherlock/xml/Makefile b/sherlock/xml/Makefile
index cc9fda5050c307210010d14fda0d7d5bf88f3e96..8b9af859debedd9fdd027105702f2e980f1b5c98 100644 (file)
--- a/sherlock/xml/Makefile
+++ b/sherlock/xml/Makefile
@@ -4,7 +4,7 @@
 DIRS+=sherlock/xml
 PROGS+=$(o)/sherlock/xml/xml-test
 
 DIRS+=sherlock/xml
 PROGS+=$(o)/sherlock/xml/xml-test
 

-LIBSHXML_MODS=common parse dtd
+LIBSHXML_MODS=common source parse dtd

 LIBSHXML_INCLUDES=xml.h dtd.h
 
 LIBSHXML_MOD_PATHS=$(addprefix $(o)/sherlock/xml/,$(LIBSHXML_MODS))
 LIBSHXML_INCLUDES=xml.h dtd.h
 
 LIBSHXML_MOD_PATHS=$(addprefix $(o)/sherlock/xml/,$(LIBSHXML_MODS))


@@ -13,13 +13,22 @@ $(o)/sherlock/xml/libshxml.a: $(addsuffix .o,$(LIBSHXML_MOD_PATHS))
 $(o)/sherlock/xml/libshxml.so: $(addsuffix .oo,$(LIBSHXML_MOD_PATHS))
 $(o)/sherlock/xml/libshxml.pc: $(LIBSH) $(LIBCHARSET)
 
 $(o)/sherlock/xml/libshxml.so: $(addsuffix .oo,$(LIBSHXML_MOD_PATHS))
 $(o)/sherlock/xml/libshxml.pc: $(LIBSH) $(LIBCHARSET)
 

-$(o)/sherlock/xml/common.o $(o)/sherlock/xml/unicat.h: $(o)/sherlock/xml/unicat.stamp
-$(o)/sherlock/xml/unicat.stamp: $(s)/sherlock/xml/unicat.pl
+$(o)/sherlock/xml/common.o: $(o)/sherlock/xml/unicat.h
+$(o)/sherlock/xml/common.oo: $(o)/sherlock/xml/unicat.h
+$(o)/sherlock/xml/source.o: $(o)/sherlock/xml/unicat.h
+$(o)/sherlock/xml/source.oo: $(o)/sherlock/xml/unicat.h
+$(o)/sherlock/xml/dtd.o: $(o)/sherlock/xml/unicat.h
+$(o)/sherlock/xml/dtd.oo: $(o)/sherlock/xml/unicat.h
+$(o)/sherlock/xml/parse.o: $(o)/sherlock/xml/unicat.h
+$(o)/sherlock/xml/parse.oo: $(o)/sherlock/xml/unicat.h
+$(o)/sherlock/xml/unicat.h: $(s)/sherlock/xml/unicat.pl

        $(M)GEN $(addprefix $(o)/sherlock/xml/unicat,.h .c)
        $(Q)$< $(addprefix $(o)/sherlock/xml/unicat,.h .c)
        $(Q)touch $@
 
        $(M)GEN $(addprefix $(o)/sherlock/xml/unicat,.h .c)
        $(Q)$< $(addprefix $(o)/sherlock/xml/unicat,.h .c)
        $(Q)touch $@
 

+TESTS+=$(o)/sherlock/xml/xml-test.test

 $(o)/sherlock/xml/xml-test: $(o)/sherlock/xml/xml-test.o $(LIBSHXML)
 $(o)/sherlock/xml/xml-test: $(o)/sherlock/xml/xml-test.o $(LIBSHXML)

+$(o)/sherlock/xml/xml-test.test: $(o)/sherlock/xml/xml-test

 
 API_LIBS+=libshxml
 API_INCLUDES+=$(o)/sherlock/xml/.include-stamp
 
 API_LIBS+=libshxml
 API_INCLUDES+=$(o)/sherlock/xml/.include-stamp