X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=free%2Flibs%2FMakefile;h=c08913f8a3f22f12e98a39f925d17ba67fff5094;hb=daa0dfe6a351a3fada31f173ce0c0523bacb2740;hp=4c55eb9b47ac4e4bcf0de627347e16c0396740d8;hpb=6653d0a752dd937152fa66f1725fab42edc25b8a;p=libucw.git

diff --git a/free/libs/Makefile b/free/libs/Makefile
index 4c55eb9b..c08913f8 100644
--- a/free/libs/Makefile
+++ b/free/libs/Makefile
@@ -10,18 +10,35 @@ s=.
 obj/config.mk:
 	@echo "You need to run configure first." && false
 
+BUILDSYS=$(s)/build
+
 # We will use the libucw build system
-include $(s)/build/Maketop
+include $(BUILDSYS)/Maketop
+
+# Install the build system
+include $(BUILDSYS)/Makefile
+
+# 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/$(CONFIG_DIR)/,$(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)/ucw/Makefile
 include $(s)/charset/Makefile
 include $(s)/sherlock/Makefile
 
@@ -35,7 +52,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
+include $(BUILDSYS)/Makebottom
+
+ifndef CONFIG_LOCAL
+install: all $(INSTALL_TARGETS)
+else
+install:
+	@echo "Nothing to install, this is a local build." && false
+endif
+.PHONY: install