Skip to content

Commit b03f680

Browse files
alexey-tikhonovalexey-tikhonov
committed
BASICOBJECTS: merge in INI_CONFIG
and don't expose its API
1 parent fe5f4a8 commit b03f680

9 files changed

Lines changed: 11 additions & 107 deletions

File tree

‎.packit.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ packages:
1515
- sed -i "s/@PRERELEASE_VERSION@/99/g" contrib/ding-libs.spec
1616
- sed -i "s/@DHASH_VERSION@/99.0.0/g" contrib/ding-libs.spec
1717
- sed -i "s/@REF_ARRAY_VERSION@/99.0.0/g" contrib/ding-libs.spec
18-
- sed -i "s/@BASICOBJECTS_VERSION@/99.0.0/g" contrib/ding-libs.spec
1918
- sed -i "s/@INI_CONFIG_VERSION@/99.0.0/g" contrib/ding-libs.spec
2019
get-current-version:
2120
- bash -c 'grep "\\[VERSION_NUMBER\\]" version.m4 | sed -E "s/.+\\[([0-9].+)\\].+/\\1/"'

‎Makefile.am‎

Lines changed: 8 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ dist_noinst_DATA = \
1414
COPYING.LESSER \
1515
dhash/libdhash.sym \
1616
refarray/libref_array.sym \
17-
basicobjects/libbasicobjects.sym \
1817
ini/libini_config.sym
1918

2019
##############################################################################
@@ -196,24 +195,10 @@ endif
196195
# basicobjects
197196
##############################################################################
198197

199-
lib_LTLIBRARIES += libbasicobjects.la
200-
dist_pkgconfig_DATA += basicobjects/basicobjects.pc
201-
dist_include_HEADERS += basicobjects/simplebuffer.h
202-
203-
libbasicobjects_la_SOURCES = \
204-
basicobjects/simplebuffer.c \
205-
trace/trace.h
206-
libbasicobjects_la_DEPENDENCIES = basicobjects/libbasicobjects.sym
207-
libbasicobjects_la_LDFLAGS = \
208-
-version-info 1:0:1
209-
if HAVE_LD_VERSION_SCRIPT
210-
libbasicobjects_la_LDFLAGS += -Wl,--version-script=$(top_srcdir)/basicobjects/libbasicobjects.sym
211-
endif
212-
213198
check_PROGRAMS += simplebuffer_ut
214199
TESTS += simplebuffer_ut
215200
simplebuffer_ut_SOURCES = basicobjects/simplebuffer_ut.c
216-
simplebuffer_ut_LDADD = libbasicobjects.la
201+
simplebuffer_ut_LDADD = libini_config_internal.la
217202

218203
basicobjects-docs:
219204
if HAVE_DOXYGEN
@@ -234,6 +219,8 @@ dist_include_HEADERS += ini/ini_configobj.h \
234219
libini_config_la_SOURCES = \
235220
path_utils/path_utils.c \
236221
path_utils/path_utils.h \
222+
basicobjects/simplebuffer.c \
223+
basicobjects/simplebuffer.h \
237224
collection/collection.c \
238225
collection/collection_tools.c \
239226
collection/collection_cnv.c \
@@ -275,7 +262,6 @@ libini_config_la_SOURCES = \
275262
EXTRA_libini_config_la_DEPENDENCIES = ini/libini_config.sym
276263
libini_config_la_LIBADD = \
277264
libref_array.la \
278-
libbasicobjects.la \
279265
$(LTLIBICONV) \
280266
$(LTLIBINTL)
281267
libini_config_la_LDFLAGS = \
@@ -344,18 +330,18 @@ ini_comment_ut_SOURCES = ini/ini_comment_ut.c
344330
ini_comment_ut_LDADD = libini_config_internal.la
345331

346332
ini_valueobj_ut_SOURCES = ini/ini_valueobj_ut.c
347-
ini_valueobj_ut_LDADD = libini_config_internal.la libbasicobjects.la
333+
ini_valueobj_ut_LDADD = libini_config_internal.la
348334

349335
ini_parse_ut_SOURCES = ini/ini_parse_ut.c
350-
ini_parse_ut_LDADD = libini_config_internal.la libbasicobjects.la
336+
ini_parse_ut_LDADD = libini_config_internal.la
351337

352338
ini_augment_ut_SOURCES = ini/ini_augment_ut.c
353339
ini_augment_ut_LDADD = libini_config_internal.la \
354-
libbasicobjects.la libref_array.la
340+
libref_array.la
355341

356342
ini_configmod_ut_SOURCES = ini/ini_configmod_ut.c
357343
ini_configmod_ut_LDADD = libini_config_internal.la \
358-
libbasicobjects.la libref_array.la
344+
libref_array.la
359345

360346
ini_augment_ut_check_SOURCES = ini/ini_augment_ut_check.c
361347
ini_augment_ut_check_CFLAGS = $(AM_CFLAGS) $(CHECK_CFLAGS)
@@ -365,7 +351,6 @@ ini_augment_ut_check_LDADD = libini_config_internal.la $(CHECK_LIBS) \
365351
ini_configmod_ut_check_SOURCES = ini/ini_configmod_ut_check.c
366352
ini_configmod_ut_check_CFLAGS = $(AM_CFLAGS) $(CHECK_CFLAGS)
367353
ini_configmod_ut_check_LDADD = libini_config_internal.la \
368-
libbasicobjects.la \
369354
libref_array.la \
370355
$(CHECK_LIBS)
371356

@@ -382,7 +367,7 @@ ini_validators_ut_check_LDADD = libini_config_internal.la $(CHECK_LIBS)
382367

383368
ini_save_ut_SOURCES = ini/ini_save_ut.c
384369
ini_save_ut_LDADD = libini_config_internal.la \
385-
libbasicobjects.la libref_array.la
370+
libref_array.la
386371

387372
ini_config-docs:
388373
if HAVE_DOXYGEN

‎basicobjects/basicobjects.pc.in‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎basicobjects/libbasicobjects.sym‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎configure.ac‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ AC_SUBST([PRERELEASE_VERSION],
3232

3333
AC_SUBST([DHASH_VERSION], DHASH_VERSION_NUMBER)
3434
AC_SUBST([REF_ARRAY_VERSION], REF_ARRAY_VERSION_NUMBER)
35-
AC_SUBST([BASICOBJECTS_VERSION], BASICOBJECTS_VERSION_NUMBER)
3635
AC_SUBST([INI_CONFIG_VERSION], INI_CONFIG_VERSION_NUMBER)
3736

3837
AM_CONDITIONAL([GIT_CHECKOUT], [git log -1 >/dev/null 2>&1])
@@ -84,6 +83,5 @@ AC_CONFIG_FILES([Makefile contrib/ding-libs.spec
8483
collection/collection.cfg.doxy
8584
refarray/ref_array.cfg.doxy refarray/ref_array.pc
8685
basicobjects/basicobjects.cfg.doxy
87-
basicobjects/basicobjects.pc
8886
ini/ini_config.cfg.doxy ini/ini_config.pc])
8987
AC_OUTPUT

‎contrib/ding-libs.spec.in‎

Lines changed: 2 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
1010

1111
%global dhash_version @DHASH_VERSION@
1212
%global ref_array_version @REF_ARRAY_VERSION@
13-
%global basicobjects_version @BASICOBJECTS_VERSION@
1413
%global ini_config_version @INI_CONFIG_VERSION@
1514

1615
### Patches ###
@@ -20,6 +19,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
2019
# sub-packages
2120
Obsoletes: libpath_utils <= 0.2.1
2221
Obsoletes: libcollection <= 0.7.0
22+
Obsoletes: libbasicobjects <= 0.1.1
2323
Requires: libdhash = %{dhash_version}-%{release}
2424
Requires: libref_array = %{ref_array_version}-%{release}
2525
Requires: libini_config = %{ini_config_version}-%{release}
@@ -48,9 +48,9 @@ License: LGPLv3+
4848
# sub-packages
4949
Obsoletes: libpath_utils-devel <= 0.2.1
5050
Obsoletes: libcollection-devel <= 0.7.0
51+
Obsoletes: libbasicobjects-devel <= 0.1.1
5152
Requires: libdhash-devel = %{dhash_version}-%{release}
5253
Requires: libref_array-devel = %{ref_array_version}-%{release}
53-
Requires: libbasicobjects-devel = %{basicobjects_version}-%{release}
5454
Requires: libini_config-devel = %{ini_config_version}-%{release}
5555

5656
%description devel
@@ -140,45 +140,6 @@ A dynamically-growing, reference-counted array
140140
%doc refarray/README.ref_array
141141
%doc refarray/doc/html/
142142

143-
##############################################################################
144-
# basicobjects
145-
##############################################################################
146-
147-
%package -n libbasicobjects
148-
Summary: Basic object types for C
149-
Group: Development/Libraries
150-
License: GPLv3+
151-
Version: %{basicobjects_version}
152-
153-
%description -n libbasicobjects
154-
Basic object types
155-
156-
%package -n libbasicobjects-devel
157-
Summary: Development files for libbasicobjects
158-
Group: Development/Libraries
159-
License: GPLv3+
160-
Version: %{basicobjects_version}
161-
Requires: libbasicobjects = %{basicobjects_version}-%{release}
162-
163-
%description -n libbasicobjects-devel
164-
Basic object types
165-
166-
%post -n libbasicobjects -p /sbin/ldconfig
167-
%postun -n libbasicobjects -p /sbin/ldconfig
168-
169-
%files -n libbasicobjects
170-
%defattr(-,root,root,-)
171-
%doc COPYING
172-
%doc COPYING.LESSER
173-
%{_libdir}/libbasicobjects.so.0
174-
%{_libdir}/libbasicobjects.so.0.1.0
175-
176-
%files -n libbasicobjects-devel
177-
%defattr(-,root,root,-)
178-
%{_includedir}/simplebuffer.h
179-
%{_libdir}/libbasicobjects.so
180-
%{_libdir}/pkgconfig/basicobjects.pc
181-
182143
##############################################################################
183144
# ini_config
184145
##############################################################################
@@ -188,7 +149,6 @@ Summary: INI file parser for C
188149
Group: Development/Libraries
189150
License: LGPLv3+
190151
Requires: libref_array = %{ref_array_version}-%{release}
191-
Requires: libbasicobjects = %{basicobjects_version}-%{release}
192152
Version: %{ini_config_version}
193153

194154
%description -n libini_config
@@ -200,7 +160,6 @@ Group: Development/Libraries
200160
License: LGPLv3+
201161
Requires: libini_config = %{ini_config_version}-%{release}
202162
Requires: libref_array-devel = %{ref_array_version}-%{release}
203-
Requires: libbasicobjects-devel = %{basicobjects_version}-%{release}
204163
Version: %{ini_config_version}
205164

206165
%description -n libini_config-devel

‎ini/ini_config.pc.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ includedir=@includedir@
66
Name: ini_config
77
Description: Library to process config files in INI format
88
Version: @INI_CONFIG_VERSION@
9-
Requires: basicobjects ref_array
9+
Requires: ref_array
1010
Libs: -L${libdir} -lini_config
1111
Cflags: -I${includedir}
1212
URL: https://github.com/SSSD/ding-libs

‎ini/m4/libbasicobjects.m4‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎version.m4‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,4 @@ m4_define([PRERELEASE_VERSION_NUMBER], [])
1212

1313
m4_define([DHASH_VERSION_NUMBER], [0.5.0])
1414
m4_define([REF_ARRAY_VERSION_NUMBER], [0.1.5])
15-
m4_define([BASICOBJECTS_VERSION_NUMBER], [0.1.1])
1615
m4_define([INI_CONFIG_VERSION_NUMBER], [2.0.0])

0 commit comments

Comments
 (0)