From bff3bf72c8b15ac10fd3b84656e00f52af397cad Mon Sep 17 00:00:00 2001 From: Leon George <leon@georgemail.de> Date: Tue, 22 Jul 2014 23:59:22 +0200 Subject: [PATCH] pkg/Makefile.{http,git}: Minor issues resolved. The were two recipes for clean. One of them is now "dist-clean" --- pkg/Makefile.git | 4 ++-- pkg/Makefile.http | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/Makefile.git b/pkg/Makefile.git index 01b9bc51a3..d15e683096 100644 --- a/pkg/Makefile.git +++ b/pkg/Makefile.git @@ -7,10 +7,10 @@ include $(RIOTBOARD)/Makefile.base include $(RIOTBOARD)/$(BOARD)/Makefile.include endif -.PHONY: all clean patch reset +.PHONY: all clean patch distclean all: patch - make -C $(CURDIR)/$(PKG_NAME) + $(MAKE) -C $(CURDIR)/$(PKG_NAME) patch: $(CURDIR)/$(PKG_NAME)/Makefile # Dependancy might be changed accordingly though we think the Makefile diff --git a/pkg/Makefile.http b/pkg/Makefile.http index 125925ba07..1b16d5eb69 100644 --- a/pkg/Makefile.http +++ b/pkg/Makefile.http @@ -3,10 +3,10 @@ PKG_URL = http://example.com/downloads # source url of the package e.g. a gi PKG_VERSION = v1.2.3 # version of the package to use e.g. a git commit/ref PKG_EXT = zip # extension of this package -.PHONY: all clean patch reset +.PHONY: all clean patch distclean all: patch - make -C $(CURDIR)/$(PKG_NAME)-$(PKG_VERSION) + $(MAKE) -C $(CURDIR)/$(PKG_NAME)-$(PKG_VERSION) patch: $(CURDIR)/$(PKG_NAME)-$(PKG_VERSION)/Makefile # Dependancy might be changed accordingly though we think the Makefile @@ -30,7 +30,7 @@ $(CURDIR)/$(PKG_NAME)-$(PKG_VERSION).$(PKG_EXT): clean:: # Reset package to checkout state. rm -rf $(CURDIR)/$(PKG_NAME)-$(PKG_VERSION) && \ - make $(CURDIR)/$(PKG_NAME)-$(PKG_VERSION)/Makefile + $(MAKE) $(CURDIR)/$(PKG_NAME)-$(PKG_VERSION)/Makefile -clean:: +distclean:: rm -rf $(CURDIR)/$(PKG_NAME)-$(PKG_VERSION) $(CURDIR)/$(PKG_NAME)-$(PKG_VERSION).$(PKG_EXT) -- GitLab