X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=free%2Flibs%2FMakefile;h=41eef5f94b17fa2997150b45ddfa069aeab91535;hb=dbc76b7fafe8711395feb7648bef83550b404dd0;hp=b283efc4906759dd3bcada57538175b0ed4e7e0d;hpb=ae714a97af8f0a899147e7ffd7a38a8a8da365f7;p=libucw.git

diff --git a/free/libs/Makefile b/free/libs/Makefile
index b283efc4..41eef5f9 100644
--- a/free/libs/Makefile
+++ b/free/libs/Makefile
@@ -13,23 +13,45 @@ obj/config.mk:
 # We will use the libucw build system
 include $(s)/build/Maketop
 
+# The UCW library
+include $(s)/ucw/Makefile
+
+# Stripped down version
+ifndef CONFIG_UCW_ONLY
+
 # Install config files
 CONFIGS+=sherlock local
 
 # Set up names of common libraries (to avoid forward references in rules)
-LIBLANG=$(o)/lang/liblang.pc
 LIBCHARSET=$(o)/charset/libcharset.pc
-LIBIMAGES=$(o)/images/libimages.pc
 LIBSH=$(o)/sherlock/libsh.pc
+LIBSHXML=$(o)/sherlock/xml/libshxml.pc
 
 # Include makefiles of libraries we wish to use
-include $(s)/lib/Makefile
 include $(s)/charset/Makefile
+include $(s)/sherlock/Makefile
+
+ifdef CONFIG_LANG
+LIBLANG=$(o)/lang/liblang.pc
 include $(s)/lang/Makefile
+endif
+
+ifdef CONFIG_IMAGES
+LIBIMAGES=$(o)/images/libimages.pc
 include $(s)/images/Makefile
-include $(s)/sherlock/Makefile
+endif
+
+endif
 
 libs: $(LIBUCW) $(LIBSH) $(LIBIMAGES) $(LIBCHARSET) $(LIBLANG)
 
 # And finally the default rules of the build system
 include $(s)/build/Makebottom
+
+ifndef CONFIG_LOCAL
+install: $(INSTALL_TARGETS)
+else
+install:
+	@echo "Nothing to install, this is a local build." && false
+endif
+.PHONY: install