libsh installs

[libucw.git] / free / libs / Makefile

diff --git a/free/libs/Makefile b/free/libs/Makefile
index a9ec173ddebd10d05256bd48bb37695ffa9c2a65..41eef5f94b17fa2997150b45ddfa069aeab91535 100644 (file)
--- a/free/libs/Makefile
+++ b/free/libs/Makefile
@@ -13,15 +13,21 @@ 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
 CONFIGS+=sherlock local
 
 # Set up names of common libraries (to avoid forward references in rules)
 LIBCHARSET=$(o)/charset/libcharset.pc
 LIBSH=$(o)/sherlock/libsh.pc
 # Install config files
 CONFIGS+=sherlock local
 
 # Set up names of common libraries (to avoid forward references in rules)
 LIBCHARSET=$(o)/charset/libcharset.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)/sherlock/Makefile
 
 include $(s)/charset/Makefile
 include $(s)/sherlock/Makefile
 


@@ -35,7 +41,17 @@ LIBIMAGES=$(o)/images/libimages.pc
 include $(s)/images/Makefile
 endif
 
 include $(s)/images/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: $(INSTALL_TARGETS)
+else
+install:
+       @echo "Nothing to install, this is a local build." && false
+endif
+.PHONY: install