gettimeofday: port recent C++ fix to Emacs

[gnulib.git] / modules / byteswap

diff --git a/modules/byteswap b/modules/byteswap
index 8202a3b..c1da400 100644 (file)
--- a/modules/byteswap
+++ b/modules/byteswap
@@ -2,7 +2,7 @@ Description:
 Swap bytes of 16, 32 and 64 bit values.
 
 Files:
-lib/byteswap_.h
+lib/byteswap.in.h
 m4/byteswap.m4
 
 Depends-on:
@@ -12,21 +12,27 @@ gl_BYTESWAP
 
 Makefile.am:
 BUILT_SOURCES += $(BYTESWAP_H)
-EXTRA_DIST += byteswap_.h
 
-# We need the following in order to create a <byteswap.h> when the system
+# We need the following in order to create <byteswap.h> when the system
 # doesn't have one.
-all-local $(lib_OBJECTS): $(BYTESWAP_H)
-byteswap.h: byteswap_.h
-       cp $(srcdir)/$< $@-t
-       mv $@-t $@
+if GL_GENERATE_BYTESWAP_H
+byteswap.h: byteswap.in.h $(top_builddir)/config.status
+       $(AM_V_GEN)rm -f $@-t $@ && \
+       { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+         cat $(srcdir)/byteswap.in.h; \
+       } > $@-t && \
+       mv -f $@-t $@
+else
+byteswap.h: $(top_builddir)/config.status
+       rm -f $@
+endif
 MOSTLYCLEANFILES += byteswap.h byteswap.h-t
 
 Include:
 <byteswap.h>
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Oskar Liljeblad