]> Savannah Git Hosting - gnulib.git/commitdiff
parse-datetime: Simplify.
authorBruno Haible <bruno@clisp.org>
Sat, 9 Mar 2024 12:00:28 +0000 (13:00 +0100)
committerBruno Haible <bruno@clisp.org>
Sat, 9 Mar 2024 12:00:28 +0000 (13:00 +0100)
* modules/parse-datetime (Makefile.am): Don't generate
parse-datetime-gen.h.

ChangeLog
modules/parse-datetime

index 6fed81caa672885be8582958b3155b7274a74e98..66926b42681d735d4c55fa0511b5460bd1e2d5c7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2024-03-09  Bruno Haible  <bruno@clisp.org>
+
+       parse-datetime: Simplify.
+       * modules/parse-datetime (Makefile.am): Don't generate
+       parse-datetime-gen.h.
+
 2024-03-09  Bruno Haible  <bruno@clisp.org>
 
        parse-datetime: Simplify.
index 60ac0b082478199663620512e2f16676d9e27c5c..1645660abe0229811202a48d45d7207017d8e284 100644 (file)
@@ -45,35 +45,20 @@ Makefile.am:
 # Additionally, here we assume GNU Bison and therefore don't need the ylwrap
 # script.
 # Therefore we override this rule.
-# Since this is a rule that produces multiple files, we apply the idiom from
-# <https://lists.gnu.org/archive/html/bug-make/2020-09/msg00008.html>, so that
-# it works also in parallel 'make'.
-generate-parse-datetime:
-       $(AM_V_YACC)$(PARSE_DATETIME_BISON) -d $(YFLAGS) $(AM_YFLAGS) $(srcdir)/parse-datetime.y \
+parse-datetime.c: parse-datetime.y
+       $(AM_V_YACC)$(PARSE_DATETIME_BISON) $(YFLAGS) $(AM_YFLAGS) $(srcdir)/parse-datetime.y \
        && test ':' = '$(PARSE_DATETIME_BISON)' || { \
          sed -e 's|".*/parse-datetime\.y"|"parse-datetime.y"|' \
              -e 's|"parse-datetime\.tab\.c"|"parse-datetime.c"|' \
-             -e 's|"parse-datetime\.tab\.h"|"parse-datetime-gen.h"|' \
              < parse-datetime.tab.c > parse-datetime.c-tmp \
-         && sed -e 's|".*/parse-datetime\.y"|"parse-datetime.y"|' \
-                -e 's|"parse-datetime\.tab\.h"|"parse-datetime-gen.h"|' \
-                < parse-datetime.tab.h > parse-datetime-gen.h-tmp \
-         && rm -f parse-datetime.tab.c parse-datetime.tab.h \
-         && mv parse-datetime.c-tmp $(srcdir)/parse-datetime.c \
-         && mv parse-datetime-gen.h-tmp $(srcdir)/parse-datetime-gen.h; \
+         && rm -f parse-datetime.tab.c \
+         && mv parse-datetime.c-tmp $(srcdir)/parse-datetime.c; \
        }
-.PHONY: generate-parse-datetime
-# The above rule will generate files with time stamp order
-# parse-datetime.y <= parse-datetime.c <= parse-datetime-gen.h.
-parse-datetime.c: parse-datetime.y
-       @{ test -f $(srcdir)/parse-datetime.c && test ! $(srcdir)/parse-datetime.c -ot $(srcdir)/parse-datetime.y; } || $(MAKE) generate-parse-datetime
-parse-datetime-gen.h: parse-datetime.c
-       @{ test -f $(srcdir)/parse-datetime-gen.h && test ! $(srcdir)/parse-datetime-gen.h -ot $(srcdir)/parse-datetime.c; } || $(MAKE) generate-parse-datetime
 lib_SOURCES += parse-datetime.y
-BUILT_SOURCES += parse-datetime.c parse-datetime-gen.h
-MOSTLYCLEANFILES += parse-datetime.tab.c parse-datetime.tab.h parse-datetime.c-tmp parse-datetime-gen.h-tmp
-MAINTAINERCLEANFILES += parse-datetime.c parse-datetime-gen.h
-EXTRA_DIST += parse-datetime.c parse-datetime-gen.h
+BUILT_SOURCES += parse-datetime.c
+MOSTLYCLEANFILES += parse-datetime.tab.c parse-datetime.c-tmp
+MAINTAINERCLEANFILES += parse-datetime.c
+EXTRA_DIST += parse-datetime.c
 
 Include:
 "parse-datetime.h"