From 9b41d4eefc243ca79c87aded951ab597033b1e78 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Thu, 13 Jun 2019 11:11:20 +0000 Subject: [PATCH] dev-utils.mk, list-files.mk, topdir.mk: Extract from dev-utils.mk and topdir.mk Signed-off-by: Jan Lindemann --- make/dev-utils.mk | 8 ++------ make/list-files.mk | 19 +++++++++++++++++++ make/topdir.mk | 2 +- 3 files changed, 22 insertions(+), 7 deletions(-) create mode 100644 make/list-files.mk diff --git a/make/dev-utils.mk b/make/dev-utils.mk index fb43633c..51ab38b3 100644 --- a/make/dev-utils.mk +++ b/make/dev-utils.mk @@ -35,12 +35,6 @@ install-to-system: sudo systemctl restart $$s ;\ done -list-files echo-files: - @$(LIST_VCS_FILES) -f - -list-text-files echo-text-files: - @$(LIST_VCS_FILES) -ft - indent-makefiles: $(PROCESS_TEXT_FILES_PY) mk-indent \ --equal-pos $(MAKEFILE_INDENT_EQUAL_POS) \ @@ -54,4 +48,6 @@ cleanup-spaces: --name-regex="$(CLEANUP_SPACES_NAME_REGEX)" \ --root=$(MAKEFILE_INDENT_ROOT) +include $(MODDIR)/make/list-files.mk + endif # ifndef DEV_UTILS_MK_INCLUDED diff --git a/make/list-files.mk b/make/list-files.mk new file mode 100644 index 00000000..8a3d7c26 --- /dev/null +++ b/make/list-files.mk @@ -0,0 +1,19 @@ +LIST_VCS_FILES := /bin/bash $(MOD_SCRIPT_DIR)/scm.sh ls-files + +ifndef LIST_FILES_MK_INCLUDED +LIST_FILES_MK_INCLUDED := true + +list-files echo-files: + @$(LIST_VCS_FILES) -f + +list-text-files echo-text-files: + @$(LIST_VCS_FILES) -ft + +tar-files: + @$(LIST_VCS_FILES) $(TOPDIR) -f | xargs tar -C $(TOPDIR) -cf - + +cpio-files: + @$(LIST_VCS_FILES) $(TOPDIR) -f | cpio -D $(TOPDIR) -o -H newc + +endif # ifndef LIST_FILES_MK_INCLUDED + diff --git a/make/topdir.mk b/make/topdir.mk index 39577ce4..efeca9db 100644 --- a/make/topdir.mk +++ b/make/topdir.mk @@ -17,7 +17,6 @@ endif PROJECT_DESCR = $(TOPDIR)/make/project.conf GIT_DESCR = $(TOPDIR)/.git/description -LIST_VCS_FILES = /bin/bash $(MOD_SCRIPT_DIR)/scm.sh ls-files OPT_JANWARE_PROJECT ?= -j @@ -62,6 +61,7 @@ endif include $(MODDIR)/make/rpmdist.mk include $(MODDIR)/make/rules.mk include $(MODDIR)/make/doc-rules.mk +include $(MODDIR)/make/list-files.mk STREAMLINE_PROJECT ?= bash $(MOD_SCRIPT_DIR)/streamline-project.sh