include $(s)/images/Makefile
endif
-ifdef CONFIG_SHXML
-LIBSHXML=$(o)/shxml/libucw-xml.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?
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