From add2520e49da79357b7759d65f7c0863d88669b3 Mon Sep 17 00:00:00 2001
From: Elizabeth Hunt <elizabeth.hunt@simponic.xyz>
Date: Wed, 11 Oct 2023 17:00:38 -0600
Subject: bug fixes and fix compilation on gcc

---
 Makefile | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index a76a59f..176e8cd 100644
--- a/Makefile
+++ b/Makefile
@@ -5,30 +5,26 @@ BIN_DIR := dist
 LIB_DIR := lib
 
 TEST_EXE := $(BIN_DIR)/lizfcm.test
-EXE := $(BIN_DIR)/lizfcm
-LIBRARY := $(LIB_DIR)/lizfcm.a
-SRC := $(wildcard $(SRC_DIR)/*.c)
-OBJ := $(SRC:$(SRC_DIR)/%.c=$(OBJ_DIR)/%.o)
+EXE      := $(BIN_DIR)/lizfcm
+LIBRARY  := $(LIB_DIR)/lizfcm.a
+SRC      := $(wildcard $(SRC_DIR)/*.c)
+OBJ      := $(SRC:$(SRC_DIR)/%.c=$(OBJ_DIR)/%.o)
 
 CPPFLAGS := -Iinc -MMD -MP
 CFLAGS   := -Wall
-LDFLAGS  := 
-LDLIBS   := -lm
+LDFLAGS  := -lm
 
 .PHONY: all clean
 
 all: $(TEST_EXE)
 
-$(TEST_EXE): $(LIBRARY)
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(LIBRARY) $(TEST_SRC) -o $@
+$(TEST_EXE): $(BIN_DIR) | $(LIBRARY)
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(TEST_SRC) $(LIBRARY) -o $@
 
-$(LIBRARY): $(EXE)
+$(LIBRARY): $(OBJ)
 	ar rcs $(LIBRARY) $(OBJ_DIR)/*.o
 	ranlib $(LIBRARY)
 
-$(EXE): $(OBJ) | $(BIN_DIR)
-	$(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@
-
 $(OBJ_DIR)/%.o: $(SRC_DIR)/%.c | $(OBJ_DIR)
 	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
 
-- 
cgit v1.2.3-70-g09d2