Merge pull request #155 from youpong/cleanup

Makefile

src/Makefile.in

@@ -1,29 +1,29 @@
 TARGET = procfetch
-TEST_TARGET = test
 SRCS = fetch.cpp main.cpp
-TESTS = test.cpp fetch.cpp
 OBJS = $(SRCS:.cpp=.o)
-TEST_OBJS = $(TESTS:.cpp=.o)
 
 CXX = @CXX@
 CXXFLAGS = -std=c++17 -Wall -Wextra --pedantic-errors @CXXFLAGS@
 LIBS = @LIBS@
 LDFLAGS = -pthread
 
+TEST_TARGET = test
+TEST_SRCS = test.cpp fetch.cpp
+TEST_OBJS = $(TEST_SRCS:.cpp=.o)
+TEST_LDFLAGS = $(LDFLAGS) -no-pie
+
 INSTALL = /usr/bin/install -c -D
 FORMATTER = clang-format -i
 BIN_DIR = @BIN_DIR@
 
 all: $(TARGET)
 run: all
 	./$(TARGET)
-build-test:	$(TESTS)
-	$(CXX) $(CXXFLAGS) -c $(TESTS)
-	$(CXX) $(CXXFLAGS) -o $(TEST_TARGET) $(TEST_OBJS) $(LD_FLAGS) -no-pie
+build-test:	$(TEST_TARGET)
 check: build-test
 	./$(TEST_TARGET)
 gcov:
-	gcov $(TESTS)
+	gcov $(TEST_TARGET)
 clean:
 	- rm -f $(TARGET) $(OBJS) $(TEST_TARGET) $(TEST_OBJS) *.gcov *.gcda *.gcno
 install: all
@@ -32,12 +32,14 @@ install: all
 uninstall:
 	- rm "$(BIN_DIR)/$(TARGET)"
 format:
-	$(FORMATTER) $(SRCS) $(TESTS) *.h
+	$(FORMATTER) $(SRCS) $(TEST_TARGET) *.h
 
 $(TARGET): $(OBJS)
 	$(CXX) -o $@ $(OBJS) $(LIBS) $(LDFLAGS)
+$(TEST_TARGET): $(TEST_OBJS)
+	$(CXX) -o $@ $(TEST_OBJS) $(LIBS) $(TEST_LDFLAGS)
 main.o:  fetch.h color.h config.h
 fetch.o: fetch.h color.h
 test.o: fetch.h color.h
 
-.PHONY: all run check gcov clean docs install uninstall dist format gif
+.PHONY: all run check gcov clean docs install uninstall dist format gif build-test