X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=Makefile;h=68ea310d6b0ba4a61dacdcb61d6944fd0a20d545;hb=0db6e10eac28f38bfc3b325b13ad95107c58ce1e;hp=9fff0c45055d14811620ac1c48334dd398b2df36;hpb=784514e732274230794bb5145fddc8e17155948c;p=libucw.git

diff --git a/Makefile b/Makefile
index 9fff0c45..68ea310d 100644
--- a/Makefile
+++ b/Makefile
@@ -23,10 +23,7 @@ include $(BUILDSYS)/Makefile
 
 # Set up names of common libraries (to avoid forward references in rules)
 ifdef CONFIG_CHARSET
-LIBCHARSET=$(o)/charset/libcharset.pc
-endif
-ifdef CONFIG_SHXML
-LIBSHXML=$(o)/shxml/libshxml.pc
+LIBCHARSET=$(o)/charset/libucw-charset.pc
 endif
 
 # The UCW library
@@ -49,16 +46,21 @@ include $(s)/charset/Makefile
 endif
 
 ifdef CONFIG_IMAGES
-LIBIMAGES=$(o)/images/libimages.pc
+LIBIMAGES=$(o)/images/libucw-images.pc
 include $(s)/images/Makefile
 endif
 
+ifdef CONFIG_XML
+LIBXML=$(o)/xml/libucw-xml.pc
+include $(s)/xml/Makefile
+endif
+
 # Build documentation by default?
 ifdef CONFIG_DOC
 all: docs
 endif
 
-libs: $(LIBUCW) $(LIBSHXML) $(LIBIMAGES) $(LIBCHARSET)
+libs: $(LIBUCW) $(LIBXML) $(LIBIMAGES) $(LIBCHARSET)
 
 # And finally the default rules of the build system
 include $(BUILDSYS)/Makebottom