Released as 6.5.11.

[libucw.git] / Makefile

diff --git a/Makefile b/Makefile
index c126cd16ee8c6a2af61e3fd5c4cbfda30598e00e..4fb2bbfde46afb545cc083f93d6826e1bf35a141 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -23,7 +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
+LIBCHARSET=$(o)/charset/libucw-charset.pc
 endif
 
 # The UCW library
@@ -46,13 +46,18 @@ 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_SHXML
-LIBSHXML=$(o)/shxml/libshxml.pc
-include $(s)/shxml/Makefile
+ifdef CONFIG_XML
+LIBXML=$(o)/ucw-xml/libucw-xml.pc
+include $(s)/ucw-xml/Makefile
+endif
+
+ifdef CONFIG_JSON
+LIBJSON=$(o)/ucw-json/libucw-json.pc
+include $(s)/ucw-json/Makefile
 endif
 
 # Build documentation by default?
@@ -60,7 +65,7 @@ ifdef CONFIG_DOC
 all: docs
 endif
 
-libs: $(LIBUCW) $(LIBSHXML) $(LIBIMAGES) $(LIBCHARSET)
+libs: $(LIBUCW) $(LIBXML) $(LIBJSON) $(LIBIMAGES) $(LIBCHARSET)
 
 # And finally the default rules of the build system
 include $(BUILDSYS)/Makebottom