common-rules.mk: Move common rules out of common.mk as multi-loop

SynoCommunity · Feb 6, 2024 · 5619159 · 5619159
1 parent 0b68841
commit 5619159
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 12 deletions.
diff --git a/mk/spksrc.common-rules.mk b/mk/spksrc.common-rules.mk
@@ -0,0 +1,13 @@
+# Common rules, shared by all makefiles
+
+###
+
+clean:
+	rm -fr work work-* build-*.log publish-*.log status-*.log
+
+smart-clean:
+	rm -rf $(WORK_DIR)/$(PKG_DIR)
+	rm -f $(WORK_DIR)/.$(COOKIE_PREFIX)*
+
+changelog:
+	git log --pretty=format:"- %s" -- $(PWD)
diff --git a/mk/spksrc.common.mk b/mk/spksrc.common.mk
@@ -2,18 +2,6 @@
 
 ###
 
-clean:
-	rm -fr work work-* build-*.log publish-*.log status-*.log
-
-smart-clean:
-	rm -rf $(WORK_DIR)/$(PKG_DIR)
-	rm -f $(WORK_DIR)/.$(COOKIE_PREFIX)*
-
-changelog:
-	git log --pretty=format:"- %s" -- $(PWD)
-
-###
-
 # all will be the default target, regardless of what is defined in the other
 # makefiles.
 default: all

diff --git a/mk/spksrc.native-env.mk b/mk/spksrc.native-env.mk
@@ -1,3 +1,10 @@
+###
+
+### Include common rules
+include ../../mk/spksrc.common-rules.mk
+
+###
+
 PKG_CONFIG_LIBDIR = $(INSTALL_DIR)/$(INSTALL_PREFIX)/lib/pkgconfig
 
 INSTALL_DIR = $(WORK_DIR)/install

diff --git a/mk/spksrc.supported.mk b/mk/spksrc.supported.mk
@@ -1,5 +1,10 @@
 ####
 
+### Include common rules
+include ../../mk/spksrc.common-rules.mk
+
+###
+
 # make all-supported
 ifeq (supported,$(findstring supported,$(subst -, ,$(firstword $(MAKECMDGOALS)))))
 TARGET_TYPE = supported

diff --git a/mk/spksrc.tc.mk b/mk/spksrc.tc.mk
@@ -8,6 +8,11 @@ include ../../mk/spksrc.directories.mk
 
 include ../../mk/spksrc.common.mk
 
+### Include common rules
+include ../../mk/spksrc.common-rules.mk
+
+include ../../mk/spksrc.cross-rust-env.mk
+
 # Include cross-cmake-env.mk to generate its toolchain file
 include ../../mk/spksrc.cross-cmake-env.mk