From 1e5d0b33a3408145853751b686976743f6ef9c9e Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Tue, 21 Mar 2017 19:15:53 +1100 Subject: googlemock googletest: use GH_CONF --- src/googlemock.mk | 8 +------- src/googletest.mk | 11 ++--------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/src/googlemock.mk b/src/googlemock.mk index 7930c30..bd4a4bd 100644 --- a/src/googlemock.mk +++ b/src/googlemock.mk @@ -6,12 +6,6 @@ $(PKG)_DESCR := Google Mock $(PKG)_IGNORE := $(PKG)_VERSION := 1.7.0 $(PKG)_CHECKSUM := 3f20b6acb37e5a98e8c4518165711e3e35d47deb6cdb5a4dd4566563b5efd232 -$(PKG)_SUBDIR := googlemock-release-$($(PKG)_VERSION) -$(PKG)_FILE := googlemock-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := https://github.com/google/googlemock/archive/release-$($(PKG)_VERSION).tar.gz +$(PKG)_GH_CONF := google/googlemock, release- $(PKG)_DEPS := $(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS) - -define $(PKG)_UPDATE - $(call MXE_GET_GITHUB_TAGS, google/googlemock, release-) -endef diff --git a/src/googletest.mk b/src/googletest.mk index 27a7ac0..1b133e7 100644 --- a/src/googletest.mk +++ b/src/googletest.mk @@ -1,5 +1,4 @@ -# This file is part of MXE. -# See index.html for further information. +# This file is part of MXE. See LICENSE.md for licensing information. PKG := googletest $(PKG)_WEBSITE := https://github.com/google/googletest @@ -7,12 +6,6 @@ $(PKG)_DESCR := Google Test $(PKG)_IGNORE := $(PKG)_VERSION := 1.7.0 $(PKG)_CHECKSUM := f73a6546fdf9fce9ff93a5015e0333a8af3062a152a9ad6bcb772c96687016cc -$(PKG)_SUBDIR := $(PKG)-release-$($(PKG)_VERSION) -$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := https://github.com/google/$(PKG)/archive/release-$($(PKG)_VERSION).tar.gz +$(PKG)_GH_CONF := google/googletest, release- $(PKG)_DEPS := $(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS) - -define $(PKG)_UPDATE - $(call MXE_GET_GITHUB_TAGS, google/googletest, release-) -endef -- cgit v0.12