diff mbox series

[2/3] package/lshw: reformat

Message ID 2785_1659684222_62ECC57E_2785_486_1_310870c5ee2407ccbb8926d2a37897df5f90c30c.1659683862.git.yann.morin@orange.com
State Accepted
Headers show
Series [1/3] package/lshw: allso uses hwdata' PNP IDs | expand

Commit Message

Yann E. MORIN Aug. 5, 2022, 7:23 a.m. UTC 
From: "Yann E. MORIN" <yann.morin@orange.com>

lshw was introduced in early 2012, and since then our coding standards
have evolved substancially, and so lshw is lagging way behind nowadays.

Reformat it with the current styles:
  - mandatory dependencies go before build variables
  - one item per line in multi-line assignments
  - space after the last item in a multi-line assignment
  - don't hard-code the build target 'all' in the common make opts
  - split long command lines
  - format build and install command lines similarly for ease of
    comparison

Signed-off-by: Yann E. MORIN <yann.morin@orange.com>
---
 package/lshw/lshw.mk | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)
diff mbox series

Patch

diff --git a/package/lshw/lshw.mk b/package/lshw/lshw.mk
index 9f1ff8938a..45b22e88e3 100644
--- a/package/lshw/lshw.mk
+++ b/package/lshw/lshw.mk
@@ -10,20 +10,29 @@  LSHW_SOURCE = lshw-B.$(LSHW_VERSION).tar.gz
 LSHW_LICENSE = GPL-2.0
 LSHW_LICENSE_FILES = COPYING
 
-LSHW_MAKE_OPTS = CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" AR="$(TARGET_AR)" \
-	RPM_OPT_FLAGS="$(TARGET_CFLAGS)" all
+LSHW_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
+
+LSHW_MAKE_OPTS = \
+	CC="$(TARGET_CC)" \
+	CXX="$(TARGET_CXX)" \
+	AR="$(TARGET_AR)" \
+	RPM_OPT_FLAGS="$(TARGET_CFLAGS)"
+
 LSHW_MAKE_ENV = \
 	$(TARGET_MAKE_ENV) \
 	LIBS=$(TARGET_NLS_LIBS)
-LSHW_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
 
 define LSHW_BUILD_CMDS
-	$(LSHW_MAKE_ENV) $(MAKE) -C $(@D)/src $(LSHW_MAKE_OPTS)
+	$(LSHW_MAKE_ENV) $(MAKE) -C $(@D)/src \
+		$(LSHW_MAKE_OPTS) \
+		all
 endef
 
 define LSHW_INSTALL_TARGET_CMDS
-	$(LSHW_MAKE_ENV) $(MAKE) -C $(@D)/src DESTDIR=$(TARGET_DIR) \
-		$(LSHW_MAKE_OPTS) install
+	$(LSHW_MAKE_ENV) $(MAKE) -C $(@D)/src \
+		$(LSHW_MAKE_OPTS) \
+		DESTDIR=$(TARGET_DIR) \
+		install
 	$(RM) -rf $(TARGET_DIR)/usr/share/lshw
 endef