Added static & shared library targets; as well as install & uninstall targets.

TODO: Add functional test target.

Fortune for memfd_secret-shim's current commit: Small curse − 小凶

.gitignore

@@ -6,4 +6,5 @@ perf/
 *-debug
 *-release
 *.so
+*.so.*
 *.gch

Makefile

@@ -17,18 +17,30 @@ INCLUDE_PCH_GLOBAL?=0
 INCLUDE_GLOBAL=
 
 # Link to these libraries dynamicalls
-SHARED_LIBS=fmt
+SHARED_LIBS=
 # Link to these libraries statically
 STATIC_LIBS=
 
+# Prefix for un/install targets
+ifeq ($(PREFIX),)
+	PREFIX := /usr/local
+endif
+
+# Default archivers
+AR?=ar
+RANLIB?=ranlib
+
+# Use gcc-{ar,ranlib} when using gcc
+ifeq ($(CXX),g++)
+	AR:=gcc-ar
+	RANLIB:=gcc-ranlib
+endif
+
 # Pre-compile these headers
 PCH_HEADERS+=
 # PCH_HEADERS depend on these header files
 PCH_INCLUDES+=
 
-# Link executable statically (in release builds only.)
-STATIC?=no
-
 # Compile-time default program features (see `Features application` below.)
 FEATURES?=
 
@@ -38,6 +50,12 @@ CONSTANTS+=_GNU_SOURCE
 override __COMMA=,
 override __VERSION_SPLIT:= $(subst ., ,$(VERSION))
 override __VERSION_REVISION:=$(word 3,$(__VERSION_SPLIT)) 0
+
+VERSION_MAJOR:= $(word 1,$(__VERSION_SPLIT))
+VERSION_MINOR:= $(word 2,$(__VERSION_SPLIT))
+VERSION_BUGFIX:= $(word 3,$(__VERSION_SPLIT))
+VERSION_REVISION:= $(word 2,$(subst r, ,$(__VERSION_REVISION)))
+
 override __VERSION_SPLIT:= MAJOR:$(word 1,$(__VERSION_SPLIT)) MINOR:$(word 2,$(__VERSION_SPLIT)) BUGFIX:$(word 1,$(subst r, ,$(__VERSION_REVISION))) REVISION:$(word 2,$(subst r, ,$(__VERSION_REVISION))) REVISION_STRING:$(word 3,$(__VERSION_SPLIT))
 
 COMMON_FLAGS+= -W -Wall 
@@ -51,14 +69,27 @@ COMMON_FLAGS+= $(addprefix -D_VERSION_,$(subst :,=,$(__VERSION_SPLIT))) '-D_VERS
 ARCH?=native
 CPU?=native
 # Enable OpenMP and loop parallelisation? (dyn-links to openmp)
-PARALLEL?=yes
+PARALLEL?=no
 # Enable CPU-specific features
 CPU_FLAGS?=
 
+BINFLAGS+=
+DEBUG_BINFLAGS+=
+RELEASE_BINFLAGS+= -fuse-linker-plugin
+
 OPT_FLAGS?= -fgraphite \
 	    -floop-interchange -ftree-loop-distribution -floop-strip-mine -floop-block \
 	    -fno-stack-check
 
+# Static and shared common flags
+SHARED_FLAGS+=-fPIC
+SHARED_RELEASE_FLAGS+=
+SHARED_DEBUG_FLAGS+=
+
+STATIC_FLAGS+=
+STATIC_RELEASE_FLAGS+=-ffat-lto-objects
+STATIC_DEBUG_FLAGS+=
+
 # Features application
 
 ## Tell program which features are enabled via `FEATURE_<feature name in UPPER_SNAKE_CASE>`.
@@ -83,7 +114,8 @@ ifneq ($(CPU),)
 endif
 
 ifeq ($(PARALLEL),yes)
-	OPT_FLAGS+= -fopenmp -floop-parallelize-all -ftree-parallelize-loops=4
+	SHARED_FLAGS+= -fopenmp 
+	SHARED_RELEASE_FLAGS+= -floop-parallelize-all -ftree-parallelize-loops=4
 endif
 
 COMMON_FLAGS+=$(addprefix -m,$(CPU_FLAGS))
@@ -103,7 +135,7 @@ DEBUG_COMMON_FLAGS+= -ggdb -gz -ftrapv -fbounds-check
 ifneq ($(TARGET_SPEC_FLAGS),no)
 	RELEASE_CFLAGS?=   -O3 -flto $(OPT_FLAGS)
 	RELEASE_CXXFLAGS?= -O3 -flto $(CXX_OPT_FLAGS)
-	RELEASE_LDFLAGS?=  -Wl,-O3 -Wl,-flto -fuse-linker-plugin
+	RELEASE_LDFLAGS?=  -Wl,-O3 -Wl,-flto
 
 	DEBUG_CFLAGS?= -Og	
 	DEBUG_CXXFLAGS?= -Og
@@ -111,10 +143,6 @@ ifneq ($(TARGET_SPEC_FLAGS),no)
 	DEBUG_LDFLAGS?=
 endif
 
-ifeq ($(STATIC),yes)
-	RELEASE_LDFLAGS+=-static
-endif
-
 DEBUG_CFLAGS+=-DDEBUG $(DEBUG_COMMON_FLAGS)
 DEBUG_CXXFLAGS+=-DDEBUG $(DEBUG_COMMON_FLAGS) -fasynchronous-unwind-tables
 
@@ -169,7 +197,7 @@ CFLAGS   += $(COMMON_FLAGS) --std=$(CSTD)
 CXXFLAGS += $(COMMON_FLAGS) --std=$(CXXSTD) 
 LDFLAGS  += $(addsuffix .a,$(addprefix -l:lib,$(STATIC_LIBS))) $(addprefix -l,$(SHARED_LIBS))
 
-# PGO
+# PGO (unused for lib targets)
 
 PROF_FLAGS= -D_PGO_GEN -fprofile-generate
 PGO_OBJ_C= $(addprefix prof/c/,$(SRC_C:.c=.o))
@@ -184,14 +212,27 @@ PROF_SMALL_BOUND= 1024
 # Phonies
 
 # XXX: This doesn't force them to run in series for some reason?
+
 .PHONY: release
-release: | dirs $(PROJECT)-release
+release: | dirs
+	$(MAKE) lib$(PROJECT).a
+	@$(MAKE) clean-rebuild >> /dev/null
+	@$(MAKE) dirs >> /dev/null
+	$(MAKE) lib$(PROJECT).so
 
 .PHONY: debug
-debug: | dirs $(PROJECT)-debug
+debug: | dirs
-
+	$(MAKE) lib$(PROJECT)-debug.a
-.PHONY: pgo
+	@$(MAKE) clean-rebuild >> /dev/null
-pgo: | dirs $(PROJECT)-pgo
+	@$(MAKE) dirs >> /dev/null
+	$(MAKE) lib$(PROJECT)-debug.so
+
+# Rebuild both release and debug targets from scratch
+.PHONY: all
+all: | clean
+	@$(MAKE) release
+	@$(MAKE) clean-rebuild
+	@$(MAKE) debug
 
 # Targets
 
@@ -239,75 +280,43 @@ prof/cxx/%.o: %.cpp $(PCH_OUTPUT)
 	$(CXX) -c $< $(CXXFLAGS) -o $@ $(PROF_FLAGS) 
 #$(LDFLAGS)
 
-$(PROJECT)-release: CFLAGS+= $(RELEASE_CFLAGS) $(PCH_USE_CFLAGS)
+lib$(PROJECT)-release.a: CFLAGS+= $(RELEASE_CFLAGS) $(STATIC_FLAGS) $(STATIC_RELEASE_FLAGS)
-$(PROJECT)-release: CXXFLAGS += $(RELEASE_CXXFLAGS) $(PCH_USE_CXXFLAGS)
+lib$(PROJECT)-release.a: CXXFLAGS += $(RELEASE_CXXFLAGS) $(STATIC_FLAGS) $(STATIC_RELEASE_FLAGS)
-$(PROJECT)-release: LDFLAGS += $(RELEASE_LDFLAGS)
+lib$(PROJECT)-release.a: LDFLAGS += $(RELEASE_LDFLAGS)
-$(PROJECT)-release: $(OBJ)
+lib$(PROJECT)-release.a: $(OBJ)
-	$(CXX) $^ $(CXXFLAGS) -o $@ $(LDFLAGS)
+	$(AR) rcs $@ $^
+	$(RANLIB) $@
+
+lib$(PROJECT)-debug.a: CFLAGS+= $(DEBUG_CFLAGS) $(STATIC_FLAGS) $(STATIC_DEBUG_FLAGS)
+lib$(PROJECT)-debug.a: CXXFLAGS += $(DEBUG_CXXFLAGS) $(STATIC_FLAGS) $(STATIC_DEBUG_FLAGS)
+lib$(PROJECT)-debug.a: LDFLAGS += $(DEBUG_LDFLAGS)
+lib$(PROJECT)-debug.a: $(OBJ)
+	$(AR) rcs $@ $^ 
+	$(RANLIB) $@
+
+lib$(PROJECT)-release.so: CFLAGS+= $(RELEASE_CFLAGS) $(SHARED_FLAGS) $(SHARED_RELEASE_FLAGS)
+lib$(PROJECT)-release.so: CXXFLAGS += $(RELEASE_CXXFLAGS) $(SHARED_FLAGS) $(SHARED_RELEASE_FLAGS)
+lib$(PROJECT)-release.so: LDFLAGS += $(RELEASE_LDFLAGS)
+lib$(PROJECT)-release.so: BINFLAGS += $(RELEASE_BINFLAGS)
+lib$(PROJECT)-release.so: $(OBJ)
+	$(CXX) -shared $^ $(BINFLAGS) $(CXXFLAGS) -o $@ $(LDFLAGS)
 	$(STRIP) $@
 
-$(PROJECT)-debug: CFLAGS+= $(DEBUG_CFLAGS) $(PCH_USE_CFLAGS)
+lib$(PROJECT)-debug.so: CFLAGS+= $(DEBUG_CFLAGS) $(SHARED_FLAGS) $(SHARED_DEBUG_FLAGS)
-$(PROJECT)-debug: CXXFLAGS += $(DEBUG_CXXFLAGS) $(PCH_USE_CXXFLAGS)
+lib$(PROJECT)-debug.so: CXXFLAGS += $(DEBUG_CXXFLAGS) $(SHARED_FLAGS) $(SHARED_DEBUG_FLAGS)
-$(PROJECT)-debug: LDFLAGS += $(DEBUG_LDFLAGS)
+lib$(PROJECT)-debug.so: LDFLAGS += $(DEBUG_LDFLAGS)
-$(PROJECT)-debug: $(OBJ)
+lib$(PROJECT)-debug.so: BINFLAGS += $(DEBUG_BINFLAGS)
-	$(CXX) $^ $(CXXFLAGS) -o $@ $(LDFLAGS)
+lib$(PROJECT)-debug.so: $(OBJ)
-
+	$(CXX) -shared $^ $(BINFLAGS) $(CXXFLAGS) -o $@ $(LDFLAGS)
-pgo-reset:
+
-	find -O3 prof -type f -name \*.gcda -exec rm {} +
+lib$(PROJECT).a: lib$(PROJECT)-release.a
-
+	ln -f $< $@
-pgo-generate: CFLAGS+= $(RELEASE_CFLAGS) $(PCH_USE_CFLAGS)
+
-pgo-generate: CXXFLAGS+= $(RELEASE_CXXFLAGS) $(PCH_USE_CXXFLAGS)
+lib$(PROJECT).so: LDFLAGS+= -Wl,-soname,lib$(PROJECT).so.$(VERSION_MAJOR)
-pgo-generate: LDFLAGS+= $(RELEASE_LDFLAGS) 
+lib$(PROJECT).so: lib$(PROJECT)-release.so
-pgo-generate: $(PGO_OBJ)
+	ln -f $< $@.$(VERSION)
-	$(CXX) $^ $(CXXFLAGS) $(PROF_FLAGS) -o $@ $(LDFLAGS) $(PROF_FLAGS)
+	ln -sf $@.$(VERSION) $@.$(VERSION_MAJOR)
-	
+	ln -sf $@.$(VERSION_MAJOR) $@
-pgo-profile: | pgo-generate pgo-reset
-	set -e errexit && shopt -s inherit_errexit && set -eo pipefail; \
-	rm -rf $(PROF_LOCATION); \
-	for i in {0..$(PROF_ITERATIONS)}; do \
-		>&2 printf ">>> Iteration $$i   \b\b"; \
-		mkdir -p $(PROF_LOCATION)/{direct,indirect}; \
-		for j in {0..$(PROF_LARGE_BOUND)}; do \
-			./pgo-generate; \
-		done > $(PROF_LOCATION)/full; \
-		for j in {0..$(PROF_SMALL_BOUND)}; do \
-			./pgo-generate > $(PROF_LOCATION)/direct/$$j; \
-		done; \
-		for j in {0..$(PROF_SMALL_BOUND)}; do \
-			./pgo-generate >> $(PROF_LOCATION)/indirect/$$i; \
-		done; \
-		for j in {0..$(PROF_SMALL_BOUND)}; do \
-			./pgo-generate > $(PROF_LOCATION)/direct/$$i-$$j & : ; \
-		done; \
-		for j in {0..$(PROF_SMALL_BOUND)}; do \
-			./pgo-generate >> $(PROF_LOCATION)/indirect/$$i-$$j & : ; \
-		done; \
-		for j in {0..$(PROF_SMALL_BOUND)}; do \
-			./pgo-generate >/dev/null & : ; \
-		done; \
-		wait; \
-		rm -rf $(PROF_LOCATION)/{direct,indirect,full}; \
-		>&2 printf "OK\r"; \
-	done
-	@echo ""
-	rm -rf $(PROF_LOCATION)
-	rm pgo-generate
-	
-pgo-use: CFLAGS+= $(RELEASE_CFLAGS) $(PCH_USE_CFLAGS)
-pgo-use: CXXFLAGS+= $(RELEASE_CXXFLAGS) $(PCH_USE_CXXFLAGS)
-pgo-use: LDFLAGS+= $(RELEASE_LDFLAGS) 
-pgo-use: PROF_FLAGS = -fprofile-use -fprofile-correction
-pgo-use: $(PGO_OBJ)
-	$(CXX) $^ $(CXXFLAGS) $(PROF_FLAGS) -o $@ $(LDFLAGS) $(PROF_FLAGS)
-
-$(PROJECT)-pgo: CFLAGS+= $(RELEASE_CFLAGS) $(PCH_USE_CFLAGS)
-$(PROJECT)-pgo: CXXFLAGS+= $(RELEASE_CXXFLAGS) $(PCH_USE_CXXFLAGS)
-$(PROJECT)-pgo: LDFLAGS+= $(RELEASE_LDFLAGS)
-$(PROJECT)-pgo: pgo-profile
-	find -O3 ./prof -type f -name \*.o -exec rm {} +
-	$(MAKE) pgo-use
-	mv pgo-use $@
-	strip $@
 
 clean-source:
 	find -O2 {obj,prof}/ -type f -exec rm {} +
@@ -317,7 +326,27 @@ clean-rebuild: clean-source
 
 
 clean: clean-rebuild
-	rm -f $(PROJECT)-{release,debug,pgo}
+	rm -f lib$(PROJECT){,-{release,debug,pgo}}.{a,so{,.*}}
+	rm -f $(PROJECT)-test
 
 clean-full: clean
 	rm -rf {obj,prof}
+
+install:
+	install -d $(DESTDIR)$(PREFIX)/lib/
+	install -m 644 lib$(PROJECT).a $(DESTDIR)$(PREFIX)/lib/
+	install -s -m 755 lib$(PROJECT).so.$(VERSION) $(DESTDIR)$(PREFIX)/lib/
+	ln -sf lib$(PROJECT).so.$(VERSION) $(DESTDIR)$(PREFIX)/lib/lib$(PROJECT).so.$(VERSION_MAJOR)
+	ln -sf lib$(PROJECT).so.$(VERSION_MAJOR) $(DESTDIR)$(PREFIX)/lib/lib$(PROJECT).so
+	install -d $(DESTDIR)$(PREFIX)/include/$(PROJECT)/
+	install -m 644 $(wildcard $(INCLUDE)/*.*) $(DESTDIR)$(PREFIX)/include/$(PROJECT)/
+uninstall:
+	-rm $(DESTDIR)$(PREFIX)/lib/lib$(PROJECT).{a,so{,.*}}
+	cd $(INCLUDE) && find . -type f | xargs -I {} rm "$(DESTDIR)$(PREFIX)/include/$(PROJECT)/{}"
+	rmdir $(DESTDIR)$(PREFIX)/include/$(PROJECT)
+
+$(PROJECT)-test: LDFLAGS+= -lfmt -lstdc++
+$(PROJECT)-test: CFLAGS+= -Og -g
+$(PROJECT)-test: lib$(PROJECT)-debug.a
+	$(CC) $(CFLAGS) src/test/*.c -o $@ -l:$< $(LDFLAGS)
+	-valgrind ./$@