.

1 files changed, 15 insertions, 27 deletions

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 55a95ad7c..a338d3564 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -41,15 +41,15 @@ transform = @program_transform_name@
 noinst_LIBRARIES = fu
 
 EXTRA_DIST = basename.c euidaccess.c \
-getdate.y group-member.c memcpy.c memset.c \
-mkdir.c posixtm.y \
+group-member.c memcpy.c memset.c \
+mkdir.c \
 rename.c rmdir.c rpmatch.c \
 stpcpy.c strcasecmp.c strdup.c strndup.c strstr.c strtol.c strtoul.c
 
 INCLUDES = -I.. -I$(srcdir)
 INCLUDES = -I.. -I$(srcdir) -I../intl
 
-fu_SOURCES = getdate.c getopt.c getopt1.c posixtm.c \
+fu_SOURCES = getdate.y posixtm.y getopt.c getopt1.c \
 argmatch.c backupfile.c dirname.c filemode.c \
 full-write.c getversion.c idcache.c \
 isdir.c long-options.c makepath.c modechange.c path-concat.c \
@@ -76,7 +76,7 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I..
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
-fu_OBJECTS =  getdate.o getopt.o getopt1.o posixtm.o argmatch.o \
+fu_OBJECTS =  getdate.o posixtm.o getopt.o getopt1.o argmatch.o \
 backupfile.o dirname.o filemode.o full-write.o getversion.o idcache.o \
 isdir.o long-options.o makepath.o modechange.o path-concat.o \
 safe-read.o save-cwd.o savedir.o stripslash.o userspec.o xgetcwd.o \
@@ -86,6 +86,9 @@ LIBFILES  =  $(pkglib_LIBFILES) $(noinst_LIBFILES) $(check_LIBFILES) \
 $(lib_LIBFILES)
 AR = ar
 RANLIB = @RANLIB@
+YACC = @YACC@
+INTERLOCK = ./interlock
+YLWRAP = ./ylwrap
 CC = @CC@
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
@@ -93,8 +96,9 @@ LINK = $(CC) $(LDFLAGS) -o $@
 HEADERS =  $(noinst_HEADERS)
 
 DIST_COMMON =  Makefile.am Makefile.in alloca.c error.c error.h \
-fileblocks.c fnmatch.c fsusage.c ftruncate.c getline.c mktime.c \
-mountlist.c obstack.c obstack.h regex.c regex.h rx.c rx.h
+fileblocks.c fnmatch.c fsusage.c ftruncate.c getdate.c getline.c \
+interlock mktime.c mountlist.c obstack.c obstack.h posixtm.c regex.c \
+regex.h rx.c rx.h ylwrap
 
 
 PACKAGE = @PACKAGE@
@@ -125,7 +129,7 @@ default: all
 $(srcdir)/Makefile.in: @MAINT@Makefile.am $(top_srcdir)/configure.in
 	cd $(top_srcdir) && automake $(subdir)/Makefile
 
-Makefile: $(top_builddir)/config.status $(srcdir)/Makefile.in
+Makefile: $(top_builddir)/config.status $(srcdir)/Makefile.in $(BUILT_SOURCES)
 	cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
 
 mostlyclean-noinstLIBRARIES:
@@ -155,6 +159,8 @@ libfu.a: $(fu_OBJECTS) $(fu_DEPENDENCIES)
 	rm -f libfu.a
 	$(AR) cru libfu.a $(fu_OBJECTS) $(fu_LIBADD)
 	$(RANLIB) libfu.a
+.y.c:
+	$(INTERLOCK) =yacclockdir $(YLWRAP) "$(YACC)" y.tab.c $*.c y.tab.h $*.h -- $(YFLAGS) $<
 
 ID: $(HEADERS) $(SOURCES)
 	here=`pwd` && cd $(srcdir) && mkid -f$$here/ID $(SOURCES) $(HEADERS)
@@ -186,7 +192,7 @@ distdir: $(DEP_DISTFILES)
 MKDEP = gcc -M $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
 
 -include .deps/.P
-.deps/.P: $(BUILT_SOURCES)
+.deps/.P:
 	test -d .deps || mkdir .deps
 	echo > $@
 
@@ -273,26 +279,8 @@ installcheck install-exec install-data install uninstall all \
 installdirs mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
-
-# Since this directory contains two parsers, we have to be careful to avoid
-# running two $(YACC)s during parallel makes.  See below.
-getdate.c: @MAINT@getdate.y
-	@echo expect 10 shift/reduce conflicts
-	$(YACC) $(srcdir)/getdate.y
-	mv y.tab.c getdate.c
-
-# Make the rename atomic, in case sed is interrupted and later rerun.
-# The artificial dependency on getdate.c keeps the two parsers from being
-# built in parallel.  Enforcing this little bit of sequentiality lets
-# everyone (even those without bison) still run mostly parallel builds.
-posixtm.c: @MAINT@posixtm.y getdate.c
-	$(YACC) $(srcdir)/posixtm.y
-	mv y.tab.c posixtm.tab.c
-	sed -e 's/yy/zz/g' posixtm.tab.c > tposixtm.c
-	mv tposixtm.c posixtm.c
-	rm -f posixtm.tab.c
 .SUFFIXES:
-.SUFFIXES: .c .o
+.SUFFIXES: .c .o .y
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.