summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre A. Gomes <andremegafone@gmail.com>2024-03-12 15:33:53 +0200
committerAndre A. Gomes <andremegafone@gmail.com>2024-03-18 18:08:49 +0200
commitff502cf981227d6b657d734a4e857f7da3cad451 (patch)
treedf813d8c3c7f9a7bf161f84aeb3a03e31d888d75
parentfdce4941446528fa9ed6d9f463fdf219273a44b1 (diff)
makefile: Minor refactor.
-rw-r--r--makefile15
1 files changed, 9 insertions, 6 deletions
diff --git a/makefile b/makefile
index 1bd82bff2..6d4617f98 100644
--- a/makefile
+++ b/makefile
@@ -13,12 +13,6 @@ endif
LISP_FLAGS ?= $(SBCL_FLAGS) --no-userinit --non-interactive
-FLATPAK_COMMAND = flatpak
-FLATPAK_BUILDER = flatpak-builder
-FLATPAK_APP_ID = engineer.atlas.Nyxt
-FLATPAK_MANIFEST := build-scripts/$(FLATPAK_APP_ID).yaml
-FLATPAK_EXPORT_REPOSITORY = _build/nyxt-flatpak-repository
-
NYXT_SUBMODULES ?= true
NYXT_RENDERER ?= gi-gtk
NASDF_USE_LOGICAL_PATHS ?= true
@@ -39,6 +33,7 @@ lisp_eval:=$(LISP) $(LISP_FLAGS) \
--eval '(asdf:load-asd "$(makefile_dir)/libraries/nasdf/nasdf.asd")' \
--eval '(asdf:load-asd "$(makefile_dir)/nyxt.asd")' \
--eval
+
lisp_quit:=--eval '(uiop:quit)'
## asdf:load-system is a bit slow on :nyxt/$(NYXT_RENDERER)-application, so we
@@ -78,6 +73,14 @@ clean-submodules:
clean: clean-submodules
rm -rf build
+# Flatpak
+
+FLATPAK_COMMAND = flatpak
+FLATPAK_BUILDER = flatpak-builder
+FLATPAK_APP_ID = engineer.atlas.Nyxt
+FLATPAK_MANIFEST := build-scripts/$(FLATPAK_APP_ID).yaml
+FLATPAK_EXPORT_REPOSITORY = _build/nyxt-flatpak-repository
+
.PHONY: flatpak-build
flatpak-build:
@$(FLATPAK_BUILDER) --force-clean --user --install --default-branch=local build $(FLATPAK_MANIFEST)