nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gluon.mk: remove GLUON_PKG_MAKE option

Browse Source
This commit is contained in:
Matthias Schiffer 2018-03-09 10:05:44 +01:00
parent c514ae1882
commit 68a706a948
No known key found for this signature in database
GPG Key ID: 16EF3F64CB201D9C
6 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/gluon-core/Makefile
View File

@ -7,8 +7,6 @@ PKG_VERSION:=$(if $(DUMP),x,$(GLUON_VERSION))
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
GLUON_PKG_MAKE:=1
include ../gluon.mk include ../gluon.mk
include $(INCLUDE_DIR)/cmake.mk include $(INCLUDE_DIR)/cmake.mk

2
package/gluon-ebtables-limit-arp/Makefile
View File

@ -4,8 +4,6 @@ PKG_NAME:=gluon-ebtables-limit-arp
PKG_VERSION:=1 PKG_VERSION:=1
PKG_RELEASE:=1 PKG_RELEASE:=1
GLUON_PKG_MAKE:=1
include ../gluon.mk include ../gluon.mk
define Package/gluon-ebtables-limit-arp define Package/gluon-ebtables-limit-arp

2
package/gluon-neighbour-info/Makefile
View File

@ -4,8 +4,6 @@ PKG_NAME:=gluon-neighbour-info
PKG_VERSION:=1 PKG_VERSION:=1
PKG_RELEASE:=1 PKG_RELEASE:=1
GLUON_PKG_MAKE:=1
include ../gluon.mk include ../gluon.mk
define Package/gluon-neighbour-info define Package/gluon-neighbour-info

2
package/gluon-status-page/Makefile
View File

@ -3,8 +3,6 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-status-page PKG_NAME:=gluon-status-page
PKG_VERSION:=3 PKG_VERSION:=3
GLUON_PKG_MAKE:=1
include ../gluon.mk include ../gluon.mk
define Package/gluon-status-page define Package/gluon-status-page

1
package/gluon-web/Makefile
View File

@ -3,7 +3,6 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-web PKG_NAME:=gluon-web
PKG_VERSION:=1 PKG_VERSION:=1
GLUON_PKG_MAKE:=1
PKG_INSTALL:=1 PKG_INSTALL:=1
include ../gluon.mk include ../gluon.mk

5
package/gluon.mk
View File

@ -6,7 +6,6 @@ PKG_BUILD_DEPENDS += luci-base/host
ifneq ($(wildcard ./src/respondd.c),) ifneq ($(wildcard ./src/respondd.c),)
PKG_BUILD_DEPENDS += respondd PKG_BUILD_DEPENDS += respondd
GLUON_PKG_MAKE ?= 1
endif endif
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -67,10 +66,8 @@ define GluonSrcDiet
endef endef
GLUON_PKG_MAKE ?= 0
define Gluon/Build/Compile define Gluon/Build/Compile
$(if $(findstring $(GLUON_PKG_MAKE),1), $(if $(wildcard ./src/Makefile ./src/CMakeLists.txt),
$(Build/Compile/Default) $(Build/Compile/Default)
) )
$(if $(wildcard ./luasrc/.), $(if $(wildcard ./luasrc/.),