From: Michal Vaner <vorner@ucw.cz>
Date: Fri, 17 Oct 2008 09:42:05 +0000 (+0200)
Subject: Better detection of .a/.so
X-Git-Tag: holmes-import~227^2~5^2~24
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=50ac1569e33ee80b2e0ed38d5ace0375d47cddd3;p=libucw.git

Better detection of .a/.so

There is a variable for the suffix.
---

diff --git a/charset/Makefile b/charset/Makefile
index e375f99b..db40deb4 100644
--- a/charset/Makefile
+++ b/charset/Makefile
@@ -21,17 +21,11 @@ build_charsets:
 clean::
 	rm -f $(s)/charset/misc/u-*
 
-ifdef CONFIG_SHARED
-LIBCHARSET_NAME=libcharset.so
-else
-LIBCHARSET_NAME=libcharset.a
-endif
-
 INSTALL_TARGETS+=install-libcharset
 install-libcharset:
 	install -d -m 755 $(DESTDIR)$(INSTALL_INCLUDE_DIR)/charset $(DESTDIR)$(INSTALL_LIB_DIR) $(DESTDIR)$(INSTALL_PKGCONFIG_DIR)
 	install -m 644 $(addprefix run/include/charset/,$(LIBCHARSET_INCLUDES)) $(DESTDIR)$(INSTALL_INCLUDE_DIR)/charset
-	install -m 644 run/lib/$(LIBCHARSET_NAME) $(DESTDIR)$(INSTALL_LIB_DIR)
+	install -m 644 run/lib/libcharset.$(LS) $(DESTDIR)$(INSTALL_LIB_DIR)
 	install -m 644 run/lib/pkgconfig/libcharset.pc $(DESTDIR)$(INSTALL_PKGCONFIG_DIR)
 
 .PHONY: install-libcharset
diff --git a/images/Makefile b/images/Makefile
index cc571e62..3badcd42 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -83,18 +83,12 @@ $(o)/images/.include-stamp: $(addprefix $(s)/images/,$(LIBIMAGES_INCLUDES))
 $(o)/images/.include-stamp: IDST=images
 run/lib/pkgconfig/libimages.pc: $(o)/images/libimages.pc
 
-ifdef CONFIG_SHARED
-LIBIMAGES_NAME=libimages.so
-else
-LIBIMAGES_NAME=libimages.a
-endif
-
 INSTALL_TARGETS+=install-libimages
 install-libimages:
 	install -d -m 755 $(addprefix $(DESTDIR),$(INSTALL_BIN_DIR) $(INSTALL_INCLUDE_DIR)/images $(INSTALL_LIB_DIR) $(INSTALL_PKGCONFIG_DIR) $(INSTALL_CONFIG_DIR))
 	install -m 755 $(LIBIMAGES_PROGS) $(DESTDIR)$(INSTALL_BIN_DIR)
 	install -m 644 $(addprefix run/include/images/,$(LIBIMAGES_INCLUDES)) $(DESTDIR)$(INSTALL_INCLUDE_DIR)/images
-	install -m 644 run/lib/$(LIBIMAGES_NAME) $(DESTDIR)$(INSTALL_LIB_DIR)
+	install -m 644 run/lib/libimages.$(LS) $(DESTDIR)$(INSTALL_LIB_DIR)
 	install -m 644 run/lib/pkgconfig/libimages.pc $(DESTDIR)$(INSTALL_PKGCONFIG_DIR)
 	install -m 644 $(addprefix run/cf/,$(LIBIMAGES_CONFIGS)) $(DESTDIR)$(INSTALL_CONFIG_DIR)
 
diff --git a/sherlock/xml/Makefile b/sherlock/xml/Makefile
index 73472c2d..23e08b22 100644
--- a/sherlock/xml/Makefile
+++ b/sherlock/xml/Makefile
@@ -36,17 +36,11 @@ $(o)/sherlock/xml/.include-stamp: $(addprefix $(s)/sherlock/xml/,$(LIBSHXML_INCL
 $(o)/sherlock/xml/.include-stamp: IDST=sherlock/xml
 run/lib/pkgconfig/libshxml.pc: $(o)/sherlock/xml/libshxml.pc
 
-ifdef CONFIG_SHARED
-LIBSHXML_NAME=libshxml.so
-else
-LIBSHXML_NAME=libshxml.a
-endif
-
 INSTALL_TARGETS+=install-sh-xml
 install-sh-xml:
 	install -d -m 755 $(DESTDIR)$(INSTALL_INCLUDE_DIR)/sherlock/xml $(DESTDIR)$(INSTALL_LIB_DIR) $(DESTDIR)$(INSTALL_PKGCONFIG_DIR)
 	install -m 644 $(addprefix run/include/sherlock/xml/,$(LIBSHXML_INCLUDES)) $(DESTDIR)$(INSTALL_INCLUDE_DIR)/sherlock/xml
 	install -m 644 run/lib/pkgconfig/libshxml.pc $(DESTDIR)$(INSTALL_PKGCONFIG_DIR)
-	install -m 644 run/lib/$(LIBSHXML_NAME) $(DESTDIR)$(INSTALL_LIB_DIR)
+	install -m 644 run/lib/libshxml.$(LS) $(DESTDIR)$(INSTALL_LIB_DIR)
 
 .PHONY: install-sh-xml
diff --git a/ucw/Makefile b/ucw/Makefile
index 8d762e7e..ac36816a 100644
--- a/ucw/Makefile
+++ b/ucw/Makefile
@@ -144,18 +144,12 @@ ifdef CONFIG_UCW_SHELL_UTILS
 include $(s)/ucw/shell/Makefile
 endif
 
-ifdef CONFIG_SHARED
-LIBUCW_NAME=libucw.so
-else
-LIBUCW_NAME=libucw.a
-endif
-
 INSTALL_TARGETS+=install-libucw
 install-libucw:
 	install -d -m 755 $(DESTDIR)$(INSTALL_LIB_DIR) $(DESTDIR)$(INSTALL_INCLUDE_DIR)/ucw/ $(DESTDIR)$(INSTALL_PKGCONFIG_DIR)
 	install -m 644 $(addprefix run/include/ucw/,$(LIBUCW_LOCAL_INCLUDES)) $(DESTDIR)$(INSTALL_INCLUDE_DIR)/ucw/
 	sed -e 's/^#include .autoconf\.h./#include <ucw\/autoconf.h>/' <run/include/ucw/config.h >$(DESTDIR)$(INSTALL_INCLUDE_DIR)/ucw/config.h
 	install -m 644 run/lib/pkgconfig/libucw.pc $(DESTDIR)$(INSTALL_PKGCONFIG_DIR)
-	install -m 644 run/lib/$(LIBUCW_NAME) $(DESTDIR)$(INSTALL_LIB_DIR)
+	install -m 644 run/lib/libucw.$(LS) $(DESTDIR)$(INSTALL_LIB_DIR)
 
 .PHONY: install-libucw