[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Mutilated stdlib.h
|
From: |
Bruno Haible |
|
Subject: |
Re: Mutilated stdlib.h |
|
Date: |
Mon, 4 Apr 2011 00:30:17 +0200 |
|
User-agent: |
KMail/1.9.9 |
Hi Ralf,
> > if GNULIB_GENERATED_BYTESWAP_H
> > byteswap.h: byteswap.in.h
> > ...
> > else
> > byteswap.h:
> > rm -f $@
> > endif
>
> That looks interesting. I would want to test it and play around with it
> before recommending it outright, though.
You find a complete test case in the last part of [1].
> Also, since it will be a hassle to change all the code, and change it
> again when you decide to use stamp files, I'd try to get that working
> before embarking upon any sweeping changes. But your preferences may
> be different here.
I hope that we never need to use stamp files. Therefore my preference is
to get as many use-cases as possible working without stamp files.
Here's a proposed patch that uses the idiom presented in [1].
[1] http://lists.gnu.org/archive/html/bug-gnulib/2011-04/msg00044.html
2011-04-03 Bruno Haible <address@hidden>
Remove leftover generated .h files after config.status changed.
* m4/alloca.m4 (gl_FUNC_ALLOCA): New automake conditional
GL_GENERATE_ALLOCA_H.
* modules/alloca-opt (Makefile.am): Remove alloca.h if
GL_GENERATE_ALLOCA_H evaluates to false.
* m4/argz.m4 (gl_FUNC_ARGZ): New automake conditional
GL_GENERATE_ARGZ_H.
* modules/argz (Makefile.am): Remove argz.h if GL_GENERATE_ARGZ_H
evaluates to false.
* m4/byteswap.m4 (gl_BYTESWAP): New automake conditional
GL_GENERATE_BYTESWAP_H.
* modules/byteswap (Makefile.am): Remove byteswap.h if
GL_GENERATE_BYTESWAP_H evaluates to false.
* m4/errno_h.m4 (gl_HEADER_ERRNO_H): New automake conditional
GL_GENERATE_ERRNO_H.
* modules/errno (Makefile.am): Remove errno.h if GL_GENERATE_ERRNO_H
evaluates to false.
* m4/float_h.m4 (gl_FLOAT_H): New automake conditional
GL_GENERATE_FLOAT_H.
* modules/float (Makefile.am): Remove float.h if GL_GENERATE_FLOAT_H
evaluates to false.
* m4/fnmatch.m4 (gl_FUNC_FNMATCH_POSIX): New automake conditional
GL_GENERATE_FNMATCH_H.
* modules/fnmatch (Makefile.am): Remove fnmatch.h if
GL_GENERATE_FNMATCH_H evaluates to false.
* m4/glob.m4 (gl_GLOB_SUBSTITUTE, gl_GLOB): New automake conditional
GL_GENERATE_GLOB_H.
* modules/glob (Makefile.am): Remove glob.h if GL_GENERATE_GLOB_H
evaluates to false.
* m4/iconv_h.m4 (gl_REPLACE_ICONV_H, gl_ICONV_H_DEFAULTS): New
automake conditional GL_GENERATE_ICONV_H.
* modules/iconv-h (Makefile.am): Remove iconv.h if GL_GENERATE_ICONV_H
evaluates to false.
* m4/netinet_in_h.m4 (gl_HEADER_NETINET_IN): New automake conditional
GL_GENERATE_NETINET_IN_H.
* modules/netinet_in (Makefile.am): Remove netinet/in.h if
GL_GENERATE_NETINET_IN_H evaluates to false.
* m4/pthread.m4 (gl_PTHREAD_CHECK): Set PTHREAD_H here. New automake
conditional GL_GENERATE_PTHREAD_H.
(gl_PTHREAD_DEFAULTS): Don't set PTHREAD_H here.
* modules/pthread (Makefile.am): Remove pthread.h if
GL_GENERATE_PTHREAD_H evaluates to false.
* m4/sched_h.m4 (gl_SCHED_H): New automake conditional
GL_GENERATE_SCHED_H.
* modules/sched (Makefile.am): Remove sched.h if GL_GENERATE_SCHED_H
evaluates to false.
* m4/selinux-context-h.m4 (gl_HEADERS_SELINUX_CONTEXT_H): New automake
conditional GL_GENERATE_SELINUX_CONTEXT_H.
* modules/selinux-h (Makefile.am): Remove selinux/context.h if
GL_GENERATE_SELINUX_CONTEXT_H evaluates to false.
* m4/stdarg.m4 (gl_STDARG_H): New automake conditional
GL_GENERATE_STDARG_H.
* modules/stdarg (Makefile.am): Remove stdarg.h if
GL_GENERATE_STDARG_H evaluates to false.
* m4/stdbool.m4 (AM_STDBOOL_H): New automake conditional
GL_GENERATE_STDBOOL_H.
* modules/stdbool (Makefile.am): Remove stdbool.h if
GL_GENERATE_STDBOOL_H evaluates to false.
* m4/stddef_h.m4 (gl_STDDEF_H): Set STDDEF_H here. New automake
conditional GL_GENERATE_STDDEF_H.
(gl_STDDEF_H_DEFAULTS): Don't set STDDEF_H here.
* modules/stddef (Makefile.am): Remove stddef.h if
GL_GENERATE_STDDEF_H evaluates to false.
* m4/stdint.m4 (gl_STDINT_H): New automake conditional
GL_GENERATE_STDINT_H.
* modules/stdint (Makefile.am): Remove stdint.h if
GL_GENERATE_STDINT_H evaluates to false.
* m4/sysexits.m4 (gl_SYSEXITS): New automake conditional
GL_GENERATE_SYSEXITS_H.
* modules/sysexits (Makefile.am): Remove sysexits.h if
GL_GENERATE_SYSEXITS_H evaluates to false.
--- m4/alloca.m4.orig Mon Apr 4 00:04:01 2011
+++ m4/alloca.m4 Sun Apr 3 23:46:30 2011
@@ -1,4 +1,4 @@
-# alloca.m4 serial 10
+# alloca.m4 serial 11
dnl Copyright (C) 2002-2004, 2006-2007, 2009-2011 Free Software Foundation,
dnl Inc.
dnl This file is free software; the Free Software Foundation
@@ -36,6 +36,7 @@
ALLOCA_H=alloca.h
fi
AC_SUBST([ALLOCA_H])
+ AM_CONDITIONAL([GL_GENERATE_ALLOCA_H], [test -n "$ALLOCA_H"])
])
# Prerequisites of lib/alloca.c.
--- m4/argz.m4.orig Mon Apr 4 00:04:01 2011
+++ m4/argz.m4 Sun Apr 3 23:46:37 2011
@@ -7,7 +7,7 @@
# unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved.
-# serial 8 argz.m4
+# serial 9 argz.m4
AC_DEFUN([gl_FUNC_ARGZ],
[gl_PREREQ_ARGZ
@@ -74,6 +74,7 @@
AC_LIBOBJ([argz])])])
AC_SUBST([ARGZ_H])
+AM_CONDITIONAL([GL_GENERATE_ARGZ_H], [test -n "$ARGZ_H"])
])
# Prerequisites of lib/argz.c.
--- m4/byteswap.m4.orig Mon Apr 4 00:04:01 2011
+++ m4/byteswap.m4 Sun Apr 3 23:47:15 2011
@@ -1,4 +1,4 @@
-# byteswap.m4 serial 3
+# byteswap.m4 serial 4
dnl Copyright (C) 2005, 2007, 2009-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -15,4 +15,5 @@
BYTESWAP_H='byteswap.h'
])
AC_SUBST([BYTESWAP_H])
+ AM_CONDITIONAL([GL_GENERATE_BYTESWAP_H], [test -n "$BYTESWAP_H"])
])
--- m4/errno_h.m4.orig Mon Apr 4 00:04:01 2011
+++ m4/errno_h.m4 Sun Apr 3 23:47:24 2011
@@ -1,4 +1,4 @@
-# errno_h.m4 serial 8
+# errno_h.m4 serial 9
dnl Copyright (C) 2004, 2006, 2008-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -54,6 +54,7 @@
ERRNO_H='errno.h'
fi
AC_SUBST([ERRNO_H])
+ AM_CONDITIONAL([GL_GENERATE_ERRNO_H], [test -n "$ERRNO_H"])
gl_REPLACE_ERRNO_VALUE([EMULTIHOP])
gl_REPLACE_ERRNO_VALUE([ENOLINK])
gl_REPLACE_ERRNO_VALUE([EOVERFLOW])
--- m4/float_h.m4.orig Mon Apr 4 00:04:01 2011
+++ m4/float_h.m4 Sun Apr 3 23:46:45 2011
@@ -1,4 +1,4 @@
-# float_h.m4 serial 5
+# float_h.m4 serial 6
dnl Copyright (C) 2007, 2009-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -16,4 +16,5 @@
;;
esac
AC_SUBST([FLOAT_H])
+ AM_CONDITIONAL([GL_GENERATE_FLOAT_H], [test -n "$FLOAT_H"])
])
--- m4/fnmatch.m4.orig Mon Apr 4 00:04:01 2011
+++ m4/fnmatch.m4 Sun Apr 3 23:46:52 2011
@@ -1,4 +1,4 @@
-# Check for fnmatch - serial 5.
+# Check for fnmatch - serial 6.
# Copyright (C) 2000-2007, 2009-2011 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
@@ -139,6 +139,7 @@
AC_CHECK_HEADERS_ONCE([wctype.h])
fi
AC_SUBST([FNMATCH_H])
+ AM_CONDITIONAL([GL_GENERATE_FNMATCH_H], [test -n "$FNMATCH_H"])
])
# Request a POSIX compliant fnmatch function with GNU extensions.
--- m4/glob.m4.orig Mon Apr 4 00:04:01 2011
+++ m4/glob.m4 Mon Apr 4 00:01:07 2011
@@ -1,4 +1,4 @@
-# glob.m4 serial 11
+# glob.m4 serial 12
dnl Copyright (C) 2005-2007, 2009-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -10,11 +10,12 @@
AC_DEFUN([gl_GLOB_SUBSTITUTE],
[
+ AC_LIBOBJ([glob])
gl_PREREQ_GLOB
GLOB_H=glob.h
- AC_LIBOBJ([glob])
AC_SUBST([GLOB_H])
+ AM_CONDITIONAL([GL_GENERATE_GLOB_H], [test -n "$GLOB_H"])
])
AC_DEFUN([gl_GLOB],
@@ -65,8 +66,11 @@
rm -f conf$$-globtest
if test -n "$GLOB_H"; then
- gl_GLOB_SUBSTITUTE
+ AC_LIBOBJ([glob])
+ gl_PREREQ_GLOB
fi
+ AC_SUBST([GLOB_H])
+ AM_CONDITIONAL([GL_GENERATE_GLOB_H], [test -n "$GLOB_H"])
])
# Prerequisites of lib/glob.*.
--- m4/iconv_h.m4.orig Mon Apr 4 00:04:01 2011
+++ m4/iconv_h.m4 Sun Apr 3 23:54:46 2011
@@ -1,4 +1,4 @@
-# iconv_h.m4 serial 7
+# iconv_h.m4 serial 8
dnl Copyright (C) 2007-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -18,6 +18,7 @@
[
AC_REQUIRE([gl_ICONV_H_DEFAULTS])
ICONV_H='iconv.h'
+ AM_CONDITIONAL([GL_GENERATE_ICONV_H], [test -n "$ICONV_H"])
])
AC_DEFUN([gl_ICONV_MODULE_INDICATOR],
@@ -36,4 +37,5 @@
REPLACE_ICONV_OPEN=0; AC_SUBST([REPLACE_ICONV_OPEN])
REPLACE_ICONV_UTF=0; AC_SUBST([REPLACE_ICONV_UTF])
ICONV_H=''; AC_SUBST([ICONV_H])
+ AM_CONDITIONAL([GL_GENERATE_ICONV_H], [test -n "$ICONV_H"])
])
--- m4/netinet_in_h.m4.orig Mon Apr 4 00:04:01 2011
+++ m4/netinet_in_h.m4 Sun Apr 3 23:47:30 2011
@@ -1,4 +1,4 @@
-# netinet_in_h.m4 serial 4
+# netinet_in_h.m4 serial 5
dnl Copyright (C) 2006-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -27,4 +27,5 @@
AC_SUBST([HAVE_NETINET_IN_H])
fi
AC_SUBST([NETINET_IN_H])
+ AM_CONDITIONAL([GL_GENERATE_NETINET_IN_H], [test -n "$NETINET_IN_H"])
])
--- m4/pthread.m4.orig Mon Apr 4 00:04:01 2011
+++ m4/pthread.m4 Sun Apr 3 23:47:37 2011
@@ -30,7 +30,11 @@
test $ac_cv_type_pthread_t != yes ||
test $ac_cv_type_pthread_spinlock_t != yes; then
PTHREAD_H='pthread.h'
+ else
+ PTHREAD_H=
fi
+ AC_SUBST([PTHREAD_H])
+ AM_CONDITIONAL([GL_GENERATE_PTHREAD_H], [test -n "$PTHREAD_H"])
LIB_PTHREAD=
if test $ac_cv_header_pthread_h = yes; then
@@ -53,5 +57,4 @@
HAVE_PTHREAD_H=1; AC_SUBST([HAVE_PTHREAD_H])
HAVE_PTHREAD_T=1; AC_SUBST([HAVE_PTHREAD_T])
HAVE_PTHREAD_SPINLOCK_T=1; AC_SUBST([HAVE_PTHREAD_SPINLOCK_T])
- PTHREAD_H=''; AC_SUBST([PTHREAD_H])
])
--- m4/sched_h.m4.orig Mon Apr 4 00:04:01 2011
+++ m4/sched_h.m4 Sun Apr 3 23:47:42 2011
@@ -1,4 +1,4 @@
-# sched_h.m4 serial 3
+# sched_h.m4 serial 4
dnl Copyright (C) 2008-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -32,4 +32,5 @@
AC_SUBST([HAVE_STRUCT_SCHED_PARAM])
])
AC_SUBST([SCHED_H])
+ AM_CONDITIONAL([GL_GENERATE_SCHED_H], [test -n "$SCHED_H"])
])
--- m4/selinux-context-h.m4.orig Mon Apr 4 00:04:01 2011
+++ m4/selinux-context-h.m4 Sun Apr 3 23:47:02 2011
@@ -1,4 +1,4 @@
-# serial 2 -*- Autoconf -*-
+# serial 3 -*- Autoconf -*-
# Copyright (C) 2006-2007, 2009-2011 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -18,4 +18,5 @@
SELINUX_CONTEXT_H=selinux/context.h
fi
AC_SUBST([SELINUX_CONTEXT_H])
+ AM_CONDITIONAL([GL_GENERATE_SELINUX_CONTEXT_H], [test -n
"$SELINUX_CONTEXT_H"])
])
--- m4/stdarg.m4.orig Mon Apr 4 00:04:01 2011
+++ m4/stdarg.m4 Sun Apr 3 23:47:47 2011
@@ -1,4 +1,4 @@
-# stdarg.m4 serial 5
+# stdarg.m4 serial 6
dnl Copyright (C) 2006, 2008-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -9,8 +9,8 @@
AC_DEFUN([gl_STDARG_H],
[
- STDARG_H=''; AC_SUBST([STDARG_H])
- NEXT_STDARG_H='<stdarg.h>'; AC_SUBST([NEXT_STDARG_H])
+ STDARG_H=''
+ NEXT_STDARG_H='<stdarg.h>'
AC_MSG_CHECKING([for va_copy])
AC_CACHE_VAL([gl_cv_func_va_copy], [
AC_COMPILE_IFELSE(
@@ -72,4 +72,7 @@
fi
fi
fi
+ AC_SUBST([STDARG_H])
+ AM_CONDITIONAL([GL_GENERATE_STDARG_H], [test -n "$STDARG_H"])
+ AC_SUBST([NEXT_STDARG_H])
])
--- m4/stdbool.m4.orig Mon Apr 4 00:04:01 2011
+++ m4/stdbool.m4 Sun Apr 3 23:47:53 2011
@@ -5,7 +5,7 @@
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
-#serial 4
+#serial 5
# Prepare for substituting <stdbool.h> if it is not supported.
@@ -21,6 +21,7 @@
STDBOOL_H='stdbool.h'
fi
AC_SUBST([STDBOOL_H])
+ AM_CONDITIONAL([GL_GENERATE_STDBOOL_H], [test -n "$STDBOOL_H"])
if test "$ac_cv_type__Bool" = yes; then
HAVE__BOOL=1
--- m4/stddef_h.m4.orig Mon Apr 4 00:04:01 2011
+++ m4/stddef_h.m4 Sun Apr 3 23:48:02 2011
@@ -1,5 +1,5 @@
dnl A placeholder for POSIX 2008 <stddef.h>, for platforms that have issues.
-# stddef_h.m4 serial 3
+# stddef_h.m4 serial 4
dnl Copyright (C) 2009-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -9,6 +9,7 @@
[
AC_REQUIRE([gl_STDDEF_H_DEFAULTS])
AC_REQUIRE([gt_TYPE_WCHAR_T])
+ STDDEF_H=
if test $gt_cv_c_wchar_t = no; then
HAVE_WCHAR_T=0
STDDEF_H=stddef.h
@@ -24,6 +25,8 @@
REPLACE_NULL=1
STDDEF_H=stddef.h
fi
+ AC_SUBST([STDDEF_H])
+ AM_CONDITIONAL([GL_GENERATE_STDDEF_H], [test -n "$STDDEF_H"])
if test -n "$STDDEF_H"; then
gl_NEXT_HEADERS([stddef.h])
fi
@@ -41,5 +44,4 @@
dnl Assume proper GNU behavior unless another module says otherwise.
REPLACE_NULL=0; AC_SUBST([REPLACE_NULL])
HAVE_WCHAR_T=1; AC_SUBST([HAVE_WCHAR_T])
- STDDEF_H=''; AC_SUBST([STDDEF_H])
])
--- m4/stdint.m4.orig Mon Apr 4 00:04:01 2011
+++ m4/stdint.m4 Sun Apr 3 23:49:45 2011
@@ -1,4 +1,4 @@
-# stdint.m4 serial 39
+# stdint.m4 serial 40
dnl Copyright (C) 2001-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -305,6 +305,7 @@
STDINT_H=stdint.h
fi
AC_SUBST([STDINT_H])
+ AM_CONDITIONAL([GL_GENERATE_STDINT_H], [test -n "$STDINT_H"])
])
dnl gl_STDINT_BITSIZEOF(TYPES, INCLUDES)
--- m4/sysexits.m4.orig Mon Apr 4 00:04:01 2011
+++ m4/sysexits.m4 Sun Apr 3 23:47:09 2011
@@ -1,4 +1,4 @@
-# sysexits.m4 serial 5
+# sysexits.m4 serial 6
dnl Copyright (C) 2003, 2005, 2007, 2009-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -40,4 +40,5 @@
fi
AC_SUBST([HAVE_SYSEXITS_H])
AC_SUBST([SYSEXITS_H])
+ AM_CONDITIONAL([GL_GENERATE_SYSEXITS_H], [test -n "$SYSEXITS_H"])
])
--- modules/alloca-opt.orig Mon Apr 4 00:04:01 2011
+++ modules/alloca-opt Sun Apr 3 23:22:29 2011
@@ -17,12 +17,17 @@
# We need the following in order to create <alloca.h> when the system
# doesn't have one that works with the given compiler.
-alloca.h: alloca.in.h
+if GL_GENERATE_ALLOCA_H
+alloca.h: alloca.in.h $(top_builddir)/config.status
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/alloca.in.h; \
} > address@hidden && \
mv -f address@hidden $@
+else
+alloca.h: $(top_builddir)/config.status
+ rm -f $@
+endif
MOSTLYCLEANFILES += alloca.h alloca.h-t
Include:
--- modules/argz.orig Mon Apr 4 00:04:01 2011
+++ modules/argz Sun Apr 3 23:31:45 2011
@@ -22,12 +22,17 @@
# We need the following in order to create <argz.h> when the system
# doesn't have one that works with the given compiler.
-argz.h: argz.in.h
+if GL_GENERATE_ARGZ_H
+argz.h: argz.in.h $(top_builddir)/config.status
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/argz.in.h; \
} > address@hidden && \
mv -f address@hidden $@
+else
+argz.h: $(top_builddir)/config.status
+ rm -f $@
+endif
MOSTLYCLEANFILES += argz.h argz.h-t
Include:
--- modules/byteswap.orig Mon Apr 4 00:04:01 2011
+++ modules/byteswap Sun Apr 3 23:35:13 2011
@@ -15,12 +15,17 @@
# We need the following in order to create <byteswap.h> when the system
# doesn't have one.
-byteswap.h: byteswap.in.h
+if GL_GENERATE_BYTESWAP_H
+byteswap.h: byteswap.in.h $(top_builddir)/config.status
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
cat $(srcdir)/byteswap.in.h; \
} > address@hidden && \
mv -f address@hidden $@
+else
+byteswap.h: $(top_builddir)/config.status
+ rm -f $@
+endif
MOSTLYCLEANFILES += byteswap.h byteswap.h-t
Include:
--- modules/errno.orig Mon Apr 4 00:04:01 2011
+++ modules/errno Sun Apr 3 23:36:03 2011
@@ -16,6 +16,7 @@
# We need the following in order to create <errno.h> when the system
# doesn't have one that is POSIX compliant.
+if GL_GENERATE_ERRNO_H
errno.h: errno.in.h $(top_builddir)/config.status
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
@@ -32,6 +33,10 @@
< $(srcdir)/errno.in.h; \
} > address@hidden && \
mv address@hidden $@
+else
+errno.h: $(top_builddir)/config.status
+ rm -f $@
+endif
MOSTLYCLEANFILES += errno.h errno.h-t
Include:
--- modules/float.orig Mon Apr 4 00:04:01 2011
+++ modules/float Sun Apr 3 23:31:47 2011
@@ -16,6 +16,7 @@
# We need the following in order to create <float.h> when the system
# doesn't have one that works with the given compiler.
+if GL_GENERATE_FLOAT_H
float.h: float.in.h $(top_builddir)/config.status
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
@@ -26,6 +27,10 @@
< $(srcdir)/float.in.h; \
} > address@hidden && \
mv address@hidden $@
+else
+float.h: $(top_builddir)/config.status
+ rm -f $@
+endif
MOSTLYCLEANFILES += float.h float.h-t
Include:
--- modules/fnmatch.orig Mon Apr 4 00:04:01 2011
+++ modules/fnmatch Sun Apr 3 23:31:48 2011
@@ -28,13 +28,18 @@
# We need the following in order to create <fnmatch.h> when the system
# doesn't have one that supports the required API.
-fnmatch.h: fnmatch.in.h $(ARG_NONNULL_H)
+if GL_GENERATE_FNMATCH_H
+fnmatch.h: fnmatch.in.h $(top_builddir)/config.status $(ARG_NONNULL_H)
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
< $(srcdir)/fnmatch.in.h; \
} > address@hidden && \
mv -f address@hidden $@
+else
+fnmatch.h: $(top_builddir)/config.status
+ rm -f $@
+endif
MOSTLYCLEANFILES += fnmatch.h fnmatch.h-t
Include:
--- modules/glob.orig Mon Apr 4 00:04:01 2011
+++ modules/glob Mon Apr 4 00:01:09 2011
@@ -34,6 +34,7 @@
# We need the following in order to create <glob.h> when the system
# doesn't have one that works with the given compiler.
+if GL_GENERATE_GLOB_H
glob.h: glob.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H)
$(WARN_ON_USE_H)
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
@@ -44,6 +45,10 @@
< $(srcdir)/glob.in.h; \
} > address@hidden && \
mv -f address@hidden $@
+else
+glob.h: $(top_builddir)/config.status
+ rm -f $@
+endif
MOSTLYCLEANFILES += glob.h glob.h-t
Include:
--- modules/iconv-h.orig Mon Apr 4 00:04:02 2011
+++ modules/iconv-h Sun Apr 3 23:54:53 2011
@@ -19,6 +19,7 @@
# We need the following in order to create <iconv.h> when the system
# doesn't have one that works with the given compiler.
+if GL_GENERATE_ICONV_H
iconv.h: iconv.in.h $(top_builddir)/config.status $(CXXDEFS_H)
$(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
@@ -37,6 +38,10 @@
< $(srcdir)/iconv.in.h; \
} > address@hidden && \
mv address@hidden $@
+else
+iconv.h: $(top_builddir)/config.status
+ rm -f $@
+endif
MOSTLYCLEANFILES += iconv.h iconv.h-t
Include:
--- modules/netinet_in.orig Mon Apr 4 00:04:02 2011
+++ modules/netinet_in Sun Apr 3 23:36:53 2011
@@ -18,6 +18,7 @@
# We need the following in order to create <netinet/in.h> when the system
# doesn't have one.
+if GL_GENERATE_NETINET_IN_H
netinet/in.h: netinet_in.in.h $(top_builddir)/config.status
$(AM_V_at)$(MKDIR_P) netinet
$(AM_V_GEN)rm -f address@hidden $@ && \
@@ -30,6 +31,10 @@
< $(srcdir)/netinet_in.in.h; \
} > address@hidden && \
mv address@hidden $@
+else
+netinet/in.h: $(top_builddir)/config.status
+ rm -f $@
+endif
MOSTLYCLEANFILES += netinet/in.h netinet/in.h-t
MOSTLYCLEANDIRS += netinet
--- modules/pthread.orig Mon Apr 4 00:04:02 2011
+++ modules/pthread Sun Apr 3 23:39:28 2011
@@ -17,6 +17,7 @@
# We need the following in order to create <pthread.h> when the system
# doesn't have one that works with the given compiler.
+if GL_GENERATE_PTHREAD_H
pthread.h: pthread.in.h $(top_builddir)/config.status
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
@@ -30,6 +31,10 @@
< $(srcdir)/pthread.in.h; \
} > address@hidden && \
mv address@hidden $@
+else
+pthread.h: $(top_builddir)/config.status
+ rm -f $@
+endif
MOSTLYCLEANFILES += pthread.h pthread.h-t
Include:
--- modules/sched.orig Mon Apr 4 00:04:02 2011
+++ modules/sched Sun Apr 3 23:40:17 2011
@@ -16,6 +16,7 @@
# We need the following in order to create a replacement for <sched.h> when
# the system doesn't have one.
+if GL_GENERATE_SCHED_H
sched.h: sched.in.h $(top_builddir)/config.status
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
@@ -28,6 +29,10 @@
< $(srcdir)/sched.in.h; \
} > address@hidden && \
mv address@hidden $@
+else
+sched.h: $(top_builddir)/config.status
+ rm -f $@
+endif
MOSTLYCLEANFILES += sched.h sched.h-t
Include:
--- modules/selinux-h.orig Mon Apr 4 00:04:02 2011
+++ modules/selinux-h Sun Apr 3 23:34:13 2011
@@ -37,6 +37,7 @@
MOSTLYCLEANFILES += selinux/selinux.h selinux/selinux.h-t
BUILT_SOURCES += $(SELINUX_CONTEXT_H)
+if GL_GENERATE_SELINUX_CONTEXT_H
selinux/context.h: se-context.in.h $(top_builddir)/config.status
$(UNUSED_PARAMETER_H)
$(AM_V_at)$(MKDIR_P) selinux
$(AM_V_GEN)rm -f address@hidden $@ && \
@@ -46,6 +47,10 @@
} > address@hidden && \
chmod a-x address@hidden && \
mv address@hidden $@
+else
+selinux/context.h: $(top_builddir)/config.status
+ rm -f $@
+endif
MOSTLYCLEANFILES += selinux/context.h selinux/context.h-t
MOSTLYCLEANDIRS += selinux
--- modules/stdarg.orig Mon Apr 4 00:04:02 2011
+++ modules/stdarg Sun Apr 3 23:42:50 2011
@@ -23,6 +23,7 @@
# We need the following in order to create <stdarg.h> when the system
# doesn't have one that works with the given compiler.
+if GL_GENERATE_STDARG_H
stdarg.h: stdarg.in.h $(top_builddir)/config.status
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
@@ -33,6 +34,10 @@
< $(srcdir)/stdarg.in.h; \
} > address@hidden && \
mv address@hidden $@
+else
+stdarg.h: $(top_builddir)/config.status
+ rm -f $@
+endif
MOSTLYCLEANFILES += stdarg.h stdarg.h-t
Include:
--- modules/stdbool.orig Mon Apr 4 00:04:02 2011
+++ modules/stdbool Sun Apr 3 23:43:52 2011
@@ -16,12 +16,17 @@
# We need the following in order to create <stdbool.h> when the system
# doesn't have one that works.
+if GL_GENERATE_STDBOOL_H
stdbool.h: stdbool.in.h $(top_builddir)/config.status
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool.in.h;
\
} > address@hidden && \
mv address@hidden $@
+else
+stdbool.h: $(top_builddir)/config.status
+ rm -f $@
+endif
MOSTLYCLEANFILES += stdbool.h stdbool.h-t
Include:
--- modules/stddef.orig Mon Apr 4 00:04:02 2011
+++ modules/stddef Sun Apr 3 23:45:44 2011
@@ -17,6 +17,7 @@
# We need the following in order to create <stddef.h> when the system
# doesn't have one that works with the given compiler.
+if GL_GENERATE_STDDEF_H
stddef.h: stddef.in.h $(top_builddir)/config.status
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
@@ -29,6 +30,10 @@
< $(srcdir)/stddef.in.h; \
} > address@hidden && \
mv address@hidden $@
+else
+stddef.h: $(top_builddir)/config.status
+ rm -f $@
+endif
MOSTLYCLEANFILES += stddef.h stddef.h-t
Include:
--- modules/stdint.orig Mon Apr 4 00:04:02 2011
+++ modules/stdint Sun Apr 3 23:49:56 2011
@@ -23,6 +23,7 @@
# We need the following in order to create <stdint.h> when the system
# doesn't have one that works with the given compiler.
+if GL_GENERATE_STDINT_H
stdint.h: stdint.in.h $(top_builddir)/config.status
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
@@ -55,6 +56,10 @@
< $(srcdir)/stdint.in.h; \
} > address@hidden && \
mv address@hidden $@
+else
+stdint.h: $(top_builddir)/config.status
+ rm -f $@
+endif
MOSTLYCLEANFILES += stdint.h stdint.h-t
Include:
--- modules/sysexits.orig Mon Apr 4 00:04:02 2011
+++ modules/sysexits Sun Apr 3 23:34:50 2011
@@ -16,6 +16,7 @@
# We need the following in order to create <sysexits.h> when the system
# doesn't have one that works with the given compiler.
+if GL_GENERATE_SYSEXITS_H
sysexits.h: sysexits.in.h $(top_builddir)/config.status
$(AM_V_GEN)rm -f address@hidden $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
@@ -27,6 +28,10 @@
< $(srcdir)/sysexits.in.h; \
} > address@hidden && \
mv -f address@hidden $@
+else
+sysexits.h: $(top_builddir)/config.status
+ rm -f $@
+endif
MOSTLYCLEANFILES += sysexits.h sysexits.h-t
Include:
--
In memoriam Albert Merz <http://en.wikipedia.org/wiki/Albert_Merz>
- Re: Mutilated stdlib.h, (continued)
- Re: Mutilated stdlib.h, Bruno Haible, 2011/04/01
- Re: Mutilated stdlib.h, Ralf Wildenhues, 2011/04/02
- Re: Mutilated stdlib.h, Bruno Haible, 2011/04/02
- Re: Mutilated stdlib.h, Ralf Wildenhues, 2011/04/03
- Re: Mutilated stdlib.h, Ralf Wildenhues, 2011/04/03
- Re: Mutilated stdlib.h, Ralf Wildenhues, 2011/04/02
- Re: Mutilated stdlib.h, Bruno Haible, 2011/04/02
- Re: Mutilated stdlib.h, Ralf Wildenhues, 2011/04/03
- Re: Mutilated stdlib.h,
Bruno Haible <=
- Re: Mutilated stdlib.h, Bruno Haible, 2011/04/05
- Re: Mutilated stdlib.h, Jim Meyering, 2011/04/06
Re: Mutilated stdlib.h, Bruno Haible, 2011/04/01
- Re: Mutilated stdlib.h, Ralf Wildenhues, 2011/04/02
- Re: not breaking "make" after m4 macros and source files changed, Bruno Haible, 2011/04/02
- Re: not breaking "make" after m4 macros and source files changed, Stefano Lattarini, 2011/04/03
- Re: not breaking "make" after m4 macros and source files changed, Ralf Wildenhues, 2011/04/03
- Re: not breaking "make" after m4 macros and source files changed, Stefano Lattarini, 2011/04/03
- Re: not breaking "make" after m4 macros and source files changed, Bruno Haible, 2011/04/03
- [PATCH] {master} coverage: add tests on remake rules in more complex situations (was: Re: not breaking "make" after m4 macros and source files changed), Stefano Lattarini, 2011/04/06