vis: Use standard Build/Compile rule
authorSven Eckelmann <sven@narfation.org>
Sat, 27 Jul 2019 20:10:04 +0000 (22:10 +0200)
committerSven Eckelmann <sven@narfation.org>
Sat, 27 Jul 2019 20:42:24 +0000 (22:42 +0200)
vis 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>
vis/Makefile

index ae4420051d1e8c4601e3148ebe5974fde3bf413f..5da78b8e71d689cf8ae370511dae307582c25219 100644 (file)
@@ -22,8 +22,6 @@ PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
 PKG_MIRROR_HASH:=fd4b337a56993eec9a03ad8e7918bccc7691aa8b2e5ab6dd7863350f07503285
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
 
 PKG_MIRROR_HASH:=fd4b337a56993eec9a03ad8e7918bccc7691aa8b2e5ab6dd7863350f07503285
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
 
-PKG_EXTRA_CFLAGS=-DDEBUG_MALLOC -DMEMORY_USAGE -DPROFILE_DATA -DREVISION_VERSION=\"\ rv$(PKG_REV)\" -D_GNU_SOURCE
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/vis
 include $(INCLUDE_DIR)/package.mk
 
 define Package/vis
@@ -40,20 +38,12 @@ define Package/vis/description
 visualization server for B.A.T.M.A.N. layer 3
 endef
 
 visualization server for B.A.T.M.A.N. layer 3
 endef
 
-MAKE_VIS_ARGS += \
-       EXTRA_CFLAGS='$(TARGET_CFLAGS) $(PKG_EXTRA_CFLAGS)' \
+MAKE_FLAGS += \
+       EXTRA_CFLAGS='-DDEBUG_MALLOC -DMEMORY_USAGE -DPROFILE_DATA -DREVISION_VERSION=\"\ rv$(PKG_REV)\" -D_GNU_SOURCE' \
        REVISION="$(PKG_REV)" \
        CC="$(TARGET_CC)" \
        vis
 
        REVISION="$(PKG_REV)" \
        CC="$(TARGET_CC)" \
        vis
 
-
-define Build/Configure
-endef
-
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_VIS_ARGS)
-endef
-
 define Package/vis/install
        $(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/config $(1)/etc/init.d
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/vis $(1)/usr/sbin/
 define Package/vis/install
        $(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/config $(1)/etc/init.d
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/vis $(1)/usr/sbin/