diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2026-03-10 13:24:07 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2026-03-10 13:24:07 +0100 |
| commit | cfd1f17f1a85d95ea12bca8dae42add7dad1ad11 (patch) | |
| tree | 8016486f8ee7157213f2d09ff2491bfa9c94638a /lib/Makefile.am | |
| parent | 14e4d584d0121031ec40e6c35869745f1747ff29 (diff) | |
| parent | 1403307d6e2fb4e7b5d97a35f40d1e95134561ab (diff) | |
Merge branch 'release/debian/1.4.2-1'HEADdebian/1.4.2-1master
Diffstat (limited to 'lib/Makefile.am')
| -rw-r--r-- | lib/Makefile.am | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index bbe61009..c3ff1564 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,5 +1,5 @@ ## Makefile for the lib subdirectory of GNU libunistring. -## Copyright (C) 2009-2024 Free Software Foundation, Inc. +## Copyright (C) 2009-2025 Free Software Foundation, Inc. ## ## This program is free software: you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -73,6 +73,9 @@ unistring/stdint.h : $(STDINT_H) stdint.mini.h rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ echo '#include <stddef.h>'; \ + echo '#if __cplusplus >= 201103'; \ + echo '#include <cstdint>'; \ + echo '#else'; \ echo '#if __GLIBC__ >= 2'; \ echo '#include <stdint.h>'; \ echo '#else'; \ @@ -103,6 +106,7 @@ unistring/stdint.h : $(STDINT_H) stdint.mini.h -e 's/@''HAVE_SYS_BITYPES_H''@/0/g' \ < $(srcdir)/stdint.mini.h; \ echo '#endif'; \ + echo '#endif'; \ } > $@-t mv $@-t $@ BUILT_SOURCES += unistring/stdint.h @@ -239,8 +243,10 @@ EXTRA_DIST += libunistring.sym declared.sh # Tell the mingw or Cygwin linker which symbols to export. if WOE32DLL libunistring_la_SOURCES += ../woe32dll/unistring-exports.c +if !PLATFORM_IS_MSVC libunistring_la_LDFLAGS += -Wl,--export-all-symbols endif +endif # Hide undesired symbols that are defined by libunistring_la_SOURCES or # libunistring_la_LIBADD from the global namespace, by prefixing them with @@ -265,9 +271,9 @@ config.h: $(BUILT_SOURCES) $(srcdir)/libunistring.sym case $$f in \ *.res.lo ) ;; \ *.c | *.$(OBJEXT) | *.lo ) \ - sf=`echo "$$f" | sed -e 's,\\.[^.]*$$,,'`.c; \ + sf=`echo "$$f" | sed -e 's,^libunistring_la-,,' -e 's,\\.[^.]*$$,,'`.c; \ test -f $$sf || sf=$(srcdir)/$$sf; \ - of=`echo "$$f" | sed -e 's,^.*/,,' -e 's,\\.[^.]*$$,,'`.$(OBJEXT); \ + of=`echo "$$f" | sed -e 's,^.*/,,' -e 's,^libunistring_la-,,' -e 's,\\.[^.]*$$,,'`.$(OBJEXT); \ echo "$(COMPILE) -c $$sf" 1>&6; \ $(COMPILE) -c $$sf || { rm -f config.h; exit 1; }; \ sh ./exported.sh $$of 1>&5; \ @@ -311,7 +317,7 @@ AM_CPPFLAGS += -DDEPENDS_ON_LIBICONV=1 # Libtool's library version information for libunistring. # See the libtool documentation, section "Library interface versions". LTV_CURRENT=7 -LTV_REVISION=0 +LTV_REVISION=1 LTV_AGE=2 # How to build libunistring.la. |