UCW::Configure: Flush STDOUT after logging

[libucw.git] / Makefile

diff --git a/Makefile b/Makefile
index b91a4483433d9e15840c804bb9cf48099113c569..4fb2bbfde46afb545cc083f93d6826e1bf35a141 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -51,8 +51,13 @@ include $(s)/images/Makefile
 endif
 
 ifdef CONFIG_XML
-LIBXML=$(o)/xml/libucw-xml.pc
-include $(s)/xml/Makefile
+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,14 +65,13 @@ ifdef CONFIG_DOC
 all: docs
 endif
 
-libs: $(LIBUCW) $(LIBXML) $(LIBIMAGES) $(LIBCHARSET)
+libs: $(LIBUCW) $(LIBXML) $(LIBJSON) $(LIBIMAGES) $(LIBCHARSET)
 
 # And finally the default rules of the build system
 include $(BUILDSYS)/Makebottom
 
 ifndef CONFIG_LOCAL
 install: all $(INSTALL_TARGETS)
-       #/sbin/ldconfig -n $(DESTDIR)$(INSTALL_LIB_DIR)
 else
 install:
        @echo "Nothing to install, this is a local build." && false