Merge branch 'dev-lib' of ssh://git.ucw.cz/projects/sherlock/GIT/sherlock into dev-lib

[libucw.git] / free / libs / Makefile

diff --git a/free/libs/Makefile b/free/libs/Makefile
index b283efc4906759dd3bcada57538175b0ed4e7e0d..afd3d6f09391f297d65f1af73c56a4a424caa344 100644 (file)
--- a/free/libs/Makefile
+++ b/free/libs/Makefile
@@ -13,23 +13,51 @@ obj/config.mk:
 # We will use the libucw build system
 include $(s)/build/Maketop
 
 # We will use the libucw build system
 include $(s)/build/Maketop
 

+# The UCW library
+include $(s)/ucw/Makefile
+
+# Stripped down version
+ifndef CONFIG_UCW_ONLY
+

 # Install config files
 # 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/cf/,$(FREE_CONFIGS)) $(DESTDIR)$(INSTALL_CONFIG_DIR)

 
 # Set up names of common libraries (to avoid forward references in rules)
 
 # Set up names of common libraries (to avoid forward references in rules)

-LIBLANG=$(o)/lang/liblang.pc

 LIBCHARSET=$(o)/charset/libcharset.pc
 LIBCHARSET=$(o)/charset/libcharset.pc

-LIBIMAGES=$(o)/images/libimages.pc

 LIBSH=$(o)/sherlock/libsh.pc
 LIBSH=$(o)/sherlock/libsh.pc

+LIBSHXML=$(o)/sherlock/xml/libshxml.pc

 
 # Include makefiles of libraries we wish to use
 
 # Include makefiles of libraries we wish to use

-include $(s)/lib/Makefile

 include $(s)/charset/Makefile
 include $(s)/charset/Makefile

+include $(s)/sherlock/Makefile
+
+ifdef CONFIG_LANG
+LIBLANG=$(o)/lang/liblang.pc

 include $(s)/lang/Makefile
 include $(s)/lang/Makefile

+endif
+
+ifdef CONFIG_IMAGES
+LIBIMAGES=$(o)/images/libimages.pc

 include $(s)/images/Makefile
 include $(s)/images/Makefile

-include $(s)/sherlock/Makefile
+endif
+
+endif

 
 libs: $(LIBUCW) $(LIBSH) $(LIBIMAGES) $(LIBCHARSET) $(LIBLANG)
 
 # And finally the default rules of the build system
 include $(s)/build/Makebottom
 
 libs: $(LIBUCW) $(LIBSH) $(LIBIMAGES) $(LIBCHARSET) $(LIBLANG)
 
 # And finally the default rules of the build system
 include $(s)/build/Makebottom

+
+ifndef CONFIG_LOCAL
+install: all $(INSTALL_TARGETS)
+else
+install:
+       @echo "Nothing to install, this is a local build." && false
+endif
+.PHONY: install