xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rework Makefile compile type tag handling

Browse Source 
Rename suffix to tag as it ends up not being the filename suffix,
apply that tag to .o and .d files so that changing the build type
does not wipe/reuse files from another build type.

Make .d file hidden files, this does not seem possible for the .o
files as they are targets and posix support inference rules when only
the suffix changes. This is not a big issue as Kakoune ignores those
files by default.
This commit is contained in:
Maxime Coste 2024-02-29 19:39:09 +11:00
parent 165cdba67c
commit 10b6b7eb71
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Makefile
View File

@ -1,6 +1,5 @@
.POSIX: .POSIX:
.SUFFIXES: .SUFFIXES:
.SUFFIXES: .o .cc
CXX = c++ CXX = c++
@ -15,28 +14,24 @@ compress-suffix-zstd = zst
CPPFLAGS-debug-yes = -DKAK_DEBUG CPPFLAGS-debug-yes = -DKAK_DEBUG
CXXFLAGS-debug-yes = -O0 -g CXXFLAGS-debug-yes = -O0 -g
suffix-debug-yes = .debug tag-debug-yes = .debug
CXXFLAGS-debug-no = -O3 CXXFLAGS-debug-no = -O3
suffix-debug-no = .opt tag-debug-no = .opt
CXXFLAGS-sanitize-address = -fsanitize=address CXXFLAGS-sanitize-address = -fsanitize=address
LDFLAGS-sanitize-address = -lasan LDFLAGS-sanitize-address = -lasan
suffix-sanitize-address = .san_a tag-sanitize-address = .san_a
CXXFLAGS-sanitize-undefined = -fsanitize=undefined CXXFLAGS-sanitize-undefined = -fsanitize=undefined
LDFLAGS-sanitize-undefined = -lubsan LDFLAGS-sanitize-undefined = -lubsan
suffix-sanitize-undefined = .san_u tag-sanitize-undefined = .san_u
LDFLAGS-static-yes = -static -pthread LDFLAGS-static-yes = -static -pthread
version != cat .version 2>/dev/null || git describe --tags HEAD 2>/dev/null || echo unknown version != cat .version 2>/dev/null || git describe --tags HEAD 2>/dev/null || echo unknown
sources != find src -type f -name '*.cc' | sed -e '/\.version\.cc/d'
deps != find src -type f -name '*.d'
objects = $(sources:.cc=.o)
PREFIX = /usr/local PREFIX = /usr/local
DESTDIR = # root dir DESTDIR = # root dir
@ -98,20 +93,26 @@ KAK_LIBS = \
$(LIBS-os-$(os)) \ $(LIBS-os-$(os)) \
$(LIBS) $(LIBS)
suffix = $(suffix-debug-$(debug))$(suffix-sanitize-$(sanitize)) tag = $(tag-debug-$(debug))$(tag-sanitize-$(sanitize))
.SUFFIXES: $(tag).o .cc
sources != find src -type f -name '*.cc' | sed -e '/\.version\.cc/d'
objects = $(sources:.cc=$(tag).o)
deps != find src -type f -name '.*$(tag).d'
all: src/kak all: src/kak
src/kak: src/kak$(suffix) src/kak: src/kak$(tag)
ln -sf kak$(suffix) $@ ln -sf kak$(tag) $@
src/kak$(suffix): src/.version.o $(objects) src/kak$(tag): src/.version.o $(objects)
$(CXX) $(KAK_LDFLAGS) $(KAK_CXXFLAGS) $(KAK_LIBS) $(objects) src/.version.o -o $@ $(CXX) $(KAK_LDFLAGS) $(KAK_CXXFLAGS) $(KAK_LIBS) $(objects) src/.version.o -o $@
include $(deps) include $(deps)
.cc.o: .cc$(tag).o:
$(CXX) $(KAK_CPPFLAGS) $(KAK_CXXFLAGS) -MD -MP -MF $*.d -c -o $@ $< $(CXX) $(KAK_CPPFLAGS) $(KAK_CXXFLAGS) -MD -MP -MF $(*D)/.$(*F)$(tag).d -c -o $@ $<
src/.version.cc: src/.version.cc:
echo 'namespace Kakoune { const char *version = "$(version)"; }' > $@ echo 'namespace Kakoune { const char *version = "$(version)"; }' > $@
@ -153,7 +154,7 @@ kakoune-$(version).tar:
rm -f src/.version rm -f src/.version
distclean: clean distclean: clean
rm -f src/kak src/kak$(suffix) rm -f src/kak src/kak$(suffix) src/.*.d src/*.o
find doc -type f -name '*.gz' -exec rm -f '{}' + find doc -type f -name '*.gz' -exec rm -f '{}' +
installdirs: installdirs-debug-$(debug) installdirs: installdirs-debug-$(debug)