646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
32 lines
681 B
Diff
32 lines
681 B
Diff
diff --git a/Makefile b/Makefile
|
|
index b0b682cb..513822d9 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -58,17 +58,14 @@ endif
|
|
|
|
INCDIRS = \
|
|
-isystem ./lib/ncurses/include \
|
|
- -iquote ./lib/libgit2/include \
|
|
-iquote ./src \
|
|
-iquote .
|
|
|
|
LIBDIRS = \
|
|
- -L./lib/libgit2/build-$(PLATFORM) \
|
|
-L./lib/ncurses/build-$(PLATFORM)
|
|
|
|
LIBS = \
|
|
-lgit2 \
|
|
- -lz \
|
|
-lpthread \
|
|
-lformw \
|
|
-lmenuw \
|
|
@@ -102,7 +99,7 @@ $(OBJS): | lib $(GITHASHHEADER)
|
|
# Libs: execute make from `lib` directory
|
|
.PHONY: lib
|
|
lib:
|
|
- $(MAKE) -C $@
|
|
+ $(MAKE) -C $@ ncurses/$(BUILDROOT)
|
|
|
|
# C rule
|
|
$(BUILDDIR)/%.o: %.c
|