Skip to content

Commit 19dfaa1

Browse files
committed
Fixes dependencies in Makefile to rebuild after reconfiguring.
This lets us get rid of the warning for that in the configure script itself. Signed-off-by: Nathan Ringo <me@remexre.com>
1 parent d8dd818 commit 19dfaa1

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,24 +67,24 @@ watch:
6767
.SUFFIXES:
6868

6969
define common_rules_for_dir
70-
$(2)%.o: $(srcdir)/$(2)%.c
70+
$(2)%.o: $(srcdir)/$(2)%.c config.mak
7171
@mkdir -p $$(dir $$@)
7272
@echo "CC $$@"
7373
$(Q)$(CC) -c -o $$@ $$($(1)-cflags) $$<
7474

75-
$(2)%.o: $(srcdir)/$(2)%.S
75+
$(2)%.o: $(srcdir)/$(2)%.S config.mak
7676
@mkdir -p $$(dir $$@)
7777
@echo "AS $$@"
7878
$(Q)$(CC) -c -o $$@ $$($(1)-cflags) $$<
7979

8080
# https://www.gnu.org/software/make/manual/html_node/Automatic-Prerequisites.html
81-
$(2)%.d: $(srcdir)/$(2)%.c
81+
$(2)%.d: $(srcdir)/$(2)%.c config.mak
8282
@mkdir -p $$(dir $$@)
8383
@set -e; rm -f $$@; \
8484
trap 'rm -f $$@.$$$$$$$$' EXIT; \
8585
$(CC) -M $$($(1)-cflags) $$< > $$@.$$$$$$$$; \
8686
sed 's,$$(notdir $$(@:%.d=%.o))[ :]*,$$(@:%.d=%.o) $$@ : ,g' < $$@.$$$$$$$$ > $$@
87-
$(2)%.d: $(srcdir)/$(2)%.S
87+
$(2)%.d: $(srcdir)/$(2)%.S config.mak
8888
@mkdir -p $$(dir $$@)
8989
@set -e; rm -f $$@; \
9090
trap 'rm -f $$@.$$$$$$$$' EXIT; \

configure

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,6 @@ if [[ -e Makefile ]]; then
117117
if [[ "$(realpath Makefile)" != "$(realpath "$repo/Makefile")" ]]; then
118118
printf >&2 './configure: a different Makefile already exists\n'
119119
exit 1
120-
else
121-
printf >&2 "./configure: already configured; you probably want to run \`make clean' to get rid of old build artifacts\n"
122120
fi
123121
else
124122
ln -s "$repo/Makefile" Makefile

0 commit comments

Comments
 (0)