From b40fcc088e1c638a64259a4e09d4f38d7d40763f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Blanqui?= Date: Tue, 27 Oct 2026 15:53:58 +0100 Subject: [PATCH 1/8] Makefile: use lambdapi depend --- .gitignore | 6 ++---- Makefile | 29 ++++++++++++++++++----------- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 8e3f888..2941bbb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,3 @@ -*.log -*.lpo *~ -log-lp.txt -log-lsp.txt +*.lpo +lpo.mk diff --git a/Makefile b/Makefile index f3fc9b1..44bdf16 100644 --- a/Makefile +++ b/Makefile @@ -1,16 +1,23 @@ -SRC := $(wildcard *.lp) -OBJ := $(SRC:%.lp=%.lpo) +MAKEFLAGS += -r -k -j$(shell nproc) -default: $(OBJ) +LPO_MK := lpo.mk -$(OBJ)&: $(SRC) - lambdapi check -c $^ +LP := $(shell find . -name '*.lp') -clean: - rm -f $(OBJ) +.PHONY: default +default: $(LP:%=%o) + +%.lpo: %.lp + @echo lambdapi check $< ... + @lambdapi check -c -v 0 $< -install: $(OBJ) - lambdapi install lambdapi.pkg $(SRC) $(OBJ) +include $(LPO_MK) -uninstall: - lambdapi uninstall lambdapi.pkg +$(LPO_MK): $(LP) + @echo create/update $@ ... + @lambdapi depend $(LP) > $@ + +.PHONY: clean +clean: + -find . -name '*.lpo' -delete + -rm $(LPO_MK) From 80607721b6d28c3532acc448f57b1f39d4f281c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Blanqui?= Date: Tue, 27 Oct 2026 16:58:37 +0100 Subject: [PATCH 2/8] wip --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3c99521..3a27530 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -38,4 +38,6 @@ jobs: - name: Check library run: | eval $(opam env) + pwd + ls make From a8501f5b761bc29a6889dc216f2197021bdbe0b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Blanqui?= Date: Tue, 27 Oct 2026 17:06:26 +0100 Subject: [PATCH 3/8] wip --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 44bdf16..e1956dd 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ include $(LPO_MK) $(LPO_MK): $(LP) @echo create/update $@ ... - @lambdapi depend $(LP) > $@ + lambdapi depend $(LP) > $@ .PHONY: clean clean: From 69322519f20a2bd98bbc4e0e9091e334772bd3cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Blanqui?= Date: Tue, 27 Oct 2026 17:24:25 +0100 Subject: [PATCH 4/8] wip --- .github/workflows/main.yml | 2 -- Makefile | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3a27530..3c99521 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -38,6 +38,4 @@ jobs: - name: Check library run: | eval $(opam env) - pwd - ls make diff --git a/Makefile b/Makefile index e1956dd..23b27c9 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ MAKEFLAGS += -r -k -j$(shell nproc) LPO_MK := lpo.mk -LP := $(shell find . -name '*.lp') +LP := $(shell find . -path _opam -o -name '*.lp') .PHONY: default default: $(LP:%=%o) From 782afa0cd8def71274e06ce9b707820af41edb58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Blanqui?= Date: Tue, 27 Oct 2026 17:35:23 +0100 Subject: [PATCH 5/8] wip --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 23b27c9..cf09f04 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ MAKEFLAGS += -r -k -j$(shell nproc) LPO_MK := lpo.mk -LP := $(shell find . -path _opam -o -name '*.lp') +LP := $(shell find . -path ./_opam -prune -o -name '*.lp') .PHONY: default default: $(LP:%=%o) From 51b5244a7acf19335b092fc91a12c973b150becb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Blanqui?= Date: Tue, 27 Oct 2026 17:39:00 +0100 Subject: [PATCH 6/8] wip --- Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index cf09f04..3b89df6 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,10 @@ MAKEFLAGS += -r -k -j$(shell nproc) LPO_MK := lpo.mk -LP := $(shell find . -path ./_opam -prune -o -name '*.lp') +EXCLUDE := _opam +EXCEPT := $(EXCLUDE:%=-path ./% -prune -o) + +LP := $(shell find . $(EXCEPT) -name '*.lp') .PHONY: default default: $(LP:%=%o) @@ -19,5 +22,5 @@ $(LPO_MK): $(LP) .PHONY: clean clean: - -find . -name '*.lpo' -delete + -find . $(EXCEPT) -name '*.lpo' -delete -rm $(LPO_MK) From 7b4d6b5392d02d13f06bff6bfb3ea2d96108a999 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Blanqui?= Date: Tue, 27 Oct 2026 17:44:56 +0100 Subject: [PATCH 7/8] wip --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3b89df6..fc2c180 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ LPO_MK := lpo.mk EXCLUDE := _opam EXCEPT := $(EXCLUDE:%=-path ./% -prune -o) -LP := $(shell find . $(EXCEPT) -name '*.lp') +LP := $(shell find . $(EXCEPT) -type f -name '*.lp') .PHONY: default default: $(LP:%=%o) @@ -22,5 +22,5 @@ $(LPO_MK): $(LP) .PHONY: clean clean: - -find . $(EXCEPT) -name '*.lpo' -delete + -find . $(EXCEPT) -type f -name '*.lpo' -delete -rm $(LPO_MK) From 228f63173d7af8fdf7ceb49fbe741690d5f70bb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Blanqui?= Date: Tue, 27 Oct 2026 17:51:07 +0100 Subject: [PATCH 8/8] wip --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index fc2c180..5fd5edb 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ LPO_MK := lpo.mk EXCLUDE := _opam EXCEPT := $(EXCLUDE:%=-path ./% -prune -o) -LP := $(shell find . $(EXCEPT) -type f -name '*.lp') +LP := $(shell find . $(EXCEPT) -type f -name '*.lp' -print) .PHONY: default default: $(LP:%=%o)