v3.12.3-dev -> v3.12.4-dev

[libucw.git] / free / libs / Makefile

diff --git a/free/libs/Makefile b/free/libs/Makefile
index 07745f67694da652d991689643e714346b9f4be1..a9ec173ddebd10d05256bd48bb37695ffa9c2a65 100644 (file)
--- 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=.
@@ -13,18 +13,27 @@ obj/config.mk:
 # We will use the libucw build system
 include $(s)/build/Maketop
 
+# 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
 
 # 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
 
 libs: $(LIBUCW) $(LIBSH) $(LIBIMAGES) $(LIBCHARSET) $(LIBLANG)