From e167c2fc955423dee63194b5e4e51b10dfeb40f3 Mon Sep 17 00:00:00 2001
From: Pavel Charvat <pchar@ucw.cz>
Date: Tue, 7 Jan 2014 10:15:13 +0100
Subject: [PATCH] Packages: Do not install picstatic version of libs.

But they are still not removed completely from Makefiles and pkgconfig.
---
 charset/Makefile | 3 +--
 images/Makefile  | 3 +--
 ucw/Makefile     | 3 +--
 xml/Makefile     | 3 +--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/charset/Makefile b/charset/Makefile
index 872fa19a..e6821689 100644
--- a/charset/Makefile
+++ b/charset/Makefile
@@ -16,7 +16,7 @@ ifdef CONFIG_STATIC_PIC
 $(o)/charset/libucw-charset.pc: $(o)/charset/libucw-charset$(LV)-pic.a
 endif
 ifdef CONFIG_INSTALL_API
-$(o)/charset/libucw-charset.pc: $(addprefix $(o)/charset/libucw-charset$(LV),.a -pic.a .so)
+$(o)/charset/libucw-charset.pc: $(addprefix $(o)/charset/libucw-charset$(LV),.a .so)
 endif
 
 API_LIBS+=libucw-charset
@@ -52,7 +52,6 @@ install-libucw-charset-api:
 	install -m 644 run/lib/pkgconfig/libucw-charset.pc $(DESTDIR)$(INSTALL_PKGCONFIG_DIR)
 	ln -sf libucw-charset$(LV).so.$(UCW_ABI_VERSION) $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-charset$(LV).so
 	install -m 644 run/lib/libucw-charset$(LV).a $(DESTDIR)$(INSTALL_LIB_DIR)
-	install -m 644 run/lib/libucw-charset$(LV)-pic.a $(DESTDIR)$(INSTALL_LIB_DIR)
 .PHONY: install-libucw-charset-api
 
 INSTALL_TARGETS+=install-libucw-charset-utils
diff --git a/images/Makefile b/images/Makefile
index 60493fc7..b7317163 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -19,7 +19,7 @@ ifdef CONFIG_STATIC_PIC
 LIBIMAGES_DEPS+=$(o)/images/libucw-images$(LV)-pic.a
 endif
 ifdef CONFIG_INSTALL_API
-$(o)/images/libucw-images.pc: $(addprefix $(o)/images/libucw-images$(LV),.a -pic.a .so)
+$(o)/images/libucw-images.pc: $(addprefix $(o)/images/libucw-images$(LV),.a .so)
 endif
 
 ifdef CONFIG_IMAGES_DUP
@@ -105,7 +105,6 @@ install-libucw-images-api:
 	install -m 644 run/lib/pkgconfig/libucw-images.pc $(DESTDIR)$(INSTALL_PKGCONFIG_DIR)
 	ln -sf libucw-images$(LV).so.$(UCW_ABI_VERSION) $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-images$(LV).so
 	install -m 644 run/lib/libucw-images$(LV).a $(DESTDIR)$(INSTALL_LIB_DIR)
-	install -m 644 run/lib/libucw-images$(LV)-pic.a $(DESTDIR)$(INSTALL_LIB_DIR)
 .PHONY: install-libucw-images-api
 
 INSTALL_TARGETS+=install-libucw-images-utils
diff --git a/ucw/Makefile b/ucw/Makefile
index c62bf345..a7d6099a 100644
--- a/ucw/Makefile
+++ b/ucw/Makefile
@@ -96,7 +96,7 @@ ifdef CONFIG_STATIC_PIC
 $(o)/ucw/libucw.pc: $(o)/ucw/libucw$(LV)-pic.a
 endif
 ifdef CONFIG_INSTALL_API
-$(o)/ucw/libucw.pc: $(addprefix $(o)/ucw/libucw$(LV),.a -pic.a .so)
+$(o)/ucw/libucw.pc: $(addprefix $(o)/ucw/libucw$(LV),.a .so)
 endif
 
 $(o)/ucw/hashfunc.o $(o)/ucw/hashfunc.oo: CFLAGS += -funroll-loops
@@ -198,7 +198,6 @@ install-libucw-api:
 	install -m 644 run/lib/pkgconfig/libucw.pc $(DESTDIR)$(INSTALL_PKGCONFIG_DIR)
 	ln -sf libucw$(LV).so.$(UCW_ABI_VERSION) $(DESTDIR)$(INSTALL_LIB_DIR)/libucw$(LV).so
 	install -m 644 run/lib/libucw$(LV).a $(DESTDIR)$(INSTALL_LIB_DIR)
-	install -m 644 run/lib/libucw$(LV)-pic.a $(DESTDIR)$(INSTALL_LIB_DIR)
 .PHONY: install-libucw-api
 
 INSTALL_TARGETS+=install-libucw-config
diff --git a/xml/Makefile b/xml/Makefile
index 0b261a96..6cc05119 100644
--- a/xml/Makefile
+++ b/xml/Makefile
@@ -19,7 +19,7 @@ ifdef CONFIG_STATIC_PIC
 $(o)/xml/libucw-xml.pc: $(o)/xml/libucw-xml$(LV)-pic.a
 endif
 ifdef CONFIG_INSTALL_API
-$(o)/xml/libucw-xml.pc: $(addprefix $(o)/xml/libucw-xml$(LV),.a -pic.a .so)
+$(o)/xml/libucw-xml.pc: $(addprefix $(o)/xml/libucw-xml$(LV),.a .so)
 endif
 
 $(o)/xml/common.o: $(o)/xml/unicat.h
@@ -58,5 +58,4 @@ install-libucw-xml-api:
 	install -m 644 $(addprefix run/include/xml/,$(LIBXML_INCLUDES)) $(DESTDIR)$(INSTALL_INCLUDE_DIR)/xml
 	ln -sf libucw-xml$(LV).so.$(UCW_ABI_VERSION) $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-xml$(LV).so
 	install -m 644 run/lib/libucw-xml$(LV).a $(DESTDIR)$(INSTALL_LIB_DIR)
-	install -m 644 run/lib/libucw-xml$(LV)-pic.a $(DESTDIR)$(INSTALL_LIB_DIR)
 .PHONY: install-libucw-xml-api
-- 
2.39.2