From eeb5459f9df70b1875c0698838edebb2ab701852 Mon Sep 17 00:00:00 2001
From: Bob Polis <rpb.polis@avans.nl>
Date: Thu, 9 Feb 2023 18:58:58 +0100
Subject: [PATCH] Modernized Makefile

---
 Makefile | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 7a03e23..f7026f1 100644
--- a/Makefile
+++ b/Makefile
@@ -21,21 +21,20 @@ STATICLIB := $(LIBNAME).a
 BUILDDIR := build/intermediates/
 PREFIX ?= /usr/local
 BINDIR ?= $(PREFIX)/bin
+MANDIR ?= $(PREFIX)/man
 CONFIGDIR ?= $(PREFIX)/etc
 INCLUDEDIR ?= $(PREFIX)/include
 LIBDIR ?= $(PREFIX)/lib
 DATADIR ?= $(PREFIX)/share
-MANDIR ?= $(DATADIR)/man
 DOCDIR ?= $(DATADIR)/$(LIBNAME)/doc
 
 SRCS := $(notdir $(wildcard src/*.cpp))
 OBJS := $(SRCS:.cpp=.o)
-DEPS := $(SRCS:.cpp=.d)
-HDRS := $(wildcard src/*.hpp)
+HDRS ?= $(wildcard src/*.hpp)
 
 CXX ?= g++
 
-CXXFLAGS += -Wshadow -Wall -Wpedantic -Wextra -g -fno-strict-aliasing -std=c++17 -fPIC
+CXXFLAGS += -Wshadow -Wall -Wpedantic -Wextra -g -std=c++17 -fPIC
 ifeq ($(DEBUG),1)
 	CXXFLAGS += -D DEBUG -O0
 	CONFIG := debug
@@ -59,7 +58,7 @@ all: prebuild $(OUTDIR)$(REALNAME) $(OUTDIR)$(STATICLIB)
 prebuild:
 	@mkdir -p $(BUILDDIR) $(OUTDIR)
 
-$(OUTDIR)$(REALNAME): $(OBJS) $(DEPS)
+$(OUTDIR)$(REALNAME): $(OBJS)
 ifeq ($(UNAME_S),Darwin)
 	$(CXX) -dynamiclib -o $(OUTDIR)$(REALNAME) -current_version $(MAJOR) -compatibility_version $(MINOR) $(LDFLAGS) $(LDLIBS) $(addprefix $(BUILDDIR),$(OBJS))
 endif
@@ -70,13 +69,11 @@ ifeq ($(UNAME_S),Linux)
 	$(CXX) -g -shared -Wl,-soname,$(SONAME) -o $(OUTDIR)$(REALNAME) $(LDFLAGS) $(LDLIBS) $(addprefix $(BUILDDIR),$(OBJS))
 endif
 
-%.o: %.cpp %.d
+%.o %.d: %.cpp
 	$(CXX) $(CXXFLAGS) -MMD -MP -MT $@ -MF $*.d -c $<
 	@mv $@ $*.d $(BUILDDIR)
 
--include $(BUILDDIR)*.d
-
-%.d: ;
+-include $(BUILDDIR)$(SRCS:.cpp=.d)
 
 $(OUTDIR)$(STATICLIB): $(OBJS)
 	ar r $(OUTDIR)$(STATICLIB) $(addprefix $(BUILDDIR),$(OBJS))
@@ -87,7 +84,7 @@ $(LIBNAME).hpp: $(HDRS)
 	@cp /dev/null build/$(LIBNAME).hpp
 	@for h in $(HDRS); \
 	do \
-		cat $$h >> build/$(LIBNAME).hpp; \
+		sed '/@exclude/d' $$h >> build/$(LIBNAME).hpp; \
 	done
 HEADERSRCDIR := build
 else
@@ -108,7 +105,7 @@ install:
 endif
 	$(INSTALL) -d $(LIBDIR)
 	$(INSTALL) -m 644 $(OUTDIR)$(REALNAME) $(LIBDIR)
-	$(INSTALL) -d $(INCLUDEDIR)
+	$(INSTALL) -d $(INCLUDEDIR)/$(LIBNAME)
 	$(INSTALL) -m 644 $(HEADERSRCDIR)/$(LIBNAME).hpp $(INCLUDEDIR)
 ifeq ($(UNAME_S),Darwin)
 	cd $(LIBDIR) && ln -sf $(REALNAME) $(SONAME)