From: Martin Mares <mj@ucw.cz>
Date: Fri, 17 Aug 2007 12:36:55 +0000 (+0200)
Subject: Fix compilation of subsets of the stand-alone libraries.
X-Git-Tag: holmes-import~506^2~10^2~1^2~1
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=5ca7e1d3563c2a6b5efbf6f890f17d39b2872c8f;p=libucw.git

Fix compilation of subsets of the stand-alone libraries.
---

diff --git a/free/libs/Makefile b/free/libs/Makefile
index b283efc4..a9ec173d 100644
--- 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)