Skip to content

Commit f38356d

Browse files
bhaiblebhaible
committed
Simplify: Remove the ability to install a preloadable library.
1 parent 35064ed commit f38356d

File tree

10 files changed

+29
-282
lines changed

10 files changed

+29
-282
lines changed

‎.gitignore‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -233,9 +233,6 @@
233233
/libcharset/autoconf/aclocal.m4
234234
/libcharset/configure
235235
/libcharset/config.h.in
236-
# Built by preload/Makefile.devel.
237-
/preload/aclocal.m4
238-
/preload/configure
239236

240237
# Files generated by "make -f Makefile.devel" and even kept by "make maintainer-clean":
241238
# Built by Makefile.devel.
@@ -284,7 +281,6 @@
284281
/man/iconv_open_into.3.html
285282
# Built by libcharset/Makefile.devel.
286283
/libcharset/include/localcharset.h.build.in
287-
# Built by preload/Makefile.devel.
288284

289285
# ---------- "make maintainerclean" gets you here ----------
290286

@@ -333,12 +329,6 @@ autom4te.cache/
333329
# Erased by lib/Makefile.
334330
/lib/Makefile
335331
/lib/config.h
336-
# Erased by preload/Makefile.
337-
/preload/config.status
338-
/preload/config.log
339-
/preload/config.cache
340-
/preload/Makefile
341-
/preload/libtool
342332
# Erased by srclib/Makefile.
343333
/srclib/Makefile
344334
# Erased by src/Makefile.
@@ -371,8 +361,6 @@ autom4te.cache/
371361
/libcharset/lib/_libs/
372362
/lib/.libs/
373363
/lib/_libs/
374-
/preload/.libs/
375-
/preload/_libs/
376364
/src/.libs/
377365
/src/_libs/
378366
/tests/.libs/
@@ -405,16 +393,6 @@ autom4te.cache/
405393
/lib/core
406394
/lib/*.stackdump
407395
/lib/so_locations
408-
# Erased by preload/Makefile.
409-
/preload/*.o
410-
/preload/*.lo
411-
/preload/*.a
412-
/preload/*.la
413-
/preload/preloadable_libiconv*
414-
/preload/core
415-
/preload/*.stackdump
416-
/preload/so_locations
417-
/preload/objects
418396
# Erased by srclib/Makefile.
419397
/srclib/**/*.o
420398
/srclib/core

‎ChangeLog‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
2018-05-04 Bruno Haible <bruno@clisp.org>
2+
3+
Simplify: Remove the ability to install a preloadable library.
4+
* preload/*: Remove directory.
5+
* Makefile.devel: Don't recurse into 'preload'.
6+
* Makefile.in: Likewise.
7+
* configure.ac: Don't declare 'preload' as a subdirectory.
8+
* README, NEWS: Update.
9+
110
2018-05-04 Bruno Haible <bruno@clisp.org>
211

312
Simplify code. Drop support for Borland C++ on Windows.

‎Makefile.devel‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ all : srclib/Makefile.gnulib srclib/Makefile.in \
2828
man/iconv.1.html man/iconv.3.html man/iconv_close.3.html man/iconv_open.3.html man/iconvctl.3.html man/iconv_open_into.3.html \
2929
force
3030
cd libcharset && $(MAKE) -f Makefile.devel all
31-
cd preload && $(MAKE) -f Makefile.devel all
3231

3332

3433
# Before making a new release:
@@ -243,7 +242,6 @@ totally-clean : force
243242
rm -f lib/translit.h
244243
rm -f man/iconv.1.html man/iconv.3.html man/iconv_close.3.html man/iconv_open.3.html man/iconvctl.3.html man/iconv_open_into.3.html
245244
cd libcharset && $(MAKE) -f Makefile.devel totally-clean
246-
cd preload && $(MAKE) -f Makefile.devel totally-clean
247245

248246

249247
force :

‎Makefile.in‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ SHELL = /bin/sh
3131

3232
all : lib/localcharset.h force
3333
cd lib && $(MAKE) all
34-
cd preload && $(MAKE) all
3534
cd srclib && $(MAKE) all
3635
cd src && $(MAKE) all
3736
cd po && $(MAKE) all
@@ -51,7 +50,6 @@ install-lib : all force
5150
install : lib/localcharset.h force
5251
cd libcharset && $(MAKE) install prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
5352
cd lib && $(MAKE) install prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
54-
cd preload && $(MAKE) install prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
5553
cd srclib && $(MAKE) install prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
5654
cd src && $(MAKE) install prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
5755
if [ ! -d $(DESTDIR)$(includedir) ] ; then $(mkinstalldirs) $(DESTDIR)$(includedir) ; fi
@@ -62,7 +60,6 @@ install : lib/localcharset.h force
6260
install-strip : lib/localcharset.h force
6361
cd libcharset && $(MAKE) install-strip prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
6462
cd lib && $(MAKE) install-strip prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
65-
cd preload && $(MAKE) install-strip prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
6663
cd srclib && $(MAKE) install-strip prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
6764
cd src && $(MAKE) install-strip prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
6865
if [ ! -d $(DESTDIR)$(includedir) ] ; then $(mkinstalldirs) $(DESTDIR)$(includedir) ; fi
@@ -73,7 +70,6 @@ install-strip : lib/localcharset.h force
7370
installdirs : force
7471
cd libcharset && $(MAKE) installdirs prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
7572
cd lib && $(MAKE) installdirs prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
76-
cd preload && $(MAKE) installdirs prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
7773
cd srclib && $(MAKE) installdirs prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
7874
cd src && $(MAKE) installdirs prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
7975
if [ ! -d $(DESTDIR)$(includedir) ] ; then $(mkinstalldirs) $(DESTDIR)$(includedir) ; fi
@@ -83,7 +79,6 @@ installdirs : force
8379
uninstall : force
8480
cd libcharset && $(MAKE) uninstall prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
8581
cd lib && $(MAKE) uninstall prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
86-
cd preload && $(MAKE) uninstall prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
8782
cd srclib && $(MAKE) uninstall prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
8883
cd src && $(MAKE) uninstall prefix='$(prefix)' exec_prefix='$(exec_prefix)' libdir='$(libdir)'
8984
$(RM) $(DESTDIR)$(includedir)/iconv.h
@@ -93,7 +88,6 @@ uninstall : force
9388
check : all force
9489
cd libcharset && $(MAKE) check
9590
cd lib && $(MAKE) check
96-
cd preload && $(MAKE) check
9791
cd srclib && $(MAKE) check
9892
cd src && $(MAKE) check
9993
cd po && $(MAKE) check
@@ -104,7 +98,6 @@ mostlyclean : force
10498
cd libcharset && $(MAKE) mostlyclean
10599
$(RM) lib/charset.alias lib/libcharset.* lib/localcharset.h
106100
cd lib && $(MAKE) mostlyclean
107-
cd preload && $(MAKE) mostlyclean
108101
cd srclib && $(MAKE) mostlyclean
109102
cd src && $(MAKE) mostlyclean
110103
cd po && $(MAKE) mostlyclean
@@ -116,7 +109,6 @@ clean : force
116109
cd libcharset && $(MAKE) clean
117110
$(RM) lib/charset.alias lib/libcharset.* lib/localcharset.h
118111
cd lib && $(MAKE) clean
119-
cd preload && $(MAKE) clean
120112
cd srclib && $(MAKE) clean
121113
cd src && $(MAKE) clean
122114
cd po && $(MAKE) clean
@@ -128,7 +120,6 @@ distclean : force
128120
cd libcharset && if test -f Makefile; then $(MAKE) distclean; fi
129121
$(RM) lib/charset.alias lib/libcharset.* lib/localcharset.h
130122
cd lib && if test -f Makefile; then $(MAKE) distclean; fi
131-
cd preload && if test -f Makefile; then $(MAKE) distclean; fi
132123
cd srclib && if test -f Makefile; then $(MAKE) distclean; fi
133124
cd src && if test -f Makefile; then $(MAKE) distclean; fi
134125
cd po && if test -f Makefile; then $(MAKE) distclean; fi
@@ -143,7 +134,6 @@ maintainer-clean : force
143134
cd libcharset && if test -f Makefile; then $(MAKE) maintainer-clean; fi
144135
$(RM) lib/charset.alias lib/libcharset.* lib/localcharset.h
145136
cd lib && if test -f Makefile; then $(MAKE) maintainer-clean; fi
146-
cd preload && if test -f Makefile; then $(MAKE) maintainer-clean; fi
147137
cd srclib && if test -f Makefile; then $(MAKE) maintainer-clean; fi
148138
cd src && if test -f Makefile; then $(MAKE) maintainer-clean; fi
149139
cd po && if test -f Makefile; then $(MAKE) maintainer-clean; fi
@@ -243,7 +233,6 @@ distdir : $(DISTFILES)
243233
done
244234
test -d '$(distdir)'/libcharset || mkdir '$(distdir)'/libcharset; cd libcharset && $(MAKE) distdir distdir='$(distdir)'/libcharset
245235
test -d '$(distdir)'/lib || mkdir '$(distdir)'/lib; cd lib && $(MAKE) distdir distdir='$(distdir)'/lib
246-
test -d '$(distdir)'/preload || mkdir '$(distdir)'/preload; cd preload && $(MAKE) distdir distdir='$(distdir)'/preload
247236
test -d '$(distdir)'/srclib || mkdir '$(distdir)'/srclib; cd srclib && $(MAKE) distdir distdir='$(distdir)'/srclib
248237
test -d '$(distdir)'/src || mkdir '$(distdir)'/src; cd src && $(MAKE) distdir distdir='$(distdir)'/src
249238
test -d '$(distdir)'/tests || mkdir '$(distdir)'/tests; cd tests && $(MAKE) distdir distdir='$(distdir)'/tests

‎NEWS‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
New in 1.16:
2+
* The preloadable library has been removed.
3+
14
New in 1.15:
25
* The UTF-8 converter now rejects surrogates and out-of-range code points.
36
* Added ISO-2022-JP-MS converter.

‎README‎

Lines changed: 16 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -109,39 +109,22 @@ or (on systems supporting shared libraries, excluding AIX)
109109
Recall that before building a package for the second time, you need to erase
110110
the traces of the first build by running "make distclean".
111111

112-
This library can be built and installed in two variants:
113-
114-
- The library mode. This works on all systems, and uses a library
115-
'libiconv.so' and a header file '<iconv.h>'. (Both are installed
116-
through "make install".)
117-
118-
To use it, simply #include <iconv.h> and use the functions.
119-
120-
To use it in an autoconfiguring package:
121-
- If you don't use automake, append m4/iconv.m4 to your aclocal.m4
122-
file.
123-
- If you do use automake, add m4/iconv.m4 to your m4 macro repository.
124-
- Add to the link command line of libraries and executables that use
125-
the functions the placeholder @LIBICONV@ (or, if using libtool for
126-
the link, @LTLIBICONV@). If you use automake, the right place for
127-
these additions are the *_LDADD variables.
128-
Note that 'iconv.m4' is also part of GNU gnulib, available through
129-
the gnulib module 'iconv'.
130-
131-
- The libc plug/override mode. This works on GNU/Linux, Solaris and OSF/1
132-
systems only. It is a way to get good iconv support without having
133-
glibc-2.1.
134-
It installs a library 'preloadable_libiconv.so'. This library can be used
135-
with LD_PRELOAD, to override the iconv* functions present in the C library.
136-
137-
On GNU/Linux and Solaris:
138-
$ export LD_PRELOAD=[[PREFIX]]/lib/preloadable_libiconv.so
139-
140-
On OSF/1:
141-
$ export _RLD_LIST=[[PREFIX]]/lib/preloadable_libiconv.so:DEFAULT
142-
143-
A program's source need not be modified, the program need not even be
144-
recompiled. Just set the LD_PRELOAD environment variable, that's it!
112+
This library installs:
113+
- a library 'libiconv.so',
114+
- a header file '<iconv.h>'.
115+
116+
To use it, simply #include <iconv.h> and use the functions.
117+
118+
To use it in an autoconfiguring package:
119+
- If you don't use automake, append m4/iconv.m4 to your aclocal.m4
120+
file.
121+
- If you do use automake, add m4/iconv.m4 to your m4 macro repository.
122+
- Add to the link command line of libraries and executables that use
123+
the functions the placeholder @LIBICONV@ (or, if using libtool for
124+
the link, @LTLIBICONV@). If you use automake, the right place for
125+
these additions are the *_LDADD variables.
126+
Note that 'iconv.m4' is also part of GNU gnulib, available through
127+
the gnulib module 'iconv'.
145128

146129

147130
Copyright

‎configure.ac‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
dnl Copyright (C) 1999-2011, 2016 Free Software Foundation, Inc.
1+
dnl Copyright (C) 1999-2011, 2016, 2018 Free Software Foundation, Inc.
22
dnl This file is part of the GNU LIBICONV Library.
33
dnl
44
dnl The GNU LIBICONV Library is free software; you can redistribute it
@@ -198,7 +198,6 @@ AH_BOTTOM([
198198
])
199199

200200
AC_CONFIG_SUBDIRS([libcharset])
201-
AC_CONFIG_SUBDIRS([preload])
202201
AC_CONFIG_FILES([Makefile])
203202
AC_CONFIG_FILES([lib/Makefile])
204203
AC_CONFIG_FILES([srclib/Makefile])

‎preload/Makefile.devel‎

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

‎preload/Makefile.in‎

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

0 commit comments

Comments
 (0)