From 68a706a9487a5c9714ca2c852ae1f095b2334d12 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 9 Mar 2018 10:05:44 +0100
Subject: [PATCH] gluon.mk: remove GLUON_PKG_MAKE option

---
 package/gluon-core/Makefile               | 2 --
 package/gluon-ebtables-limit-arp/Makefile | 2 --
 package/gluon-neighbour-info/Makefile     | 2 --
 package/gluon-status-page/Makefile        | 2 --
 package/gluon-web/Makefile                | 1 -
 package/gluon.mk                          | 5 +----
 6 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/package/gluon-core/Makefile b/package/gluon-core/Makefile
index 1b83c424..39218d66 100644
--- a/package/gluon-core/Makefile
+++ b/package/gluon-core/Makefile
@@ -7,8 +7,6 @@ PKG_VERSION:=$(if $(DUMP),x,$(GLUON_VERSION))
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 
-GLUON_PKG_MAKE:=1
-
 include ../gluon.mk
 include $(INCLUDE_DIR)/cmake.mk
 
diff --git a/package/gluon-ebtables-limit-arp/Makefile b/package/gluon-ebtables-limit-arp/Makefile
index 399cca2b..4562c627 100644
--- a/package/gluon-ebtables-limit-arp/Makefile
+++ b/package/gluon-ebtables-limit-arp/Makefile
@@ -4,8 +4,6 @@ PKG_NAME:=gluon-ebtables-limit-arp
 PKG_VERSION:=1
 PKG_RELEASE:=1
 
-GLUON_PKG_MAKE:=1
-
 include ../gluon.mk
 
 define Package/gluon-ebtables-limit-arp
diff --git a/package/gluon-neighbour-info/Makefile b/package/gluon-neighbour-info/Makefile
index 11d9465f..37bd4a49 100644
--- a/package/gluon-neighbour-info/Makefile
+++ b/package/gluon-neighbour-info/Makefile
@@ -4,8 +4,6 @@ PKG_NAME:=gluon-neighbour-info
 PKG_VERSION:=1
 PKG_RELEASE:=1
 
-GLUON_PKG_MAKE:=1
-
 include ../gluon.mk
 
 define Package/gluon-neighbour-info
diff --git a/package/gluon-status-page/Makefile b/package/gluon-status-page/Makefile
index acf4cef8..7401f099 100644
--- a/package/gluon-status-page/Makefile
+++ b/package/gluon-status-page/Makefile
@@ -3,8 +3,6 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=gluon-status-page
 PKG_VERSION:=3
 
-GLUON_PKG_MAKE:=1
-
 include ../gluon.mk
 
 define Package/gluon-status-page
diff --git a/package/gluon-web/Makefile b/package/gluon-web/Makefile
index 8606ad6d..796ed361 100644
--- a/package/gluon-web/Makefile
+++ b/package/gluon-web/Makefile
@@ -3,7 +3,6 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=gluon-web
 PKG_VERSION:=1
 
-GLUON_PKG_MAKE:=1
 PKG_INSTALL:=1
 
 include ../gluon.mk
diff --git a/package/gluon.mk b/package/gluon.mk
index 1e2cb5a5..ea9658ad 100644
--- a/package/gluon.mk
+++ b/package/gluon.mk
@@ -6,7 +6,6 @@ PKG_BUILD_DEPENDS += luci-base/host
 
 ifneq ($(wildcard ./src/respondd.c),)
   PKG_BUILD_DEPENDS += respondd
-  GLUON_PKG_MAKE ?= 1
 endif
 
 include $(INCLUDE_DIR)/package.mk
@@ -67,10 +66,8 @@ define GluonSrcDiet
 endef
 
 
-GLUON_PKG_MAKE ?= 0
-
 define Gluon/Build/Compile
-	$(if $(findstring $(GLUON_PKG_MAKE),1),
+	$(if $(wildcard ./src/Makefile ./src/CMakeLists.txt),
 		$(Build/Compile/Default)
 	)
 	$(if $(wildcard ./luasrc/.),