From 46a71173b60e343584c71e95595941d33bc7877b Mon Sep 17 00:00:00 2001 From: Jan Orel Date: Thu, 30 Nov 2023 14:39:30 +0100 Subject: [PATCH] M #-: Add sources to context-linux|windows --- Makefile | 4 ++-- Makefile.config | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 5eb3e92a..415c846f 100644 --- a/Makefile +++ b/Makefile @@ -35,13 +35,13 @@ ${DIR_EXPORT}/%.qcow2: context-linux: $(patsubst %, context-linux/out/%, $(LINUX_CONTEXT_PACKAGES)) @${INFO} "Generate context-linux done" -context-linux/out/%: +context-linux/out/%: ${CONTEXT_LINUX_SOURCES} cd context-linux; ./generate-all.sh context-windows: $(patsubst %, context-windows/out/%, $(WINDOWS_CONTEXT_PACKAGES)) @${INFO} "Generate context-windows done" -context-windows/out/%: +context-windows/out/%: ${CONTEXT_WINDOWS_SOURCES} cd context-windows; ./generate-all.sh clean: diff --git a/Makefile.config b/Makefile.config index 0e49530b..5f34a413 100644 --- a/Makefile.config +++ b/Makefile.config @@ -48,13 +48,14 @@ LINUX_CONTEXT_PACKAGES := one-context_${VERSION}-${RELEASE}.deb \ one-context-linux-${VERSION}-${RELEASE}.iso LINUX_CONTEXT_PACKAGES_FULL := $(patsubst %, context-linux/out/%, $(LINUX_CONTEXT_PACKAGES)) +CONTEXT_LINUX_SOURCES := $(shell find context-linux/src) # this needs to match context-windows/generate-all.sh products WINDOWS_CONTEXT_PACKAGES := one-context-${VERSION}.msi \ one-context-${VERSION}.iso WINDOWS_CONTEXT_PACKAGES_FULL := $(patsubst %, context-windows/out/%, $(WINDOWS_CONTEXT_PACKAGES)) - +CONTEXT_WINDOWS_SOURCES := $(shell find context-windows/src) # logging func INFO=sh -c 'if [ $(VERBOSE) = 1 ]; then echo [INFO] $$1; fi' INFO