X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=free%2Flibs%2FMakefile;h=5690e9cd72d05094cab0b35a62ce7ec50ac26acc;hb=ca1e06ed14e04fe2bcff4dca15cdea1e65a5ab65;hp=a9ec173ddebd10d05256bd48bb37695ffa9c2a65;hpb=5ca7e1d3563c2a6b5efbf6f890f17d39b2872c8f;p=libucw.git

diff --git a/free/libs/Makefile b/free/libs/Makefile
index a9ec173d..5690e9cd 100644
--- a/free/libs/Makefile
+++ b/free/libs/Makefile
@@ -13,15 +13,27 @@ 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
+FREE_CONFIGS=sherlock local
+CONFIGS+=$(FREE_CONFIGS)
+
+INSTALL_TARGETS+=install-configs
+install-configs:
+	install -d -m 755 $(DESTDIR)$(INSTALL_CONFIG_DIR)
+	install -m 644 $(addprefix run/cf/,$(FREE_CONFIGS)) $(DESTDIR)$(INSTALL_CONFIG_DIR)
 
 # Set up names of common libraries (to avoid forward references in rules)
 LIBCHARSET=$(o)/charset/libcharset.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
 
@@ -35,7 +47,22 @@ LIBIMAGES=$(o)/images/libimages.pc
 include $(s)/images/Makefile
 endif
 
+endif
+
+# Build documentation by default?
+ifdef CONFIG_DOC
+all: docs
+endif
+
 libs: $(LIBUCW) $(LIBSH) $(LIBIMAGES) $(LIBCHARSET) $(LIBLANG)
 
 # And finally the default rules of the build system
 include $(s)/build/Makebottom
+
+ifndef CONFIG_LOCAL
+install: all $(INSTALL_TARGETS)
+else
+install:
+	@echo "Nothing to install, this is a local build." && false
+endif
+.PHONY: install