Merge with git+ssh://git.ucw.cz/projects/sherlock/GIT/sherlock.git

[libucw.git] / free / libs / Makefile

diff --git a/free/libs/Makefile b/free/libs/Makefile
index b283efc4906759dd3bcada57538175b0ed4e7e0d..a9ec173ddebd10d05256bd48bb37695ffa9c2a65 100644 (file)
--- a/free/libs/Makefile
+++ b/free/libs/Makefile
@@ -17,17 +17,23 @@ include $(s)/build/Maketop
 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)