Packages: Split each UCW library to its own set of packages.

diff --git a/Makefile b/Makefile
index 4e31f5e6e964b20da0d3cb429c11371cfbee22ec..b91a4483433d9e15840c804bb9cf48099113c569 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -66,14 +66,8 @@ libs: $(LIBUCW) $(LIBXML) $(LIBIMAGES) $(LIBCHARSET)
 include $(BUILDSYS)/Makebottom
 
 ifndef CONFIG_LOCAL
-install: all $(INSTALL_TARGETS) install-libs install-api install-configs install-utils
-
-install-libs: $(INSTALL_LIB_TARGETS)
-install-api: $(INSTALL_API_TARGETS)
-       /sbin/ldconfig -n $(DESTDIR)$(INSTALL_LIB_DIR)
-install-configs: $(INSTALL_CONFIG_TARGETS)
-install-utils: $(INSTALL_UTILS_TARGETS)
-.PHONY: install-libs install-api install-configs install-utils
+install: all $(INSTALL_TARGETS)
+       #/sbin/ldconfig -n $(DESTDIR)$(INSTALL_LIB_DIR)
 else
 install:
        @echo "Nothing to install, this is a local build." && false

diff --git a/charset/Makefile b/charset/Makefile
index ece588fa65035786750c8c1047a60b6f7cdc664b..9e6cac14ad964544f03070ff533ef5394ed286fb 100644 (file)
--- a/charset/Makefile
+++ b/charset/Makefile
@@ -39,13 +39,13 @@ build_charsets:
 clean::
        rm -f $(s)/charset/misc/u-*
 
-INSTALL_LIB_TARGETS+=install-libucw-charset-lib
+INSTALL_TARGETS+=install-libucw-charset-lib
 install-libucw-charset-lib:
        install -d -m 755 $(DESTDIR)$(INSTALL_LIB_DIR)
        install -m 644 run/lib/libucw-charset.so.$(UCW_ABI_MAJOR) $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-charset.so.$(UCW_ABI_VERSION)
 .PHONY: install-libucw-charset-lib
 
-INSTALL_API_TARGETS+=install-libucw-charset-api
+INSTALL_TARGETS+=install-libucw-charset-api
 install-libucw-charset-api:
        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
@@ -55,7 +55,7 @@ install-libucw-charset-api:
        install -m 644 run/lib/libucw-charset-pic.a $(DESTDIR)$(INSTALL_LIB_DIR)
 .PHONY: install-libucw-charset-api
 
-INSTALL_UTILS_TARGETS+=install-libucw-charset-utils
+INSTALL_TARGETS+=install-libucw-charset-utils
 install-libucw-charset-utils:
        install -d -m 755 $(DESTDIR)$(INSTALL_BIN_DIR)
        install -m 755 $(LIBCHARSET_PROGS) $(DESTDIR)$(INSTALL_BIN_DIR)

diff --git a/debian/control.in b/debian/control.in
index 5ec976fa27a22d3d0efefa5c97efa8c0ba24de30..0789e42199ea8e96a5ddc320d406f2dea6c322d4 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -8,7 +8,7 @@ Package: libucw-@UCW_ABI_MAJOR@
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: LibUCW libraries
+Description: LibUCW library
 
 Package: libucw-dev
 Section: libdevel
@@ -27,3 +27,52 @@ Section: doc
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: LibUCW documentation
+
+Package: libucw-charset-@UCW_ABI_MAJOR@
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: LibUCW charset library
+
+Package: libucw-charset-dev
+Section: libdevel
+Architecture: any
+Depends: libucw-charset-@UCW_ABI_MAJOR@ (= @VER@), ${shlibs:Depends}, ${misc:Depends}
+Description: LibUCW charset development files
+
+Package: libucw-charset-utils
+Section: misc
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: LibUCW charset utilities
+
+Package: libucw-xml-@UCW_ABI_MAJOR@
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: LibUCW XML parser library
+
+Package: libucw-xml-dev
+Section: libdevel
+Architecture: any
+Depends: libucw-xml-@UCW_ABI_MAJOR@ (= @VER@), ${shlibs:Depends}, ${misc:Depends}
+Description: LibUCW XML parser development files
+
+Package: libucw-images-@UCW_ABI_MAJOR@
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: LibUCW image library
+
+Package: libucw-images-dev
+Section: libdevel
+Architecture: any
+Depends: libucw-images-@UCW_ABI_MAJOR@ (= @VER@), ${shlibs:Depends}, ${misc:Depends}
+Description: LibUCW image development files
+
+Package: libucw-images-utils
+Section: misc
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: LibUCW image utilities
+

diff --git a/debian/rules b/debian/rules
index 6e608eb77d72ae86f7e9aec1b42e8eed7ae237da..b1122861451c0d4b2e140337a772533bd39b92bc 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -27,13 +27,20 @@ install: build
        dh_testroot
        dh_clean -k
        dh_installdirs
-       $(MAKE) DESTDIR=$(CURDIR)/debian/libucw-$(UCW_ABI_MAJOR) install-libs
-       $(MAKE) DESTDIR=$(CURDIR)/debian/libucw-dev install-api
-       $(MAKE) DESTDIR=$(CURDIR)/debian/libucw-utils install-utils
-       $(MAKE) DESTDIR=$(CURDIR)/debian/libucw-doc install-libucw-docs
-       $(MAKE) DESTDIR=$(CURDIR)/debian/libucw-doc install-configs
+       $(MAKE) DESTDIR=$(CURDIR)/debian/libucw-$(UCW_ABI_MAJOR) install-libucw-lib
+       $(MAKE) DESTDIR=$(CURDIR)/debian/libucw-dev install-libucw-api
+       $(MAKE) DESTDIR=$(CURDIR)/debian/libucw-utils install-ucw-shell install-ucw-utils
+       $(MAKE) DESTDIR=$(CURDIR)/debian/libucw-doc install-libucw-docs install-libucw-config
        install -d -m 755 $(CURDIR)/debian/libucw-doc/usr/share/doc/libucw/examples
        cp -r examples/external $(CURDIR)/debian/libucw-doc/usr/share/doc/libucw/examples/program
+       $(MAKE) DESTDIR=$(CURDIR)/debian/libucw-charset-$(UCW_ABI_MAJOR) install-libucw-charset-lib
+       $(MAKE) DESTDIR=$(CURDIR)/debian/libucw-charset-dev install-libucw-charset-api
+       $(MAKE) DESTDIR=$(CURDIR)/debian/libucw-charset-utils install-libucw-charset-utils
+       $(MAKE) DESTDIR=$(CURDIR)/debian/libucw-xml-$(UCW_ABI_MAJOR) install-libucw-xml-lib
+       $(MAKE) DESTDIR=$(CURDIR)/debian/libucw-xml-dev install-libucw-xml-api
+       $(MAKE) DESTDIR=$(CURDIR)/debian/libucw-images-$(UCW_ABI_MAJOR) install-libucw-images-lib
+       $(MAKE) DESTDIR=$(CURDIR)/debian/libucw-images-dev install-libucw-images-api
+       $(MAKE) DESTDIR=$(CURDIR)/debian/libucw-images-utils install-libucw-images-utils
 
 binary-indep: build install
 

diff --git a/images/Makefile b/images/Makefile
index 803b96c8b6d8751b5ac2675c56f4337697bb15b6..11a4fcf81cd2cf499e39148a303a7f5e27ec4170 100644 (file)
--- a/images/Makefile
+++ b/images/Makefile
@@ -92,13 +92,13 @@ $(o)/images/.include-stamp: $(addprefix $(s)/images/,$(LIBIMAGES_INCLUDES))
 $(o)/images/.include-stamp: IDST=images
 run/lib/pkgconfig/libucw-images.pc: $(o)/images/libucw-images.pc
 
-INSTALL_LIB_TARGETS+=install-libucw-images-lib
+INSTALL_TARGETS+=install-libucw-images-lib
 install-libucw-images-lib:
        install -d -m 755 $(DESTDIR)$(INSTALL_LIB_DIR)
        install -m 644 run/lib/libucw-images.so.$(UCW_ABI_MAJOR) $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-images.so.$(UCW_ABI_VERSION)
 .PHONY: install-libucw-images-lib
 
-INSTALL_API_TARGETS+=install-libucw-images-api
+INSTALL_TARGETS+=install-libucw-images-api
 install-libucw-images-api:
        install -d -m 755 $(addprefix $(DESTDIR),$(INSTALL_INCLUDE_DIR)/images $(INSTALL_LIB_DIR) $(INSTALL_PKGCONFIG_DIR))
        install -m 644 $(addprefix run/include/images/,$(LIBIMAGES_INCLUDES)) $(DESTDIR)$(INSTALL_INCLUDE_DIR)/images
@@ -108,13 +108,13 @@ install-libucw-images-api:
        install -m 644 run/lib/libucw-images-pic.a $(DESTDIR)$(INSTALL_LIB_DIR)
 .PHONY: install-libucw-images-api
 
-INSTALL_UTILS_TARGETS+=install-libucw-images-utils
+INSTALL_TARGETS+=install-libucw-images-utils
 install-libucw-images-utils:
        install -d -m 755 $(DESTDIR)$(INSTALL_BIN_DIR)
        install -m 755 $(LIBIMAGES_PROGS) $(DESTDIR)$(INSTALL_BIN_DIR)
 .PHONY: install-libucw-images-utils
 
-INSTALL_CONFIG_TARGETS+=install-libucw-images-config
+INSTALL_TARGETS+=install-libucw-images-config
 install-libucw-images-config:
        install -d -m 755 $(DESTDIR)$(INSTALL_CONFIG_DIR)
        install -m 644 $(addprefix run/$(CONFIG_DIR)/,$(LIBIMAGES_CONFIGS)) $(DESTDIR)$(INSTALL_CONFIG_DIR)

diff --git a/ucw/Makefile b/ucw/Makefile
index 56e464b51d1f062eacdd80d3a02d1b8086b9196c..e9294dffcee8c81875f712fca37ef36d93c33b63 100644 (file)
--- a/ucw/Makefile
+++ b/ucw/Makefile
@@ -185,13 +185,13 @@ endif
 
 CONFIGS+=libucw
 
-INSTALL_LIB_TARGETS+=install-libucw-lib
+INSTALL_TARGETS+=install-libucw-lib
 install-libucw-lib:
        install -d -m 755 $(DESTDIR)$(INSTALL_LIB_DIR)
        install -m 644 run/lib/libucw.so.$(UCW_ABI_MAJOR) $(DESTDIR)$(INSTALL_LIB_DIR)/libucw.so.$(UCW_ABI_VERSION)
 .PHONY: install-libucw-lib
 
-INSTALL_API_TARGETS+=install-libucw-api
+INSTALL_TARGETS+=install-libucw-api
 install-libucw-api:
        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_MAIN_INCLUDES) autoconf.h config.h) $(DESTDIR)$(INSTALL_INCLUDE_DIR)/ucw/
@@ -201,7 +201,7 @@ install-libucw-api:
        install -m 644 run/lib/libucw-pic.a $(DESTDIR)$(INSTALL_LIB_DIR)
 .PHONY: install-libucw-api
 
-INSTALL_CONFIG_TARGETS+=install-libucw-config
+INSTALL_TARGETS+=install-libucw-config
 install-libucw-config:
        install -d -m 755 $(DESTDIR)$(INSTALL_CONFIG_DIR)
        install -m 644 run/$(CONFIG_DIR)/libucw $(DESTDIR)$(INSTALL_CONFIG_DIR)

diff --git a/ucw/shell/Makefile b/ucw/shell/Makefile
index 0b27d08f0aca1e6906f6f1a554ba24e10eb9992e..62774c3cdeaf69a83e0b47d70aed03ffd7f0ca48 100644 (file)
--- a/ucw/shell/Makefile
+++ b/ucw/shell/Makefile
@@ -13,7 +13,7 @@ TESTS+=$(addprefix $(o)/ucw/shell/,config.test)
 
 $(o)/ucw/shell/config.test: $(o)/ucw/shell/ucw-config
 
-INSTALL_UTILS_TARGETS+=install-ucw-shell
+INSTALL_TARGETS+=install-ucw-shell
 install-ucw-shell:
        install -d -m 755 $(DESTDIR)$(INSTALL_BIN_DIR)
        install -m 755 $(UCW_SHELL_PROGS) $(DESTDIR)$(INSTALL_BIN_DIR)

diff --git a/ucw/utils/Makefile b/ucw/utils/Makefile
index 2a8f2b9928973bd0f0c1df028229ebeaec92e956..7cd77c026d6f09da0bd32d31115e8bbf34f38115 100644 (file)
--- a/ucw/utils/Makefile
+++ b/ucw/utils/Makefile
@@ -16,7 +16,7 @@ $(o)/ucw/utils/ucw-urltool: $(o)/ucw/utils/ucw-urltool.o $(LIBUCW)
 TESTS+=$(o)/ucw/utils/basecode.test
 $(o)/ucw/utils/basecode.test: $(o)/ucw/utils/ucw-basecode
 
-INSTALL_UTILS_TARGETS+=install-ucw-utils
+INSTALL_TARGETS+=install-ucw-utils
 install-ucw-utils:
        install -d -m 755 $(DESTDIR)$(INSTALL_BIN_DIR)
        install -m 755 $(UCW_UTILS) $(DESTDIR)$(INSTALL_BIN_DIR)

diff --git a/xml/Makefile b/xml/Makefile
index 0025ed3fe1f3f40f34dfd199cbadffe57e9930d0..74b3ad1c56966aa0edb3ab28cff8f96388c6c382 100644 (file)
--- a/xml/Makefile
+++ b/xml/Makefile
@@ -45,13 +45,13 @@ $(o)/xml/.include-stamp: $(addprefix $(s)/xml/,$(LIBXML_INCLUDES))
 $(o)/xml/.include-stamp: IDST=xml
 run/lib/pkgconfig/libucw-xml.pc: $(o)/xml/libucw-xml.pc
 
-INSTALL_LIB_TARGETS+=install-libucw-xml-lib
+INSTALL_TARGETS+=install-libucw-xml-lib
 install-libucw-xml-lib:
        install -d -m 755 $(DESTDIR)$(INSTALL_LIB_DIR)
        install -m 644 run/lib/libucw-xml.so.$(UCW_ABI_MAJOR) $(DESTDIR)$(INSTALL_LIB_DIR)/libucw-xml.so.$(UCW_ABI_VERSION)
 .PHONY: install-libucw-xml-lib
 
-INSTALL_API_TARGETS+=install-libucw-xml-api
+INSTALL_TARGETS+=install-libucw-xml-api
 install-libucw-xml-api:
        install -d -m 755 $(DESTDIR)$(INSTALL_INCLUDE_DIR)/xml $(DESTDIR)$(INSTALL_LIB_DIR) $(DESTDIR)$(INSTALL_PKGCONFIG_DIR)
        install -m 644 run/lib/pkgconfig/libucw-xml.pc $(DESTDIR)$(INSTALL_PKGCONFIG_DIR)