make: Add dev-utils.mk for convenience targets

dev-utils.mk is meant to provide targets like install-to-system,
which will be invoked during development

Signed-off-by: Jan Lindemann <jan@janware.com>

make/Makefile

@@ -13,6 +13,8 @@ include $(MODDIR)/make/dirs.mk
 endif
 endif
 
+include $(MODDIR)/make/dev-utils.mk
+
 ifeq ($(TARGET),mingw)
 install: $(INSTALL_MAKEDIR)/winres.rc.tmpl
 endif

make/conf.mk

@@ -1,5 +1,6 @@
 include $(MODDIR)/make/defs.mk
 include $(MODDIR)/make/rules.mk
+include $(MODDIR)/make/dev-utils.mk
 
 all:
 clean: clean.conf

make/defs.mk

@@ -1082,15 +1082,6 @@ all:
 
 nothing:
 
-echo-vars:
-	make -p nothing | grep -B1 "^[A-Z_]* *[?:+]*="
-
-echo-makefiles:
-	$(Q)strace -f make nothing 2>&1 | sed '/open\(at\)*(.*\(Makefile\|\.mk\)/ !d; s/.*open("//; s/.*openat([A-Z_]\+, "//; s/", O_.*//'
-
-cat-makefiles:
-	Q=@ make --no-print-directory echo-makefiles | while read f; do echo "# =================================================== $$f"; sed 's/^include/#cat include/' $$f; done
-
 doc-module:
 	$(BROWSER) $(JANWARE_URL_DOC_MODULE)
 

make/dev-utils.mk

@@ -0,0 +1,23 @@
+all:
+install:
+clean distclean:
+
+echo-vars:
+	make -p nothing | grep -B1 "^[A-Z_]* *[?:+]*="
+
+echo-makefiles:
+	$(Q)strace -f make nothing 2>&1 | sed '/open\(at\)*(.*\(Makefile\|\.mk\)/ !d; s/.*open("//; s/.*openat([A-Z_]\+, "//; s/", O_.*//'
+
+cat-makefiles:
+	Q=@ make --no-print-directory echo-makefiles | while read f; do echo "# =================================================== $$f"; sed 's/^include/#cat include/' $$f; done
+
+link-in:
+	DEVELOPMENT=false INSTALL_LINK=1 make install
+
+install-to-system:
+	sudo make DEVELOPMENT=false install
+	for s in $(RESTART_SERVICES); do \
+		sudo systemctl restart $$s ;\
+	done
+
+

make/exe.mk

@@ -5,6 +5,7 @@
 
 include $(MODDIR)/make/run.mk
 include $(MODDIR)/make/depend.mk
+include $(MODDIR)/make/dev-utils.mk
 
 all: $(EXE) $(BUILD_EXE_BIN) $(STRIP_DONE)
 install: $(INSTALLED_EXE) $(INSTALLED_EXE_BIN)

make/htdocs.mk

@@ -5,6 +5,7 @@ LESS_CPY                  ?= lesscpy
 include $(MODDIR)/make/defs.mk
 include $(MODDIR)/make/js.mk
 include $(MODDIR)/make/rules.mk
+include $(MODDIR)/make/dev-utils.mk
 
 all: $(LESS_GENERATED_CSS)
 install: install_HTML

make/include.mk

@@ -1,4 +1,5 @@
 include $(MODDIR)/make/defs.mk
+include $(MODDIR)/make/dev-utils.mk
 
 # variables
 SRC_H        += $(PROJ_H) $(wildcard $(HDRDIR_SCOPE_SUFFIX)/*.h)

make/install-files.mk

@@ -5,7 +5,9 @@ SOURCE_BASE      ?= .
 
 RELPATHS          = $(foreach f,$(SOURCE_FILES),$(shell realpath -s --relative-to "$(SOURCE_BASE)" "$f"))
 INSTALLED_FILES   = $(addprefix $(TARGET_DIR)/,$(RELPATHS))
+
 include $(MODDIR)/make/defs.mk
+include $(MODDIR)/make/dev-utils.mk
 
 ifeq ($(DEVELOPMENT),true)
   TARGET_OWNER   ?= $(shell id -un)

make/lib.mk

@@ -5,6 +5,7 @@
 
 include $(MODDIR)/make/defs.mk
 include $(MODDIR)/make/rules.mk
+include $(MODDIR)/make/dev-utils.mk
 
 all:
 ifeq ($(USE_PROJECT_LIB),false)

make/plugin.mk

@@ -10,6 +10,7 @@ include $(MODDIR)/make/plugin-defs.mk
 include $(MODDIR)/make/rules.mk
 include $(MODDIR)/make/depend.mk
 include $(MODDIR)/make/backup.mk
+include $(MODDIR)/make/dev-utils.mk
 
 LOCAL_CPPFLAGS += -D_PLUGIN
 LOCAL_CFLAGS   += -D_PLUGIN

make/py-mod.mk

@@ -1,6 +1,7 @@
 include $(MODDIR)/make/defs.mk
 include $(MODDIR)/make/py-defs.mk
 include $(MODDIR)/make/dirs.mk
+include $(MODDIR)/make/dev-utils.mk
 
 PY_INIT_TMPL = $(wildcard __init__.py.tmpl)
 PY_SED_EXTRACT_EXPORT ?= /\(class\|def\) ..*\# *export/ !d; s/\(class\|def\) *//; s/[(:].*//
@@ -17,9 +18,6 @@ py.clean:
 	$(RM) -f *.done *.pyc
 	/bin/bash $(MOD_SCRIPT_DIR)/scm.sh clean -f __init__.py
 
-link-in:
-	DEVELOPMENT=false INSTALL_SYMLINK=1 make install
-
 install-dirs.done:
 	$(INSTALL) -d -m $(PYMODDIRMODE) -o $(PYMODDIROWNER) -g $(PYMODDIRGROUP) $(PY_INSTALL_DIR)
 	touch $@

make/rules.mk

@@ -61,15 +61,6 @@ installso: all checkroot install_dir_LIB $(INSTALLED_SHOBJS)
 
 installsh: all checkroot $(INSTALL_EXEDIR) $(INSTALLED_EXE_SH)
 
-link-in:
-	DEVELOPMENT=false INSTALL_LINK=1 make install
-
-install-to-system:
-	sudo make DEVELOPMENT=false install
-	for s in $(RESTART_SERVICES); do \
-		sudo systemctl restart $$s ;\
-	done
-
 pckgclean:
 	$(RM) -rf *.zip *.tar.gz *.rpm *.deb
 

make/scripts.mk

@@ -6,4 +6,4 @@
 include $(MODDIR)/make/defs.mk
 include $(MODDIR)/make/rules.mk
 include $(MODDIR)/make/scripts-targets.mk
-
+include $(MODDIR)/make/dev-utils.mk

make/svg.mk

@@ -50,5 +50,3 @@ copied-%.svg: $(SVG)
 
 %.ico: %.png
 	icotool -o $@ -c $<
-
-

make/swig.mk

@@ -1,4 +1,5 @@
 include $(MODDIR)/make/defs.mk
+include $(MODDIR)/make/dev-utils.mk
 
 ifeq ($(SWIG_TARGET),php)
 

make/tools.mk

@@ -9,6 +9,7 @@ include $(MODDIR)/make/targets-tools.mk
 include $(MODDIR)/make/cpp-extra-targets.mk
 include $(MODDIR)/make/depend.mk
 include $(MODDIR)/make/backup.mk
+include $(MODDIR)/make/dev-utils.mk
 
 LOCAL_CFLAGS     += -D_USRDLL -DALL_EXPORTS
 LOCAL_CPPFLAGS   += -D_USRDLL -DALL_EXPORTS