[commits] [openwrt-feed-devel] master: batctl: Use standard Build/Compile rule (0ea5587)

postmaster at open-mesh.org postmaster at open-mesh.org
Thu Aug 1 16:55:18 CEST 2019


Repository : ssh://git@open-mesh.org/openwrt-feed-devel

On branch  : master

>---------------------------------------------------------------

commit 0ea5587b95bc1efd315b34dd3b98c5fe2b5551c8
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sat Jul 27 22:10:04 2019 +0200

    batctl: Use standard Build/Compile rule
    
    batctl isn't using any special rules in Build/Compile. It is cleaner to
    directly use the global Build/Compile/Default instead of having a
    functional similar copy in the package Makefile
    
    Signed-off-by: Sven Eckelmann <sven at narfation.org>


>---------------------------------------------------------------

0ea5587b95bc1efd315b34dd3b98c5fe2b5551c8
 batctl-devel/Makefile | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/batctl-devel/Makefile b/batctl-devel/Makefile
index 9a0cf95..13c26b7 100644
--- a/batctl-devel/Makefile
+++ b/batctl-devel/Makefile
@@ -72,17 +72,11 @@ TARGET_LDFLAGS += -Wl,--gc-sections
 TARGET_CFLAGS  += -flto
 TARGET_LDFLAGS += -fuse-linker-plugin
 
-MAKE_BATCTL_ENV += \
-        CPPFLAGS="$(TARGET_CPPFLAGS)" \
-        CFLAGS="$(TARGET_CFLAGS)" \
-        LDFLAGS="$(TARGET_LDFLAGS)" \
+MAKE_VARS += \
         LIBNL_NAME="libnl-tiny" \
         LIBNL_GENL_NAME="libnl-tiny"
 
-MAKE_BATCTL_ARGS += \
-        CC="$(TARGET_CC)" \
-        DESTDIR="$(PKG_INSTALL_DIR)" \
-        batctl install \
+MAKE_FLAGS += \
         REVISION="openwrt-$(PKG_VERSION)"
 
 config-n := \
@@ -211,10 +205,7 @@ endef
 
 endif
 
-define Build/Compile
-	$(MAKE_BATCTL_ENV) $(MAKE) -C "$(PKG_BUILD_DIR)" $(MAKE_BATCTL_ARGS) \
-		$$$$$(call shvar,batctl_config)
-endef
+MAKE_FLAGS += $$$$$(call shvar,batctl_config)
 
 define Package/batctl-devel/install
 	$(INSTALL_DIR) $(1)/usr/sbin



More information about the commits mailing list