Packages: pkg-config dependencies moved to Requires.private.

diff --git a/charset/Makefile b/charset/Makefile
index 2baf00eddb9e6eea255fd5ce9e249b951e03aa42..dc074272a954f4eb15cddf0ab6a5c2721bafe85e 100644 (file)
--- a/charset/Makefile
+++ b/charset/Makefile
@@ -8,7 +8,7 @@ LIBCHARSET_INCLUDES=charconv.h unicat.h fb-charconv.h stk-charconv.h mp-charconv
 
 $(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)))
+$(o)/charset/libucw-charset$(LV).so: $(addsuffix .oo,$(addprefix $(o)/charset/,$(LIBCHARSET_MODS))) $(LIBUCW)
 $(o)/charset/libucw-charset$(LV).so: SONAME_SUFFIX=.$(UCW_ABI_MAJOR)
 $(o)/charset/libucw-charset.pc: $(LIBUCW)
 
@@ -29,7 +29,7 @@ ifdef CONFIG_CHARSET_UTILS
 LIBCHARSET_PROGS+=$(o)/charset/ucw-cs2cs
 endif
 
-$(o)/charset/ucw-cs2cs: $(o)/charset/ucw-cs2cs.o $(LIBCHARSET)
+$(o)/charset/ucw-cs2cs: $(o)/charset/ucw-cs2cs.o $(LIBCHARSET) $(LIBUCW)
 
 PROGS+=$(LIBCHARSET_PROGS)
 

diff --git a/charset/libucw-charset.pc b/charset/libucw-charset.pc
index baf0245bad03baaa3fdccbc5380e99451523a010..1795258e46ee0f675340d4e28446ac9bb9d2e836 100644 (file)
--- a/charset/libucw-charset.pc
+++ b/charset/libucw-charset.pc
@@ -11,4 +11,4 @@ Description: Character set conversion library
 Version: @UCW_VERSION@
 Cflags: -I${incdir}
 Libs: -L${libdir} -lucw-charset@UCW_ABI_SUFFIX@${picsuffix}
-Requires: @DEPS@
+Requires.private: @DEPS@

diff --git a/images/Makefile b/images/Makefile
index 8b4bba34a696732f82ba6a7ff631dd8d0027631a..be7fed3cc89933a7950dce0abd0a7e77665bd22f 100644 (file)
--- a/images/Makefile
+++ b/images/Makefile
@@ -69,22 +69,22 @@ 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)))
+$(o)/images/libucw-images$(LV).so: $(addsuffix .oo,$(addprefix $(o)/images/,$(LIBIMAGES_MODS))) $(LIBIMAGES_DEPS)
 $(o)/images/libucw-images$(LV).so: SONAME_SUFFIX=.$(UCW_ABI_MAJOR)
 $(o)/images/libucw-images$(LV).so: LIBS+=$(LIBIMAGES_LIBS)
 $(o)/images/libucw-images.pc: $(LIBIMAGES_DEPS)
 
-$(o)/images/ucw-image-tool: $(o)/images/ucw-image-tool.o $(LIBIMAGES)
-$(o)/images/ucw-color-tool: $(o)/images/ucw-color-tool.o $(LIBIMAGES)
-$(o)/images/ucw-image-dup-test: $(o)/images/ucw-image-dup-test.o $(LIBIMAGES)
-$(o)/images/ucw-image-sim-test: $(o)/images/ucw-image-sim-test.o $(LIBIMAGES)
+$(o)/images/ucw-image-tool: $(o)/images/ucw-image-tool.o $(LIBIMAGES) $(LIBUCW)
+$(o)/images/ucw-color-tool: $(o)/images/ucw-color-tool.o $(LIBIMAGES) $(LIBUCW)
+$(o)/images/ucw-image-dup-test: $(o)/images/ucw-image-dup-test.o $(LIBIMAGES) $(LIBUCW)
+$(o)/images/ucw-image-sim-test: $(o)/images/ucw-image-sim-test.o $(LIBIMAGES) $(LIBUCW)
 
 TESTS+=$(o)/images/image-test.test
-$(o)/images/image-test: $(o)/images/image-test.o $(LIBIMAGES)
+$(o)/images/image-test: $(o)/images/image-test.o $(LIBIMAGES) $(LIBUCW)
 $(o)/images/image-test.test: $(o)/images/image-test
 
 TESTS+=$(o)/images/color.test
-$(o)/images/color-t: $(LIBIMAGES)
+$(o)/images/color-t: $(LIBIMAGES) $(LIBUCW)
 $(o)/images/color.test: $(o)/images/color-t
 
 API_LIBS+=libucw-images

diff --git a/images/libucw-images.pc b/images/libucw-images.pc
index 445a0d0fcc6e27b35a8a618782c713d61efc262a..7f24b3c0921d899feda0719e36951e93c1a04715 100644 (file)
--- a/images/libucw-images.pc
+++ b/images/libucw-images.pc
@@ -12,4 +12,4 @@ Version: @UCW_VERSION@
 Cflags: -I${incdir}
 Libs: -L${libdir} -lucw-images@UCW_ABI_SUFFIX@${picsuffix}
 Libs.private: @LIBIMAGES_LIBS@
-Requires: @DEPS@
+Requires.private: @DEPS@

diff --git a/xml/Makefile b/xml/Makefile
index 44e13c6c14990d1248218eeffdaf1f22a53d82f1..7e7d2429cc5c7cca97d7900534156bf5606ba3eb 100644 (file)
--- a/xml/Makefile
+++ b/xml/Makefile
@@ -11,7 +11,7 @@ LIBXML_MOD_PATHS=$(addprefix $(o)/xml/,$(LIBXML_MODS))
 
 $(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))
+$(o)/xml/libucw-xml$(LV).so: $(addsuffix .oo,$(LIBXML_MOD_PATHS)) $(LIBCHARSET)
 $(o)/xml/libucw-xml$(LV).so: SONAME_SUFFIX=.$(UCW_ABI_MAJOR)
 $(o)/xml/libucw-xml.pc: $(LIBCHARSET)
 
@@ -36,7 +36,7 @@ $(o)/xml/unicat.h: $(s)/xml/unicat.pl
        $(Q)touch $@
 
 TESTS+=$(o)/xml/xml-test.test
-$(o)/xml/xml-test: $(o)/xml/xml-test.o $(LIBXML)
+$(o)/xml/xml-test: $(o)/xml/xml-test.o $(LIBXML) $(LIBCHARSET) $(LIBUCW)
 $(o)/xml/xml-test.test: $(o)/xml/xml-test
 
 API_LIBS+=libucw-xml

diff --git a/xml/libucw-xml.pc b/xml/libucw-xml.pc
index 82ee17662a27bd0871a58aa655dda220324a4a8d..908328de215aaab04fa14c7ef455d262d049d932 100644 (file)
--- a/xml/libucw-xml.pc
+++ b/xml/libucw-xml.pc
@@ -11,4 +11,4 @@ Description: XML parser for LibUCW project
 Version: @UCW_VERSION@
 Cflags: -I${incdir}
 Libs: -L${libdir} -lucw-xml@UCW_ABI_SUFFIX@${picsuffix}
-Requires: @DEPS@
+Requires.private: @DEPS@