COLLECTION: merge in INI_CONFIG

and don't expose its API

Author: alexey-tikhonov

.packit.yaml

@@ -14,7 +14,6 @@ packages:
         - sed -i "s/@PACKAGE_VERSION@/0/g" contrib/ding-libs.spec
         - sed -i "s/@PRERELEASE_VERSION@/99/g" contrib/ding-libs.spec
         - sed -i "s/@DHASH_VERSION@/99.0.0/g" contrib/ding-libs.spec
-        - sed -i "s/@COLLECTION_VERSION@/99.0.0/g" contrib/ding-libs.spec
         - sed -i "s/@REF_ARRAY_VERSION@/99.0.0/g" contrib/ding-libs.spec
         - sed -i "s/@BASICOBJECTS_VERSION@/99.0.0/g" contrib/ding-libs.spec
         - sed -i "s/@INI_CONFIG_VERSION@/99.0.0/g" contrib/ding-libs.spec

Makefile.am

@@ -13,7 +13,6 @@ dist_noinst_DATA = \
     COPYING \
     COPYING.LESSER \
     dhash/libdhash.sym \
-    collection/libcollection.sym \
     refarray/libref_array.sym \
     basicobjects/libbasicobjects.sym \
     ini/libini_config.sym
@@ -140,31 +139,6 @@ dist_doc_DATA += dhash/README.dhash
 # collection
 ##############################################################################
 
-lib_LTLIBRARIES += libcollection.la
-dist_pkgconfig_DATA += collection/collection.pc
-dist_include_HEADERS += \
-    collection/collection.h \
-    collection/collection_tools.h \
-    collection/collection_queue.h \
-    collection/collection_stack.h
-
-libcollection_la_SOURCES = \
-    collection/collection.c \
-    collection/collection_tools.c \
-    collection/collection_cnv.c \
-    collection/collection_queue.c \
-    collection/collection_stack.c \
-    collection/collection_cmp.c \
-    collection/collection_iter.c \
-    collection/collection_priv.h \
-    trace/trace.h
-libcollection_la_DEPENDENCIES = collection/libcollection.sym
-libcollection_la_LDFLAGS = \
-    -version-info 5:1:1
-if HAVE_LD_VERSION_SCRIPT
-libcollection_la_LDFLAGS += -Wl,--version-script=$(top_srcdir)/collection/libcollection.sym
-endif
-
 check_PROGRAMS += \
     collection_ut \
     collection_stack_ut \
@@ -175,11 +149,11 @@ TESTS += \
     collection_queue_ut
 
 collection_ut_SOURCES = collection/collection_ut.c
-collection_ut_LDADD = libcollection.la
+collection_ut_LDADD = libini_config_internal.la
 collection_stack_ut_SOURCES = collection/collection_stack_ut.c
-collection_stack_ut_LDADD = libcollection.la
+collection_stack_ut_LDADD = libini_config_internal.la
 collection_queue_ut_SOURCES = collection/collection_queue_ut.c
-collection_queue_ut_LDADD = libcollection.la
+collection_queue_ut_LDADD = libini_config_internal.la
 
 collection-docs:
 if HAVE_DOXYGEN
@@ -260,6 +234,18 @@ dist_include_HEADERS += ini/ini_configobj.h \
 libini_config_la_SOURCES = \
     path_utils/path_utils.c \
     path_utils/path_utils.h \
+    collection/collection.c \
+    collection/collection_tools.c \
+    collection/collection_cnv.c \
+    collection/collection_queue.c \
+    collection/collection_stack.c \
+    collection/collection_cmp.c \
+    collection/collection_iter.c \
+    collection/collection_priv.h \
+    collection/collection.h \
+    collection/collection_tools.h \
+    collection/collection_queue.h \
+    collection/collection_stack.h \
     ini/ini_config.c \
     ini/ini_config.h \
     ini/ini_get_value.c \
@@ -288,7 +274,6 @@ libini_config_la_SOURCES = \
     trace/trace.h
 EXTRA_libini_config_la_DEPENDENCIES = ini/libini_config.sym
 libini_config_la_LIBADD = \
-    libcollection.la \
     libref_array.la \
     libbasicobjects.la \
     $(LTLIBICONV) \
@@ -353,9 +338,7 @@ TESTS += \
 
 
 ini_config_ut_SOURCES = ini/ini_config_ut.c
-ini_config_ut_LDADD = \
-    libini_config_internal.la \
-    libcollection.la
+ini_config_ut_LDADD = libini_config_internal.la
 
 ini_comment_ut_SOURCES = ini/ini_comment_ut.c
 ini_comment_ut_LDADD = libini_config_internal.la
@@ -364,14 +347,14 @@ ini_valueobj_ut_SOURCES = ini/ini_valueobj_ut.c
 ini_valueobj_ut_LDADD = libini_config_internal.la libbasicobjects.la
 
 ini_parse_ut_SOURCES = ini/ini_parse_ut.c
-ini_parse_ut_LDADD = libini_config_internal.la libcollection.la libbasicobjects.la
+ini_parse_ut_LDADD = libini_config_internal.la libbasicobjects.la
 
 ini_augment_ut_SOURCES = ini/ini_augment_ut.c
-ini_augment_ut_LDADD = libini_config_internal.la libcollection.la \
+ini_augment_ut_LDADD = libini_config_internal.la \
                        libbasicobjects.la libref_array.la
 
 ini_configmod_ut_SOURCES = ini/ini_configmod_ut.c
-ini_configmod_ut_LDADD = libini_config_internal.la libcollection.la \
+ini_configmod_ut_LDADD = libini_config_internal.la \
                          libbasicobjects.la libref_array.la
 
 ini_augment_ut_check_SOURCES = ini/ini_augment_ut_check.c
@@ -381,7 +364,7 @@ ini_augment_ut_check_LDADD = libini_config_internal.la $(CHECK_LIBS) \
 
 ini_configmod_ut_check_SOURCES = ini/ini_configmod_ut_check.c
 ini_configmod_ut_check_CFLAGS = $(AM_CFLAGS) $(CHECK_CFLAGS)
-ini_configmod_ut_check_LDADD = libini_config_internal.la libcollection.la \
+ini_configmod_ut_check_LDADD = libini_config_internal.la \
                                libbasicobjects.la \
                                libref_array.la \
                                $(CHECK_LIBS)
@@ -398,7 +381,7 @@ ini_validators_ut_check_LDADD = libini_config_internal.la $(CHECK_LIBS)
 
 
 ini_save_ut_SOURCES = ini/ini_save_ut.c
-ini_save_ut_LDADD = libini_config_internal.la libcollection.la \
+ini_save_ut_LDADD = libini_config_internal.la \
                          libbasicobjects.la libref_array.la
 
 ini_config-docs:

collection/collection.pc.in

@@ -31,7 +31,6 @@ AC_SUBST([PRERELEASE_VERSION],
          PRERELEASE_VERSION_NUMBER)
 
 AC_SUBST([DHASH_VERSION], DHASH_VERSION_NUMBER)
-AC_SUBST([COLLECTION_VERSION], COLLECTION_VERSION_NUMBER)
 AC_SUBST([REF_ARRAY_VERSION], REF_ARRAY_VERSION_NUMBER)
 AC_SUBST([BASICOBJECTS_VERSION], BASICOBJECTS_VERSION_NUMBER)
 AC_SUBST([INI_CONFIG_VERSION], INI_CONFIG_VERSION_NUMBER)
@@ -82,7 +81,7 @@ fi
 AC_CONFIG_FILES([Makefile contrib/ding-libs.spec
                  path_utils/path_utils.cfg.doxy
                  dhash/dhash.pc
-                 collection/collection.cfg.doxy collection/collection.pc
+                 collection/collection.cfg.doxy
                  refarray/ref_array.cfg.doxy refarray/ref_array.pc
                  basicobjects/basicobjects.cfg.doxy
                  basicobjects/basicobjects.pc