Build: With shared LibUCW we no longer need picstatic version of libraries.

diff --git a/charset/Makefile b/charset/Makefile
index d015aaa0381805ecf601f435d3c53088436fbec7..8e351ff1ba178805d062c9d7b39fde167fb2ca56 100644 (file)
--- a/charset/Makefile
+++ b/charset/Makefile
@@ -8,14 +8,10 @@ LIBCHARSET_INCLUDES=charconv.h unicat.h fb-charconv.h stk-charconv.h mp-charconv
 LIBCHARSET_DEPS=$(LIBUCW)
 
 $(o)/charset/libucw-charset$(LV).a: $(addsuffix .o,$(addprefix $(o)/charset/,$(LIBCHARSET_MODS)))
-$(o)/charset/libucw-charset$(LV)-pic.a: $(addsuffix .oo,$(addprefix $(o)/charset/,$(LIBCHARSET_MODS)))
 $(o)/charset/libucw-charset$(LV).so: $(addsuffix .oo,$(addprefix $(o)/charset/,$(LIBCHARSET_MODS))) $(LIBCHARSET_DEPS)
 $(o)/charset/libucw-charset$(LV).so: SONAME_SUFFIX=.0
 $(o)/charset/libucw-charset.pc: $(LIBCHARSET_DEPS)
 
-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 .so)
 endif

diff --git a/charset/libucw-charset.pc b/charset/libucw-charset.pc
index 211959b042b46eb59cd6f0f0cb3ae60d21812211..a324ef02acf7d2643743b8b1e8457fb98e0aad38 100644 (file)
--- a/charset/libucw-charset.pc
+++ b/charset/libucw-charset.pc
@@ -3,12 +3,9 @@
 libdir=@LIBDIR@
 incdir=.
 
-# Override if you want to use the -pic version
-picsuffix=
-
 Name: libucw-charset
 Description: Character set conversion library
 Version: @UCW_VERSION@
 Cflags: -I${incdir}
-Libs: -L${libdir} @SO_LINK_PATH@ -lucw-charset@UCW_ABI_SUFFIX@${picsuffix}
+Libs: -L${libdir} @SO_LINK_PATH@ -lucw-charset@UCW_ABI_SUFFIX@
 Requires.private: @DEPS@

diff --git a/images/Makefile b/images/Makefile
index 3d0abe89a45b2413cd873f867631a3c83c8e9fdb..d418f7553422e270b3da49f7f9ac41970b75234b 100644 (file)
--- a/images/Makefile
+++ b/images/Makefile
@@ -15,9 +15,6 @@ else
 LIBIMAGES_DEPS=$(LIBUCW)
 endif
 
-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 .so)
 endif
@@ -68,7 +65,6 @@ PROGS+=$(LIBIMAGES_PROGS)
 CONFIGS+=$(LIBIMAGES_CONFIGS)
 
 $(o)/images/libucw-images$(LV).a: $(addsuffix .o,$(addprefix $(o)/images/,$(LIBIMAGES_MODS)))
-$(o)/images/libucw-images$(LV)-pic.a: $(addsuffix .oo,$(addprefix $(o)/images/,$(LIBIMAGES_MODS)))
 $(o)/images/libucw-images$(LV).so: $(addsuffix .oo,$(addprefix $(o)/images/,$(LIBIMAGES_MODS))) $(LIBIMAGES_DEPS)
 $(o)/images/libucw-images$(LV).so: SONAME_SUFFIX=.0
 $(o)/images/libucw-images$(LV).so: LIBS+=$(LIBIMAGES_LIBS)

diff --git a/images/libucw-images.pc b/images/libucw-images.pc
index 6496ac8fa300357cd6134fca94dbf2dc8759ee3b..9cc39c0c03e536766e9fbe7b00852e8ca479edf1 100644 (file)
--- a/images/libucw-images.pc
+++ b/images/libucw-images.pc
@@ -3,13 +3,10 @@
 libdir=@LIBDIR@
 incdir=.
 
-# Override if you want to use the -pic version
-picsuffix=
-
 Name: libucw-images
 Description: UCW image library
 Version: @UCW_VERSION@
 Cflags: -I${incdir}
-Libs: -L${libdir} @SO_LINK_PATH@ -lucw-images@UCW_ABI_SUFFIX@${picsuffix}
+Libs: -L${libdir} @SO_LINK_PATH@ -lucw-images@UCW_ABI_SUFFIX@
 Libs.private: @LIBIMAGES_LIBS@
 Requires.private: @DEPS@

diff --git a/ucw/Makefile b/ucw/Makefile
index 5a13a35c7e3f2106c50eb9f9939dcbcf7a7cbbca..860a647a497d6852209afb47c0a829cc21aa3db8 100644 (file)
--- a/ucw/Makefile
+++ b/ucw/Makefile
@@ -102,14 +102,10 @@ LIBUCW_LIBS+=-lrt
 endif
 
 $(o)/ucw/libucw$(LV).a: $(addsuffix .o,$(LIBUCW_MOD_PATHS))
-$(o)/ucw/libucw$(LV)-pic.a: $(addsuffix .oo,$(LIBUCW_MOD_PATHS))
 $(o)/ucw/libucw$(LV).so: $(addsuffix .oo,$(LIBUCW_MOD_PATHS))
 $(o)/ucw/libucw$(LV).so: SONAME_SUFFIX=.0
 $(o)/ucw/libucw$(LV).so: LIBS+=$(LIBUCW_LIBS)
 
-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 .so)
 endif

diff --git a/ucw/default.cfg b/ucw/default.cfg
index b7ff6bc67877ccaea040914536fe5fe5a803169b..bc4d48b0d357806419d7db343a82264556961ef6 100644 (file)
--- a/ucw/default.cfg
+++ b/ucw/default.cfg
@@ -24,10 +24,6 @@ Set("CONFIG_UCW_LARGE_FILES");
 # Use shared libraries
 UnSet("CONFIG_SHARED");
 
-# In addition to normal static libraries, generate also static libraries
-# with PIC code (libucw-pic.a and friends).
-UnSet("CONFIG_STATIC_PIC");
-
 # If your system can't reset getopt with 'optind = 0', you need to compile our internal copy
 # of GNU libc's getopt. This should not be necessary on GNU libc.
 UnSet("CONFIG_UCW_OWN_GETOPT");

diff --git a/ucw/libucw.pc b/ucw/libucw.pc
index 283c89ccea6f0afaaa4fbf3e75cc0ff558cd3765..08790dafa636ed5b987596300fbb13cd2d27d5bd 100644 (file)
--- a/ucw/libucw.pc
+++ b/ucw/libucw.pc
@@ -3,9 +3,6 @@
 libdir=@LIBDIR@
 incdir=.
 
-# Override if you want to use the -pic version
-picsuffix=
-
 perl_modules_dir=@INSTALL_PERL_DIR@
 perl_module_flags=-I${perl_modules_dir}
 build_system=@INSTALL_SHARE_DIR@/ucw/build
@@ -14,5 +11,5 @@ Name: libucw
 Description: A library of utility functions and data structures
 Version: @UCW_VERSION@
 Cflags: -I${incdir}
-Libs: -L${libdir} @SO_LINK_PATH@ -lucw@UCW_ABI_SUFFIX@${picsuffix}
+Libs: -L${libdir} @SO_LINK_PATH@ -lucw@UCW_ABI_SUFFIX@
 Libs.private: @LIBUCW_LIBS@

diff --git a/xml/Makefile b/xml/Makefile
index 567c8a6ada2c942ebb5180ce240dd4c1668a0bba..4df8de257fa1ff300063b2ea74c7ae58fc0c870a 100644 (file)
--- a/xml/Makefile
+++ b/xml/Makefile
@@ -10,14 +10,10 @@ LIBXML_INCLUDES=xml.h dtd.h
 LIBXML_DEPS=$(LIBUCW) $(LIBCHARSET)
 
 $(o)/xml/libucw-xml$(LV).a: $(addsuffix .o,$(LIBXML_MOD_PATHS))
-$(o)/xml/libucw-xml$(LV)-pic.a: $(addsuffix .oo,$(LIBXML_MOD_PATHS))
 $(o)/xml/libucw-xml$(LV).so: $(addsuffix .oo,$(LIBXML_MOD_PATHS)) $(LIBXML_DEPS)
 $(o)/xml/libucw-xml$(LV).so: SONAME_SUFFIX=.0
 $(o)/xml/libucw-xml.pc: $(LIBXML_DEPS)
 
-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 .so)
 endif

diff --git a/xml/libucw-xml.pc b/xml/libucw-xml.pc
index c127311d3f7c5e39c2091398b2b86c5232d01dc4..5c02e9962286fd2e14a5e85b239de4011e45a958 100644 (file)
--- a/xml/libucw-xml.pc
+++ b/xml/libucw-xml.pc
@@ -3,12 +3,9 @@
 libdir=@LIBDIR@
 incdir=.
 
-# Override if you want to use the -pic version
-picsuffix=
-
 Name: libucw-xml
 Description: XML parser for LibUCW project
 Version: @UCW_VERSION@
 Cflags: -I${incdir}
-Libs: -L${libdir} @SO_LINK_PATH@ -lucw-xml@UCW_ABI_SUFFIX@${picsuffix}
+Libs: -L${libdir} @SO_LINK_PATH@ -lucw-xml@UCW_ABI_SUFFIX@
 Requires.private: @DEPS@