From 5a5ec57d8521a5aa7317d2658ead95b8e2fde5b9 Mon Sep 17 00:00:00 2001 From: Albert Cervin Date: Tue, 9 May 2023 22:51:57 +0200 Subject: Finish buflist implementation Also fix tests and man page install. --- Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 9c8a987..7c58ea5 100644 --- a/Makefile +++ b/Makefile @@ -31,10 +31,11 @@ UNAME_S != uname -s | tr '[:upper:]' '[:lower:]' DEPS = $(DGED_SOURCES:.c=.d) $(TEST_SOURCES:.c=.d) OBJS = $(SOURCES:.c=.o) +PLATFORM_OBJS = $(PLATFORM_SOURCES:.c=.o) MAIN_OBJS = $(MAIN_SOURCES:.c=.o) TEST_OBJS = $(TEST_SOURCES:.c=.o) -FILES = $(DEPS) $(MAIN_OBJS) $(OBJS) dged libdged.a $(TEST_OBJS) +FILES = $(DEPS) $(MAIN_OBJS) $(OBJS) dged libdged.a $(TEST_OBJS) $(PLATFORM_OBJS) # dependency generation .c.d: @@ -49,11 +50,11 @@ FILES = $(DEPS) $(MAIN_OBJS) $(OBJS) dged libdged.a $(TEST_OBJS) dged: $(MAIN_OBJS) libdged.a $(CC) $(LDFLAGS) $(MAIN_OBJS) libdged.a -o dged -lm -libdged.a: $(OBJS) - $(AR) -rc libdged.a $(OBJS) +libdged.a: $(OBJS) $(PLATFORM_OBJS) + $(AR) -rc libdged.a $(OBJS) $(PLATFORM_OBJS) run-tests: $(TEST_OBJS) $(OBJS) - $(CC) $(LDFLAGS) $(TEST_OBJS) $(OBJS) -o run-tests + $(CC) $(LDFLAGS) $(TEST_OBJS) $(OBJS) -lm -o run-tests check: run-tests clang-format --dry-run --Werror $(SOURCES:%.c=../%.c) $(MAIN_SOURCES:%.c=../%.c) $(TEST_SOURCES:%c=../%c) @@ -80,7 +81,7 @@ install: dged install -m 755 $(.OBJDIR)/dged $(prefix)/bin/dged install -d $(prefix)/share/man/man1 - install -m 644 dged.1 $(prefix)/share/man/man1/dged.1 + install -m 644 $(.CURDIR)/dged.1 $(prefix)/share/man/man1/dged.1 docs: doxygen $(.CURDIR)/Doxyfile -- cgit v1.2.3