# 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
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)/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?
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