Improve Makefile compatibility

make now runs cleanly on default BSD make. This uglies it up a little,
but it was so close it might as well be made as widely compatible as
possible.

1 files changed, 9 insertions, 6 deletions

diff --git a/Makefile b/Makefile
index 43ba4da..5d0056c 100644
--- a/Makefile
+++ b/Makefile
@@ -11,19 +11,22 @@ INSTALL=install
 INSTALL_PROGRAM=$(INSTALL)
 INSTALL_DATA=${INSTALL} -m 644
 
+OBJECTS=fzy.o match.o tty.o choices.o
+TESTOBJECTS=fzytest.o match.o choices.o
+
 all: fzy
 
-fzytest: fzytest.o match.o choices.o
-	$(CC) $(CFLAGS) $(CCFLAGS) -o $@ $^
+fzytest: $(TESTOBJECTS)
+	$(CC) $(CFLAGS) $(CCFLAGS) -o $@ $(TESTOBJECTS)
 
 test: check
 check: fzytest
 	$(DEBUGGER) ./fzytest
 
-fzy: fzy.o match.o tty.o choices.o
-	$(CC) $(CFLAGS) $(CCFLAGS) -o $@ $^
+fzy: $(OBJECTS)
+	$(CC) $(CFLAGS) $(CCFLAGS) -o $@ $(OBJECTS)
 
-%.o: %.c config.h
+.c.o: config.h
 	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
 
 config.h:
@@ -39,6 +42,6 @@ fmt:
 	clang-format -i *.c *.h
 
 clean:
-	$(RM) fzy fzytest *.o
+	rm -f fzy fzytest *.o
 
 .PHONY: test check all clean install fmt