mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH] treewide: use $(ptx/nl) instead of ; in foreach loops
@ 2022-09-29 17:09 Ladislav Michl
  2022-10-19  5:40 ` [ptxdist] [APPLIED] " Michael Olbrich
  0 siblings, 1 reply; 2+ messages in thread
From: Ladislav Michl @ 2022-09-29 17:09 UTC (permalink / raw)
  To: ptxdist

From: Ladislav Michl <ladis@linux-mips.org>

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
 rules/barebox.make        | 2 +-
 rules/connman.make        | 2 +-
 rules/easy-rsa.make       | 4 ++--
 rules/ecryptfs-utils.make | 2 +-
 rules/gtk-engines.make    | 2 +-
 rules/kbd.make            | 2 +-
 rules/libdrm.make         | 3 ++-
 rules/libelf.make         | 2 +-
 rules/libnl3.make         | 3 ++-
 rules/libsndfile.make     | 3 ++-
 rules/libva.make          | 2 +-
 rules/lighttpd.make       | 2 +-
 rules/mesa-demos.make     | 3 ++-
 rules/munin.make          | 5 +++--
 rules/ncftp.make          | 3 ++-
 rules/opensc.make         | 2 +-
 rules/perl.make           | 3 ++-
 rules/poco.make           | 2 +-
 rules/psmisc.make         | 2 +-
 rules/rt-tests.make       | 2 +-
 rules/strongswan.make     | 2 +-
 rules/systemd.make        | 6 +++---
 rules/tomoyo-tools.make   | 6 ++++--
 rules/trace-cmd.make      | 2 +-
 rules/udev.make           | 4 ++--
 rules/vim.make            | 2 +-
 rules/vorbis-tools.make   | 3 ++-
 27 files changed, 43 insertions(+), 33 deletions(-)

diff --git a/rules/barebox.make b/rules/barebox.make
index adab3c4fe..a82879e19 100644
--- a/rules/barebox.make
+++ b/rules/barebox.make
@@ -173,7 +173,7 @@ ifneq ($(strip $(BAREBOX_PROGS_TARGET_y)),)
 
 	@$(foreach prog, $(BAREBOX_PROGS_TARGET_y), \
 		$(call install_copy, barebox, 0, 0, 0755, -, \
-			/usr/bin/$(prog));)
+			/usr/bin/$(prog))$(ptx/nl))
 
 	@$(call install_finish, barebox)
 endif
diff --git a/rules/connman.make b/rules/connman.make
index d6eed8aa8..0092ed6ef 100644
--- a/rules/connman.make
+++ b/rules/connman.make
@@ -179,7 +179,7 @@ endif
 ifdef PTXCONF_CONNMAN_TESTS
 	@$(foreach test, $(CONNMAN_TESTS), \
 		$(call install_copy, connman, 0, 0, 0755, -, \
-			/usr/sbin/cm-$(test));)
+			/usr/sbin/cm-$(test))$(ptx/nl))
 endif
 
 	@$(call install_finish, connman)
diff --git a/rules/easy-rsa.make b/rules/easy-rsa.make
index 6d86e5317..bbf915076 100644
--- a/rules/easy-rsa.make
+++ b/rules/easy-rsa.make
@@ -47,11 +47,11 @@ $(STATEDIR)/easy-rsa.targetinstall:
 
 	@$(foreach script,$(EASY_RSA_INSTALL_SCRIPTS), \
 		$(call install_copy, easy-rsa, 0, 0, 0755, -, \
-		/usr/share/easy-rsa/$(script));)
+			/usr/share/easy-rsa/$(script))$(ptx/nl))
 
 	@$(foreach file,$(EASY_RSA_INSTALL_FILES), \
 		$(call install_copy, easy-rsa, 0, 0, 0644, -, \
-		/usr/share/easy-rsa/$(file));)
+			/usr/share/easy-rsa/$(file))$(ptx/nl))
 
 	@$(call install_finish, easy-rsa)
 
diff --git a/rules/ecryptfs-utils.make b/rules/ecryptfs-utils.make
index 5c38842d4..b7198d16a 100644
--- a/rules/ecryptfs-utils.make
+++ b/rules/ecryptfs-utils.make
@@ -94,7 +94,7 @@ ifdef PTXCONF_ECRYPTFS_UTILS_MOUNT_ECRYPTFS
 endif
 
 	@$(foreach prog, $(ECRYPTFS_UTILS_PROGS_y), \
-		$(call install_copy, ecryptfs-utils, 0, 0, 0755, -, $(prog));)
+		$(call install_copy, ecryptfs-utils, 0, 0, 0755, -, $(prog))$(ptx/nl))
 
 	@$(call install_finish, ecryptfs-utils)
 
diff --git a/rules/gtk-engines.make b/rules/gtk-engines.make
index 2544c89cb..bbbe1162d 100644
--- a/rules/gtk-engines.make
+++ b/rules/gtk-engines.make
@@ -60,7 +60,7 @@ $(STATEDIR)/gtk-engines.targetinstall:
 
 	@$(foreach engine,$(GTK_ENGINES_ENGINES), \
 		$(call install_lib, gtk-engines, 0, 0, 0644, \
-			gtk-3.0/3.0.0/engines/lib$(engine));)
+			gtk-3.0/3.0.0/engines/lib$(engine))$(ptx/nl))
 
 	@$(call install_tree, gtk-engines, 0, 0, -, \
 		/usr/share/themes)
diff --git a/rules/kbd.make b/rules/kbd.make
index 67e4ff165..60bba99b2 100644
--- a/rules/kbd.make
+++ b/rules/kbd.make
@@ -82,7 +82,7 @@ $(STATEDIR)/kbd.targetinstall:
 
 	@$(foreach tool,$(KBD_TOOLS-y), \
 		$(call install_copy, kbd, 0, 0, 0755, -, \
-			/usr/bin/$(tool));)
+			/usr/bin/$(tool))$(ptx/nl))
 
 ifdef PTXCONF_KBD_PSFXTABLE
 	@$(call install_link, kbd, psfxtable, /usr/bin/psfaddtable)
diff --git a/rules/libdrm.make b/rules/libdrm.make
index 212946e97..262cd045d 100644
--- a/rules/libdrm.make
+++ b/rules/libdrm.make
@@ -83,7 +83,8 @@ $(STATEDIR)/libdrm.targetinstall:
 	@$(call install_lib, libdrm, 0, 0, 0644, libdrm)
 
 	@$(foreach backend,$(LIBDRM_BACKENDSL-y), \
-		$(call install_lib, libdrm, 0, 0, 0644, libdrm_$(backend));)
+		$(call install_lib, libdrm, 0, 0, 0644, \
+			libdrm_$(backend))$(ptx/nl))
 
 ifdef PTXCONF_LIBDRM_TESTS
 	@$(call install_copy, libdrm, 0, 0, 0755, -, /usr/bin/modetest)
diff --git a/rules/libelf.make b/rules/libelf.make
index 5b55a8aa2..4f34333a5 100644
--- a/rules/libelf.make
+++ b/rules/libelf.make
@@ -96,7 +96,7 @@ ifdef PTXCONF_LIBELF_ELFSUTILS
 		make-debug-archive nm objdump ranlib readelf size stack strings \
 		strip unstrip, \
 		$(call install_copy, libelf, 0, 0, 0755, -, \
-		/usr/bin/eu-$(bin));)
+			/usr/bin/eu-$(bin))$(ptx/nl))
 endif
 
 	@$(call install_finish, libelf)
diff --git a/rules/libnl3.make b/rules/libnl3.make
index da203042c..2af062ac2 100644
--- a/rules/libnl3.make
+++ b/rules/libnl3.make
@@ -126,7 +126,8 @@ ifdef PTXCONF_LIBNL3_ENABLE_CLI
 endif
 
 	@$(foreach tool,$(LIBNL3_INSTALL_FILES-y), \
-		$(call install_copy, libnl3, 0, 0, 0755, -, /usr/bin/$(tool));)
+		$(call install_copy, libnl3, 0, 0, 0755, -, \
+			/usr/bin/$(tool))$(ptx/nl))
 
 	@$(call install_alternative, libnl3, 0, 0, 0644, /etc/libnl/classid)
 	@$(call install_alternative, libnl3, 0, 0, 0644, /etc/libnl/pktloc)
diff --git a/rules/libsndfile.make b/rules/libsndfile.make
index d69face8a..cc5649de2 100644
--- a/rules/libsndfile.make
+++ b/rules/libsndfile.make
@@ -76,7 +76,8 @@ $(STATEDIR)/libsndfile.targetinstall:
 
 ifdef PTXCONF_LIBSNDFILE_TOOLS
 	@$(foreach prog, $(LIBSNDFILE_PROGS), \
-		$(call install_copy, libsndfile, 0, 0, 0755, -, /usr/bin/$(prog));)
+		$(call install_copy, libsndfile, 0, 0, 0755, -, \
+			/usr/bin/$(prog))$(ptx/nl))
 endif
 
 	@$(call install_finish, libsndfile)
diff --git a/rules/libva.make b/rules/libva.make
index ed0473ccd..60cae0956 100644
--- a/rules/libva.make
+++ b/rules/libva.make
@@ -60,7 +60,7 @@ $(STATEDIR)/libva.targetinstall:
 	@$(call install_lib, libva, 0, 0, 0644, libva)
 
 	@$(foreach api, $(LIBVA_ENABLE-y), \
-		$(call install_lib, libva, 0, 0, 0644, libva-$(api));)
+		$(call install_lib, libva, 0, 0, 0644, libva-$(api))$(ptx/nl))
 
 	@$(call install_finish, libva)
 
diff --git a/rules/lighttpd.make b/rules/lighttpd.make
index e1912af26..2a9ef30e5 100644
--- a/rules/lighttpd.make
+++ b/rules/lighttpd.make
@@ -128,7 +128,7 @@ $(STATEDIR)/lighttpd.targetinstall:
 
 ifdef PTXCONF_LIGHTTPD_INSTALL_SELECTED_MODULES
 	@$(foreach mod,$(LIGHTTPD_MODULES_INSTALL), \
-		$(call install_lib, lighttpd, 0, 0, 0644, lighttpd/$(mod));)
+		$(call install_lib, lighttpd, 0, 0, 0644, lighttpd/$(mod))$(ptx/nl))
 else
 #	# modules
 	@$(call install_tree, lighttpd, 0, 0, -, /usr/lib/lighttpd)
diff --git a/rules/mesa-demos.make b/rules/mesa-demos.make
index d78c61587..2b7180a97 100644
--- a/rules/mesa-demos.make
+++ b/rules/mesa-demos.make
@@ -93,7 +93,8 @@ $(STATEDIR)/mesa-demos.targetinstall:
 	@$(call install_fixup, mesa-demos,DESCRIPTION,missing)
 
 	@$(foreach bin, $(MESA_DEMOS_BIN-y), \
-		$(call install_copy, mesa-demos, 0, 0, 0755, -, /usr/bin/$(bin));)
+		$(call install_copy, mesa-demos, 0, 0, 0755, -, \
+			/usr/bin/$(bin))$(ptx/nl))
 
 	@$(call install_finish, mesa-demos)
 
diff --git a/rules/munin.make b/rules/munin.make
index 94d09a072..f97082f1b 100644
--- a/rules/munin.make
+++ b/rules/munin.make
@@ -97,7 +97,8 @@ ifdef PTXCONF_MUNIN_MASTER
 	@$(call install_copy, munin, 0, 0, 0755, -, /usr/bin/munin-check)
 
 	@$(foreach tool, $(MONIN_TOOLS), \
-		$(call install_copy, munin, 0, 0, 0755, -, /usr/lib/munin/$(tool));)
+		$(call install_copy, munin, 0, 0, 0755, -, \
+			/usr/lib/munin/$(tool))$(ptx/nl))
 
 	@$(call install_tree, munin, 0, 0, -, $(PERL_SITELIB)/Munin/Master)
 endif
@@ -107,7 +108,7 @@ ifdef PTXCONF_MUNIN_NODE
 	@$(call install_copy, munin, 0, 0, 0755, /etc/munin/plugins/)
 	@$(foreach plugin, $(call remove_quotes,$(PTXCONF_MUNIN_NODE_PLUGINS)), \
 		$(call install_link, munin, /usr/lib/munin/plugins/$(plugin), \
-		/etc/munin/plugins/$(plugin));)
+			/etc/munin/plugins/$(plugin))$(ptx/nl))
 
 	@$(call install_copy, munin, 0, 0, 0755, -, /usr/sbin/munin-node-configure)
 	@$(call install_copy, munin, 0, 0, 0755, -, /usr/sbin/munin-sched)
diff --git a/rules/ncftp.make b/rules/ncftp.make
index 67a9459e5..64acbfee4 100644
--- a/rules/ncftp.make
+++ b/rules/ncftp.make
@@ -58,7 +58,8 @@ $(STATEDIR)/ncftp.targetinstall:
 	@$(call install_fixup, ncftp,DESCRIPTION,missing)
 
 	@$(foreach prog, $(NCFTP_PROGS_y), \
-		$(call install_copy, ncftp, 0, 0, 0755, -, /usr/bin/$(prog));)
+		$(call install_copy, ncftp, 0, 0, 0755, -, \
+			/usr/bin/$(prog))$(ptx/nl))
 
 ifdef PTXCONF_NCFTP_NCFTPBATCH_NCFTPSPOOLER
 	@$(call install_link, ncftp, ncftpbatch, /usr/bin/ncftpspooler)
diff --git a/rules/opensc.make b/rules/opensc.make
index 80f578d03..0278c53f1 100644
--- a/rules/opensc.make
+++ b/rules/opensc.make
@@ -132,7 +132,7 @@ ifdef PTXCONF_OPENSC_TESTSUITE
 	@$(call install_copy, opensc, 0, 0, 0755, /usr/lib/opensc/tests/regression)
 	@$(foreach prog, $(OPENSC_TESTS), \
                 $(call install_copy, opensc, 0, 0, 0755, $(OPENSC_DIR)/src/tests/$(prog), \
-			/usr/lib/opensc/tests/$(prog));)
+			/usr/lib/opensc/tests/$(prog))$(ptx/nl))
 
 	@$(call install_copy, opensc, 0, 0, 0644, $(OPENSC_DIR)/src/tests/regression/bintest, \
 		/usr/lib/opensc/tests/regression/bintest)
diff --git a/rules/perl.make b/rules/perl.make
index b55ebffa7..2f3a405cb 100644
--- a/rules/perl.make
+++ b/rules/perl.make
@@ -130,7 +130,8 @@ $(STATEDIR)/perl.targetinstall:
 	@$(call install_fixup, perl,DESCRIPTION,missing)
 
 	@$(foreach prog, $(PERL_PROGRAMS), \
-		$(call install_copy, perl, 0, 0, 0755, -, /usr/bin/$(prog));)
+		$(call install_copy, perl, 0, 0, 0755, -, \
+			/usr/bin/$(prog))$(ptx/nl))
 
 	@$(call install_tree, perl, 0, 0, -, /usr/lib/perl5)
 
diff --git a/rules/poco.make b/rules/poco.make
index c2929d53a..91d22aead 100644
--- a/rules/poco.make
+++ b/rules/poco.make
@@ -89,7 +89,7 @@ $(STATEDIR)/poco.targetinstall:
 
 	@$(foreach lib, $(POCO_LIBS-y), \
 		$(call install_lib, poco, 0, 0, 0644, \
-			libPoco$(subst /,,$(subst _OpenSSL,,$(lib))));)
+			libPoco$(subst /,,$(subst _OpenSSL,,$(lib))))$(ptx/nl))
 
 	@$(call install_finish, poco)
 
diff --git a/rules/psmisc.make b/rules/psmisc.make
index fdb479877..d95e97d74 100644
--- a/rules/psmisc.make
+++ b/rules/psmisc.make
@@ -65,7 +65,7 @@ $(STATEDIR)/psmisc.targetinstall:
 
 	@$(foreach tool, $(PSMISC_BIN-y), \
 		$(call install_copy, psmisc, 0, 0, 0755, -, \
-		/usr/bin/$(tool));)
+			/usr/bin/$(tool))$(ptx/nl))
 
 	@$(call install_finish, psmisc)
 
diff --git a/rules/rt-tests.make b/rules/rt-tests.make
index 0ae1c7fa2..4b38186e9 100644
--- a/rules/rt-tests.make
+++ b/rules/rt-tests.make
@@ -65,7 +65,7 @@ $(STATEDIR)/rt-tests.targetinstall:
 
 	@$(foreach tool, $(RT_TESTS_BIN-y), \
 		$(call install_copy, rt-tests, 0, 0, 0755, -, \
-		/usr/bin/$(tool));)
+			/usr/bin/$(tool))$(ptx/nl))
 
 	@$(call install_finish, rt-tests)
 
diff --git a/rules/strongswan.make b/rules/strongswan.make
index 15e9cdb9b..99f2fae74 100644
--- a/rules/strongswan.make
+++ b/rules/strongswan.make
@@ -301,7 +301,7 @@ $(STATEDIR)/strongswan.targetinstall:
 
 	@$(foreach plugin, $(STRONGSWAN_PLUGINS), \
 		$(call install_copy, strongswan, 0, 0, 0644, -, \
-			/usr/lib/plugins/$(plugin));)
+			/usr/lib/plugins/$(plugin))$(ptx/nl))
 
 ifdef PTXCONF_STRONGSWAN_SYSTEMD_UNIT
 	@$(call install_alternative, strongswan, 0, 0, 0644, \
diff --git a/rules/systemd.make b/rules/systemd.make
index e5ed10ff8..d0b234034 100644
--- a/rules/systemd.make
+++ b/rules/systemd.make
@@ -375,7 +375,7 @@ endif
 	@$(call install_tree, systemd, 0, 0, -, /usr/lib/systemd/system-generators/)
 	@$(foreach helper, $(SYSTEMD_HELPER), \
 		$(call install_copy, systemd, 0, 0, 0755, -, \
-			/usr/lib/systemd/$(helper));)
+			/usr/lib/systemd/$(helper))$(ptx/nl))
 
 #	# configuration
 	@$(call install_alternative, systemd, 0, 0, 0644, \
@@ -501,11 +501,11 @@ endif
 
 	@$(foreach helper, $(SYSTEMD_UDEV_HELPER-y), \
 		$(call install_copy, systemd, 0, 0, 0755, -, \
-			/usr/lib/udev/$(helper));)
+			/usr/lib/udev/$(helper))$(ptx/nl))
 
 	@$(foreach rule, $(SYSTEMD_UDEV_RULES-y), \
 		$(call install_copy, systemd, 0, 0, 0644, -, \
-			/usr/lib/udev/rules.d/$(rule));)
+			/usr/lib/udev/rules.d/$(rule))$(ptx/nl))
 
 ifdef PTXCONF_SYSTEMD_UDEV_CUST_RULES
 	@$(call install_alternative_tree, systemd, 0, 0, /usr/lib/udev/rules.d)
diff --git a/rules/tomoyo-tools.make b/rules/tomoyo-tools.make
index 5b009a37d..9b82a7725 100644
--- a/rules/tomoyo-tools.make
+++ b/rules/tomoyo-tools.make
@@ -72,10 +72,12 @@ $(STATEDIR)/tomoyo-tools.targetinstall:
 	@$(call install_copy, tomoyo-tools, 0, 0, 0755, -, /sbin/tomoyo-init)
 
 	@$(foreach prog, $(TOMOYO_TOOLS_SBIN_PROGS), \
-		$(call install_copy, tomoyo-tools, 0, 0, 0755, -, /usr/sbin/$(prog));)
+		$(call install_copy, tomoyo-tools, 0, 0, 0755, -, \
+			/usr/sbin/$(prog))$(ptx/nl))
 
 	@$(foreach prog, $(TOMOYO_TOOLS_LIBEXEC_PROGS), \
-		$(call install_copy, tomoyo-tools, 0, 0, 0755, -, /usr/lib/tomoyo/$(prog));)
+		$(call install_copy, tomoyo-tools, 0, 0, 0755, -, \
+			/usr/lib/tomoyo/$(prog))$(ptx/nl))
 
 	@$(call install_lib, tomoyo-tools, 0, 0, 0644, libtomoyotools)
 
diff --git a/rules/trace-cmd.make b/rules/trace-cmd.make
index c44e8f5af..a46b8dc44 100644
--- a/rules/trace-cmd.make
+++ b/rules/trace-cmd.make
@@ -69,7 +69,7 @@ $(STATEDIR)/trace-cmd.targetinstall:
 
 	@$(foreach plugin, $(TRACE_CMD_PLUGINS), \
 		$(call install_lib, trace-cmd, 0, 0, 0644, \
-			traceevent/plugins/plugin_$(plugin));)
+			traceevent/plugins/plugin_$(plugin))$(ptx/nl))
 
 	@$(call install_finish, trace-cmd)
 
diff --git a/rules/udev.make b/rules/udev.make
index e4760a60a..9343a2277 100644
--- a/rules/udev.make
+++ b/rules/udev.make
@@ -116,7 +116,7 @@ endif
 
 	@$(foreach rule, $(UDEV_LEGACY_RULES-y), \
 		$(call install_copy, udev, 0, 0, 0644, -, \
-			/usr/lib/udev/rules.d/$(rule));)
+			/usr/lib/udev/rules.d/$(rule))$(ptx/nl))
 
 ifdef PTXCONF_UDEV_LEGACY_KEYMAPS
 	@cd $(UDEV_LEGACY_PKGDIR) && \
@@ -131,7 +131,7 @@ endif
 
 	@$(foreach helper, $(UDEV_LEGACY_HELPER-y), \
 		$(call install_copy, udev, 0, 0, 0755, -, \
-			/usr/lib/udev/$(helper));)
+			/usr/lib/udev/$(helper))$(ptx/nl))
 
 ifdef PTXCONF_UDEV_LEGACY_LIBUDEV
 	@$(call install_lib, udev, 0, 0, 0644, libudev)
diff --git a/rules/vim.make b/rules/vim.make
index a21b92f59..17eaff04b 100644
--- a/rules/vim.make
+++ b/rules/vim.make
@@ -112,7 +112,7 @@ ifdef PTXCONF_VIM_VIM
 	@$(call install_copy, vim, 0, 0, 0755, -, /usr/bin/vim)
 
 	@$(foreach link, $(VIM_LINKS), \
-		$(call install_link, vim, vim, /usr/bin/$(link));)
+		$(call install_link, vim, vim, /usr/bin/$(link))$(ptx/nl))
 
 	@$(call install_tree, vim, 0, 0, -, /usr/share/vim)
 endif
diff --git a/rules/vorbis-tools.make b/rules/vorbis-tools.make
index c6f6f0694..e78bde837 100644
--- a/rules/vorbis-tools.make
+++ b/rules/vorbis-tools.make
@@ -72,7 +72,8 @@ $(STATEDIR)/vorbis-tools.targetinstall:
 	@$(call install_fixup, vorbis-tools,DESCRIPTION,missing)
 
 	@$(foreach prog, $(VORBIS_TOOLS_PROGS_y), \
-		$(call install_copy, vorbis-tools, 0, 0, 0755, -, /usr/bin/$(prog));)
+		$(call install_copy, vorbis-tools, 0, 0, 0755, -, \
+			/usr/bin/$(prog))$(ptx/nl))
 
 	@$(call install_finish, vorbis-tools)
 
-- 
2.32.0




^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-10-19  5:41 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-29 17:09 [ptxdist] [PATCH] treewide: use $(ptx/nl) instead of ; in foreach loops Ladislav Michl
2022-10-19  5:40 ` [ptxdist] [APPLIED] " Michael Olbrich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox