From 77ce14c2d963df704d272ab42a1a8a441ffc031a Mon Sep 17 00:00:00 2001 From: "C. McEnroe" Date: Wed, 23 Dec 2020 22:19:17 +0000 Subject: Fix dash Makefile compatibility with BSD make --- bin/dash/src/Makefile.am | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/bin/dash/src/Makefile.am b/bin/dash/src/Makefile.am index 17324653..fb8229f1 100644 --- a/bin/dash/src/Makefile.am +++ b/bin/dash/src/Makefile.am @@ -34,7 +34,7 @@ HELPERS = mkinit mksyntax mknodes mksignames BUILT_SOURCES = builtins.h nodes.h syntax.h token.h token_vars.h CLEANFILES = \ - $(BUILT_SOURCES) $(patsubst %.o,%.c,$(dash_LDADD)) \ + $(BUILT_SOURCES) $(dash_LDADD:%.o=%.c) \ $(HELPERS) builtins.def man_MANS = dash.1 @@ -44,27 +44,27 @@ EXTRA_DIST = \ mknodes.c nodetypes nodes.c.pat mksyntax.c mksignames.c token.h token_vars.h: mktokens - $(AM_V_GEN)$(SHELL) $^ + $(AM_V_GEN)$(SHELL) mktokens builtins.def: builtins.def.in $(top_builddir)/config.h - $(AM_V_CC)$(COMPILE) -E -x c -o $@ $< + $(AM_V_CC)$(COMPILE) -E -x c -o $@ builtins.def.in builtins.c builtins.h: mkbuiltins builtins.def - $(AM_V_GEN)$(SHELL) $^ + $(AM_V_GEN)$(SHELL) mkbuiltins builtins.def init.c: mkinit $(dash_CFILES) - $(AM_V_GEN)./$^ + $(AM_V_GEN)./mkinit $(dash_CFILES) nodes.c nodes.h: mknodes nodetypes nodes.c.pat - $(AM_V_GEN)./$^ + $(AM_V_GEN)./mknodes nodetypes nodes.c.pat syntax.c syntax.h: mksyntax - $(AM_V_GEN)./$^ + $(AM_V_GEN)./mksyntax signames.c: mksignames - $(AM_V_GEN)./$^ + $(AM_V_GEN)./mksignames mksyntax: token.h -$(HELPERS): %: %.c - $(AM_V_CC)$(COMPILE_FOR_BUILD) -o $@ $< +$(HELPERS): + $(AM_V_CC)$(COMPILE_FOR_BUILD) -o $@ $@.c -- cgit 1.4.1