From: Sven Eckelmann <sven@narfation.org>
Date: Sat, 27 Jul 2019 20:10:04 +0000 (+0200)
Subject: batctl: Use standard Build/Compile rule
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f921555cf79866d04b8baac92915f33bafef0717;p=feed%2Frouting.git

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@narfation.org>
---

diff --git a/batctl/Makefile b/batctl/Makefile
index 7cbb9bd..25eff7d 100644
--- a/batctl/Makefile
+++ b/batctl/Makefile
@@ -88,18 +88,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 += \
-        REVISION="$(PKG_BATCTL_SHORTREV)" \
-        CC="$(TARGET_CC)" \
-        DESTDIR="$(PKG_INSTALL_DIR)" \
-        batctl install \
+MAKE_FLAGS += \
         REVISION="openwrt-$(PKG_VERSION)-$(PKG_RELEASE)"
 
 config-n := \
@@ -222,10 +215,7 @@ $(call ConfigVars,n)$(call ConfigVars,y)
 endef
 $(eval $(call shexport,batctl_config))
 
-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-tiny/install
 	$(INSTALL_DIR) $(1)/usr/libexec