X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=free%2Flibs%2FMakefile;h=c08913f8a3f22f12e98a39f925d17ba67fff5094;hb=daa0dfe6a351a3fada31f173ce0c0523bacb2740;hp=07745f67694da652d991689643e714346b9f4be1;hpb=33a9906a504d894349311ad1932076e25ae49e85;p=libucw.git

diff --git a/free/libs/Makefile b/free/libs/Makefile
index 07745f67..c08913f8 100644
--- a/free/libs/Makefile
+++ b/free/libs/Makefile
@@ -2,7 +2,7 @@
 # (c) 2007 Martin Mares <mj@ucw.cz>
 
 # The default target
-all: runtree libs
+all: runtree libs api programs extras configs
 
 # Include configuration
 s=.
@@ -10,23 +10,64 @@ 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
+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)
-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
+
+# 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