[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: dynarray, scratch_buffer: Avoid conflict with preprocessor macros ow
From: |
Bruno Haible |
Subject: |
Re: dynarray, scratch_buffer: Avoid conflict with preprocessor macros owned by the system |
Date: |
Tue, 08 Jun 2021 02:41:23 +0200 |
User-agent: |
KMail/5.1.3 (Linux/4.4.0-210-generic; KDE/5.18.0; x86_64; ; ) |
Oops, I forgot to 'mkdir -p malloc' in the build directory. In some
environments, the Makefile's 'dirstamp' handling does it automatically;
in others, it doesn't.
2021-06-07 Bruno Haible <bruno@clisp.org>
dynarray, scratch_buffer: Fix VPATH builds (regression from yesterday).
* modules/dynarray (configure.ac): Invoke AC_PROG_MKDIR_P.
(Makefile.am): Create malloc/ directory before creating
malloc/dynarray.gl.h and malloc/dynarray-skeleton.gl.h.
* modules/scratch_buffer (configure.ac): Invoke AC_PROG_MKDIR_P.
(Makefile.am): Create malloc/ directory before creating
malloc/scratch_buffer.gl.h.
diff --git a/modules/dynarray b/modules/dynarray
index 7fd444f..fa608de 100644
--- a/modules/dynarray
+++ b/modules/dynarray
@@ -20,11 +20,13 @@ stddef
intprops
configure.ac:
+AC_PROG_MKDIR_P
Makefile.am:
BUILT_SOURCES += malloc/dynarray.gl.h malloc/dynarray-skeleton.gl.h
malloc/dynarray.gl.h: malloc/dynarray.h
+ $(AM_V_at)$(MKDIR_P) malloc
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e '/libc_hidden_proto/d' < $(srcdir)/malloc/dynarray.h; \
@@ -33,6 +35,7 @@ malloc/dynarray.gl.h: malloc/dynarray.h
MOSTLYCLEANFILES += malloc/dynarray.gl.h malloc/dynarray.gl.h-t
malloc/dynarray-skeleton.gl.h: malloc/dynarray-skeleton.c
+ $(AM_V_at)$(MKDIR_P) malloc
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|<malloc/dynarray\.h>|<malloc/dynarray.gl.h>|g' \
diff --git a/modules/scratch_buffer b/modules/scratch_buffer
index ede77a9..184f0b6 100644
--- a/modules/scratch_buffer
+++ b/modules/scratch_buffer
@@ -20,11 +20,13 @@ realloc-posix
free-posix
configure.ac:
+AC_PROG_MKDIR_P
Makefile.am:
BUILT_SOURCES += malloc/scratch_buffer.gl.h
malloc/scratch_buffer.gl.h: malloc/scratch_buffer.h
+ $(AM_V_at)$(MKDIR_P) malloc
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|__always_inline|inline _GL_ATTRIBUTE_ALWAYS_INLINE|g' \