diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2022-08-17 18:50:06 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2022-08-17 18:51:34 -0700 |
commit | b6b191108000104519f9f6cee70b0ef9bba9dbc6 (patch) | |
tree | 5d154bb417b4bc0351ddb65a3f223d4f881b3e1f /lib/gnulib.mk.in | |
parent | 3e042c80ce708b2d27da8ff62f19a5706f6d7fc6 (diff) | |
download | emacs-b6b191108000104519f9f6cee70b0ef9bba9dbc6.tar.gz |
Update from Gnulib by running admin/merge-gnulib
Diffstat (limited to 'lib/gnulib.mk.in')
-rw-r--r-- | lib/gnulib.mk.in | 31 |
1 files changed, 30 insertions, 1 deletions
diff --git a/lib/gnulib.mk.in b/lib/gnulib.mk.in index 2ffe89d4239..5bb78740d6a 100644 --- a/lib/gnulib.mk.in +++ b/lib/gnulib.mk.in @@ -318,6 +318,7 @@ GL_GENERATE_IEEE754_H_CONDITION = @GL_GENERATE_IEEE754_H_CONDITION@ GL_GENERATE_LIMITS_H_CONDITION = @GL_GENERATE_LIMITS_H_CONDITION@ GL_GENERATE_MINI_GMP_H_CONDITION = @GL_GENERATE_MINI_GMP_H_CONDITION@ GL_GENERATE_STDALIGN_H_CONDITION = @GL_GENERATE_STDALIGN_H_CONDITION@ +GL_GENERATE_STDCKDINT_H_CONDITION = @GL_GENERATE_STDCKDINT_H_CONDITION@ GL_GENERATE_STDDEF_H_CONDITION = @GL_GENERATE_STDDEF_H_CONDITION@ GL_GENERATE_STDINT_H_CONDITION = @GL_GENERATE_STDINT_H_CONDITION@ GL_GNULIB_ACCESS = @GL_GNULIB_ACCESS@ @@ -1198,10 +1199,12 @@ SETTINGS_CFLAGS = @SETTINGS_CFLAGS@ SETTINGS_LIBS = @SETTINGS_LIBS@ SHELL = @SHELL@ SIG_ATOMIC_T_SUFFIX = @SIG_ATOMIC_T_SUFFIX@ +SIZEOF_LONG = @SIZEOF_LONG@ SIZE_T_SUFFIX = @SIZE_T_SUFFIX@ SMALL_JA_DIC = @SMALL_JA_DIC@ SQLITE3_LIBS = @SQLITE3_LIBS@ STDALIGN_H = @STDALIGN_H@ +STDCKDINT_H = @STDCKDINT_H@ STDDEF_H = @STDDEF_H@ STDINT_H = @STDINT_H@ SUBDIR_MAKEFILES_IN = @SUBDIR_MAKEFILES_IN@ @@ -1318,6 +1321,7 @@ gl_GNULIB_ENABLED_lchmod_CONDITION = @gl_GNULIB_ENABLED_lchmod_CONDITION@ gl_GNULIB_ENABLED_open_CONDITION = @gl_GNULIB_ENABLED_open_CONDITION@ gl_GNULIB_ENABLED_rawmemchr_CONDITION = @gl_GNULIB_ENABLED_rawmemchr_CONDITION@ gl_GNULIB_ENABLED_scratch_buffer_CONDITION = @gl_GNULIB_ENABLED_scratch_buffer_CONDITION@ +gl_GNULIB_ENABLED_stdckdint_CONDITION = @gl_GNULIB_ENABLED_stdckdint_CONDITION@ gl_GNULIB_ENABLED_strtoll_CONDITION = @gl_GNULIB_ENABLED_strtoll_CONDITION@ gl_GNULIB_ENABLED_utimens_CONDITION = @gl_GNULIB_ENABLED_utimens_CONDITION@ gl_LIBOBJDEPS = @gl_LIBOBJDEPS@ @@ -2267,7 +2271,7 @@ endif ifeq (,$(OMIT_GNULIB_MODULE_intprops)) -EXTRA_DIST += intprops.h +EXTRA_DIST += intprops-internal.h intprops.h endif ## end gnulib module intprops @@ -2872,6 +2876,31 @@ EXTRA_DIST += stdalign.in.h endif ## end gnulib module stdalign +## begin gnulib module stdckdint +ifeq (,$(OMIT_GNULIB_MODULE_stdckdint)) + +ifneq (,$(gl_GNULIB_ENABLED_stdckdint_CONDITION)) +BUILT_SOURCES += $(STDCKDINT_H) + +# We need the following in order to create <stdckdint.h> when the system +# doesn't have one that works with the given compiler. +ifneq (,$(GL_GENERATE_STDCKDINT_H_CONDITION)) +stdckdint.h: stdckdint.in.h $(top_builddir)/config.status + $(gl_V_at)$(SED_HEADER_STDOUT) \ + $(srcdir)/stdckdint.in.h > $@-t + $(AM_V_at)mv $@-t $@ +else +stdckdint.h: $(top_builddir)/config.status + rm -f $@ +endif +MOSTLYCLEANFILES += stdckdint.h stdckdint.h-t + +endif +EXTRA_DIST += intprops-internal.h stdckdint.in.h + +endif +## end gnulib module stdckdint + ## begin gnulib module stddef ifeq (,$(OMIT_GNULIB_MODULE_stddef)) |