+2024-08-10 Bruno Haible <bruno@clisp.org>
+
+ Make sure gperf-generated files are the same in VPATH builds.
+ Reported by Patrice Dumas <pertusus@free.fr> in
+ <https://lists.gnu.org/archive/html/bug-texinfo/2024-08/msg00030.html>.
+ * modules/iconv_open (Makefile.am): Eliminate directory names from the
+ generated iconv_open-aix.h, iconv_open-hpux.h, iconv_open-irix.h,
+ iconv_open-osf.h, iconv_open-solaris.h, iconv_open-zos.h.
+ * modules/unicase/locale-language (Makefile.am): Eliminate directory
+ names from the generated unicase/locale-languages.h.
+ * modules/unicase/special-casing (Makefile.am): Eliminate directory
+ names from the generated unicase/special-casing-table.h.
+ * modules/unictype/bidiclass-byname (Makefile.am): Eliminate directory
+ names from the generated unictype/bidi_byname.h.
+ * modules/unictype/category-byname (Makefile.am): Eliminate directory
+ names from the generated unictype/categ_byname.h.
+ * modules/unictype/combining-class-byname (Makefile.am): Eliminate
+ directory names from the generated unictype/combiningclass_byname.h.
+ * modules/unictype/joininggroup-byname (Makefile.am): Eliminate
+ directory names from the generated unictype/joininggroup_byname.h.
+ * modules/unictype/joiningtype-byname (Makefile.am): Eliminate directory
+ names from the generated unictype/joiningtype_byname.h.
+ * modules/unictype/property-byname (Makefile.am): Eliminate directory
+ names from the generated unictype/pr_byname.h.
+ * modules/unictype/scripts (Makefile.am): Eliminate directory names from
+ the generated unictype/scripts_byname.h.
+ * modules/uninorm/composition (Makefile.am): Eliminate directory names
+ from the generated uninorm/composition-table.h.
+
2024-08-09 Paul Eggert <eggert@cs.ucla.edu>
test-utime: port to noatime file systems
endif
$(srcdir)/iconv_open-aix.h: $(srcdir)/iconv_open-aix.gperf
- $(V_GPERF)$(GPERF) -m 10 $(srcdir)/iconv_open-aix.gperf > $(srcdir)/iconv_open-aix.h-t && \
- mv $(srcdir)/iconv_open-aix.h-t $(srcdir)/iconv_open-aix.h
+ $(V_GPERF)$(GPERF) -m 10 $(srcdir)/iconv_open-aix.gperf > $(srcdir)/iconv_open-aix.h-t1 \
+ && sed -e 's|\([ "]\)[^ "]*/iconv_open-aix\.gperf\([ "]\)|\1iconv_open-aix.gperf\2|' \
+ < $(srcdir)/iconv_open-aix.h-t1 > $(srcdir)/iconv_open-aix.h-t2 \
+ && rm -f $(srcdir)/iconv_open-aix.h-t1 \
+ && mv $(srcdir)/iconv_open-aix.h-t2 $(srcdir)/iconv_open-aix.h
$(srcdir)/iconv_open-hpux.h: $(srcdir)/iconv_open-hpux.gperf
- $(V_GPERF)$(GPERF) -m 10 $(srcdir)/iconv_open-hpux.gperf > $(srcdir)/iconv_open-hpux.h-t && \
- mv $(srcdir)/iconv_open-hpux.h-t $(srcdir)/iconv_open-hpux.h
+ $(V_GPERF)$(GPERF) -m 10 $(srcdir)/iconv_open-hpux.gperf > $(srcdir)/iconv_open-hpux.h-t1 \
+ && sed -e 's|\([ "]\)[^ "]*/iconv_open-hpux\.gperf\([ "]\)|\1iconv_open-hpux.gperf\2|' \
+ < $(srcdir)/iconv_open-hpux.h-t1 > $(srcdir)/iconv_open-hpux.h-t2 \
+ && rm -f $(srcdir)/iconv_open-hpux.h-t1 \
+ && mv $(srcdir)/iconv_open-hpux.h-t2 $(srcdir)/iconv_open-hpux.h
$(srcdir)/iconv_open-irix.h: $(srcdir)/iconv_open-irix.gperf
- $(V_GPERF)$(GPERF) -m 10 $(srcdir)/iconv_open-irix.gperf > $(srcdir)/iconv_open-irix.h-t && \
- mv $(srcdir)/iconv_open-irix.h-t $(srcdir)/iconv_open-irix.h
+ $(V_GPERF)$(GPERF) -m 10 $(srcdir)/iconv_open-irix.gperf > $(srcdir)/iconv_open-irix.h-t1 \
+ && sed -e 's|\([ "]\)[^ "]*/iconv_open-irix\.gperf\([ "]\)|\1iconv_open-irix.gperf\2|' \
+ < $(srcdir)/iconv_open-irix.h-t1 > $(srcdir)/iconv_open-irix.h-t2 \
+ && rm -f $(srcdir)/iconv_open-irix.h-t1 \
+ && mv $(srcdir)/iconv_open-irix.h-t2 $(srcdir)/iconv_open-irix.h
$(srcdir)/iconv_open-osf.h: $(srcdir)/iconv_open-osf.gperf
- $(V_GPERF)$(GPERF) -m 10 $(srcdir)/iconv_open-osf.gperf > $(srcdir)/iconv_open-osf.h-t && \
- mv $(srcdir)/iconv_open-osf.h-t $(srcdir)/iconv_open-osf.h
+ $(V_GPERF)$(GPERF) -m 10 $(srcdir)/iconv_open-osf.gperf > $(srcdir)/iconv_open-osf.h-t1 \
+ && sed -e 's|\([ "]\)[^ "]*/iconv_open-osf\.gperf\([ "]\)|\1iconv_open-osf.gperf\2|' \
+ < $(srcdir)/iconv_open-osf.h-t1 > $(srcdir)/iconv_open-osf.h-t2 \
+ && rm -f $(srcdir)/iconv_open-osf.h-t1 \
+ && mv $(srcdir)/iconv_open-osf.h-t2 $(srcdir)/iconv_open-osf.h
$(srcdir)/iconv_open-solaris.h: $(srcdir)/iconv_open-solaris.gperf
- $(V_GPERF)$(GPERF) -m 10 $(srcdir)/iconv_open-solaris.gperf > $(srcdir)/iconv_open-solaris.h-t && \
- mv $(srcdir)/iconv_open-solaris.h-t $(srcdir)/iconv_open-solaris.h
+ $(V_GPERF)$(GPERF) -m 10 $(srcdir)/iconv_open-solaris.gperf > $(srcdir)/iconv_open-solaris.h-t1 \
+ && sed -e 's|\([ "]\)[^ "]*/iconv_open-solaris\.gperf\([ "]\)|\1iconv_open-solaris.gperf\2|' \
+ < $(srcdir)/iconv_open-solaris.h-t1 > $(srcdir)/iconv_open-solaris.h-t2 \
+ && rm -f $(srcdir)/iconv_open-solaris.h-t1 \
+ && mv $(srcdir)/iconv_open-solaris.h-t2 $(srcdir)/iconv_open-solaris.h
$(srcdir)/iconv_open-zos.h: $(srcdir)/iconv_open-zos.gperf
- $(V_GPERF)$(GPERF) -m 10 $(srcdir)/iconv_open-zos.gperf > $(srcdir)/iconv_open-zos.h-t && \
- mv $(srcdir)/iconv_open-zos.h-t $(srcdir)/iconv_open-zos.h
+ $(V_GPERF)$(GPERF) -m 10 $(srcdir)/iconv_open-zos.gperf > $(srcdir)/iconv_open-zos.h-t1 \
+ && sed -e 's|\([ "]\)[^ "]*/iconv_open-zos\.gperf\([ "]\)|\1iconv_open-zos.gperf\2|' \
+ < $(srcdir)/iconv_open-zos.h-t1 > $(srcdir)/iconv_open-zos.h-t2 \
+ && rm -f $(srcdir)/iconv_open-zos.h-t1 \
+ && mv $(srcdir)/iconv_open-zos.h-t2 $(srcdir)/iconv_open-zos.h
BUILT_SOURCES += iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h iconv_open-osf.h iconv_open-solaris.h iconv_open-zos.h
-MOSTLYCLEANFILES += iconv_open-aix.h-t iconv_open-hpux.h-t iconv_open-irix.h-t iconv_open-osf.h-t iconv_open-solaris.h-t iconv_open-zos.h-t
+MOSTLYCLEANFILES += iconv_open-aix.h-t1 iconv_open-aix.h-t2 \
+ iconv_open-hpux.h-t1 iconv_open-hpux.h-t2 \
+ iconv_open-irix.h-t1 iconv_open-irix.h-t2 \
+ iconv_open-osf.h-t1 iconv_open-osf.h-t2 \
+ iconv_open-solaris.h-t1 iconv_open-solaris.h-t2 \
+ iconv_open-zos.h-t1 iconv_open-zos.h-t2
MAINTAINERCLEANFILES += iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h iconv_open-osf.h iconv_open-solaris.h iconv_open-zos.h
EXTRA_DIST += iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h iconv_open-osf.h iconv_open-solaris.h iconv_open-zos.h
$(srcdir)/unicase/locale-languages.h: $(srcdir)/unicase/locale-languages.gperf
$(V_GPERF)$(GPERF) -m 10 $(srcdir)/unicase/locale-languages.gperf > $(srcdir)/unicase/locale-languages.h-t1 \
- && sed -e 's/^const/static const/' < $(srcdir)/unicase/locale-languages.h-t1 > $(srcdir)/unicase/locale-languages.h-t2 \
+ && sed -e 's/^const/static const/' \
+ -e 's|\([ "]\)[^ "]*/unicase/locale-languages\.gperf\([ "]\)|\1unicase/locale-languages.gperf\2|' \
+ < $(srcdir)/unicase/locale-languages.h-t1 > $(srcdir)/unicase/locale-languages.h-t2 \
+ && rm -f $(srcdir)/unicase/locale-languages.h-t1 \
&& mv $(srcdir)/unicase/locale-languages.h-t2 $(srcdir)/unicase/locale-languages.h
BUILT_SOURCES += unicase/locale-languages.h
MOSTLYCLEANFILES += unicase/locale-languages.h-t1 unicase/locale-languages.h-t2
lib_SOURCES += unicase/special-casing.c
$(srcdir)/unicase/special-casing-table.h: $(srcdir)/unicase/special-casing-table.gperf
- $(V_GPERF)$(GPERF) -m 10 $(srcdir)/unicase/special-casing-table.gperf > $(srcdir)/unicase/special-casing-table.h-t && \
- mv $(srcdir)/unicase/special-casing-table.h-t $(srcdir)/unicase/special-casing-table.h
+ $(V_GPERF)$(GPERF) -m 10 $(srcdir)/unicase/special-casing-table.gperf > $(srcdir)/unicase/special-casing-table.h-t1 \
+ && sed -e 's|\([ "]\)[^ "]*/unicase/special-casing-table\.gperf\([ "]\)|\1unicase/special-casing-table.gperf\2|' \
+ < $(srcdir)/unicase/special-casing-table.h-t1 > $(srcdir)/unicase/special-casing-table.h-t2 \
+ && rm -f $(srcdir)/unicase/special-casing-table.h-t1 \
+ && mv $(srcdir)/unicase/special-casing-table.h-t2 $(srcdir)/unicase/special-casing-table.h
BUILT_SOURCES += unicase/special-casing-table.h
-MOSTLYCLEANFILES += unicase/special-casing-table.h-t
+MOSTLYCLEANFILES += unicase/special-casing-table.h-t1 unicase/special-casing-table.h-t2
MAINTAINERCLEANFILES += unicase/special-casing-table.h
EXTRA_DIST += unicase/special-casing-table.h
$(srcdir)/unictype/bidi_byname.h: $(srcdir)/unictype/bidi_byname.gperf
$(V_GPERF)$(GPERF) -m 10 $(srcdir)/unictype/bidi_byname.gperf > $(srcdir)/unictype/bidi_byname.h-t1 \
- && sed -e 's/^const/static const/' < $(srcdir)/unictype/bidi_byname.h-t1 > $(srcdir)/unictype/bidi_byname.h-t2 \
+ && sed -e 's/^const/static const/' \
+ -e 's|\([ "]\)[^ "]*/unictype/bidi_byname\.gperf\([ "]\)|\1unictype/bidi_byname.gperf\2|' \
+ < $(srcdir)/unictype/bidi_byname.h-t1 > $(srcdir)/unictype/bidi_byname.h-t2 \
+ && rm -f $(srcdir)/unictype/bidi_byname.h-t1 \
&& mv $(srcdir)/unictype/bidi_byname.h-t2 $(srcdir)/unictype/bidi_byname.h
BUILT_SOURCES += unictype/bidi_byname.h
MOSTLYCLEANFILES += unictype/bidi_byname.h-t1 unictype/bidi_byname.h-t2
$(srcdir)/unictype/categ_byname.h: $(srcdir)/unictype/categ_byname.gperf
$(V_GPERF)$(GPERF) -m 10 $(srcdir)/unictype/categ_byname.gperf > $(srcdir)/unictype/categ_byname.h-t1 \
- && sed -e 's/^const/static const/' < $(srcdir)/unictype/categ_byname.h-t1 > $(srcdir)/unictype/categ_byname.h-t2 \
+ && sed -e 's/^const/static const/' \
+ -e 's|\([ "]\)[^ "]*/unictype/categ_byname\.gperf\([ "]\)|\1unictype/categ_byname.gperf\2|' \
+ < $(srcdir)/unictype/categ_byname.h-t1 > $(srcdir)/unictype/categ_byname.h-t2 \
+ && rm -f $(srcdir)/unictype/categ_byname.h-t1 \
&& mv $(srcdir)/unictype/categ_byname.h-t2 $(srcdir)/unictype/categ_byname.h
BUILT_SOURCES += unictype/categ_byname.h
MOSTLYCLEANFILES += unictype/categ_byname.h-t1 unictype/categ_byname.h-t2
$(srcdir)/unictype/combiningclass_byname.h: $(srcdir)/unictype/combiningclass_byname.gperf
$(V_GPERF)$(GPERF) -m 10 $(srcdir)/unictype/combiningclass_byname.gperf > $(srcdir)/unictype/combiningclass_byname.h-t1 \
- && sed -e 's/^const/static const/' < $(srcdir)/unictype/combiningclass_byname.h-t1 > $(srcdir)/unictype/combiningclass_byname.h-t2 \
+ && sed -e 's/^const/static const/' \
+ -e 's|\([ "]\)[^ "]*/unictype/combiningclass_byname\.gperf\([ "]\)|\1unictype/combiningclass_byname.gperf\2|' \
+ < $(srcdir)/unictype/combiningclass_byname.h-t1 > $(srcdir)/unictype/combiningclass_byname.h-t2 \
+ && rm -f $(srcdir)/unictype/combiningclass_byname.h-t1 \
&& mv $(srcdir)/unictype/combiningclass_byname.h-t2 $(srcdir)/unictype/combiningclass_byname.h
BUILT_SOURCES += unictype/combiningclass_byname.h
MOSTLYCLEANFILES += unictype/combiningclass_byname.h-t1 unictype/combiningclass_byname.h-t2
$(srcdir)/unictype/joininggroup_byname.h: $(srcdir)/unictype/joininggroup_byname.gperf
$(V_GPERF)$(GPERF) -m 10 $(srcdir)/unictype/joininggroup_byname.gperf > $(srcdir)/unictype/joininggroup_byname.h-t1 \
- && sed -e 's/^const/static const/' < $(srcdir)/unictype/joininggroup_byname.h-t1 > $(srcdir)/unictype/joininggroup_byname.h-t2 \
+ && sed -e 's/^const/static const/' \
+ -e 's|\([ "]\)[^ "]*/unictype/joininggroup_byname\.gperf\([ "]\)|\1unictype/joininggroup_byname.gperf\2|' \
+ < $(srcdir)/unictype/joininggroup_byname.h-t1 > $(srcdir)/unictype/joininggroup_byname.h-t2 \
+ && rm -f $(srcdir)/unictype/joininggroup_byname.h-t1 \
&& mv $(srcdir)/unictype/joininggroup_byname.h-t2 $(srcdir)/unictype/joininggroup_byname.h
BUILT_SOURCES += unictype/joininggroup_byname.h
MOSTLYCLEANFILES += unictype/joininggroup_byname.h-t1 unictype/joininggroup_byname.h-t2
$(srcdir)/unictype/joiningtype_byname.h: $(srcdir)/unictype/joiningtype_byname.gperf
$(V_GPERF)$(GPERF) -m 10 $(srcdir)/unictype/joiningtype_byname.gperf > $(srcdir)/unictype/joiningtype_byname.h-t1 \
- && sed -e 's/^const/static const/' < $(srcdir)/unictype/joiningtype_byname.h-t1 > $(srcdir)/unictype/joiningtype_byname.h-t2 \
+ && sed -e 's/^const/static const/' \
+ -e 's|\([ "]\)[^ "]*/unictype/joiningtype_byname\.gperf\([ "]\)|\1unictype/joiningtype_byname.gperf\2|' \
+ < $(srcdir)/unictype/joiningtype_byname.h-t1 > $(srcdir)/unictype/joiningtype_byname.h-t2 \
+ && rm -f $(srcdir)/unictype/joiningtype_byname.h-t1 \
&& mv $(srcdir)/unictype/joiningtype_byname.h-t2 $(srcdir)/unictype/joiningtype_byname.h
BUILT_SOURCES += unictype/joiningtype_byname.h
MOSTLYCLEANFILES += unictype/joiningtype_byname.h-t1 unictype/joiningtype_byname.h-t2
$(srcdir)/unictype/pr_byname.h: $(srcdir)/unictype/pr_byname.gperf
$(V_GPERF)$(GPERF) -m 10 $(srcdir)/unictype/pr_byname.gperf > $(srcdir)/unictype/pr_byname.h-t1 \
- && sed -e 's/^const/static const/' < $(srcdir)/unictype/pr_byname.h-t1 > $(srcdir)/unictype/pr_byname.h-t2 \
+ && sed -e 's/^const/static const/' \
+ -e 's|\([ "]\)[^ "]*/unictype/pr_byname\.gperf\([ "]\)|\1unictype/pr_byname.gperf\2|' \
+ < $(srcdir)/unictype/pr_byname.h-t1 > $(srcdir)/unictype/pr_byname.h-t2 \
+ && rm -f $(srcdir)/unictype/pr_byname.h-t1 \
&& mv $(srcdir)/unictype/pr_byname.h-t2 $(srcdir)/unictype/pr_byname.h
BUILT_SOURCES += unictype/pr_byname.h
MOSTLYCLEANFILES += unictype/pr_byname.h-t1 unictype/pr_byname.h-t2
$(srcdir)/unictype/scripts_byname.h: $(srcdir)/unictype/scripts_byname.gperf
$(V_GPERF)$(GPERF) -m 10 $(srcdir)/unictype/scripts_byname.gperf > $(srcdir)/unictype/scripts_byname.h-t1 \
- && sed -e 's/^const/static const/' < $(srcdir)/unictype/scripts_byname.h-t1 > $(srcdir)/unictype/scripts_byname.h-t2 \
+ && sed -e 's/^const/static const/' \
+ -e 's|\([ "]\)[^ "]*/unictype/scripts_byname\.gperf\([ "]\)|\1unictype/scripts_byname.gperf\2|' \
+ < $(srcdir)/unictype/scripts_byname.h-t1 > $(srcdir)/unictype/scripts_byname.h-t2 \
+ && rm -f $(srcdir)/unictype/scripts_byname.h-t1 \
&& mv $(srcdir)/unictype/scripts_byname.h-t2 $(srcdir)/unictype/scripts_byname.h
BUILT_SOURCES += unictype/scripts_byname.h
MOSTLYCLEANFILES += unictype/scripts_byname.h-t1 unictype/scripts_byname.h-t2
$(srcdir)/uninorm/composition-table.h: $(srcdir)/uninorm/composition-table.gperf
$(V_GPERF)$(GPERF) -m 1 $(srcdir)/uninorm/composition-table.gperf > $(srcdir)/uninorm/composition-table.h-t1 \
- && sed -e 's/^const/static const/' < $(srcdir)/uninorm/composition-table.h-t1 > $(srcdir)/uninorm/composition-table.h-t2 \
+ && sed -e 's/^const/static const/' \
+ -e 's|\([ "]\)[^ "]*/uninorm/composition-table\.gperf\([ "]\)|\1uninorm/composition-table.gperf\2|' \
+ < $(srcdir)/uninorm/composition-table.h-t1 > $(srcdir)/uninorm/composition-table.h-t2 \
+ && rm -f $(srcdir)/uninorm/composition-table.h-t1 \
&& mv $(srcdir)/uninorm/composition-table.h-t2 $(srcdir)/uninorm/composition-table.h
BUILT_SOURCES += uninorm/composition-table.h
MOSTLYCLEANFILES += uninorm/composition-table.h-t1 uninorm/composition-table.h-t2