Skip to content
Snippets Groups Projects
Unverified Commit 8592434a authored by Kaspar Schleiser's avatar Kaspar Schleiser Committed by GitHub
Browse files

Merge pull request #8270 from aabadie/pr/pkg/cleanup_make

pkg/*: put $(MAKE) in quotes in all packages
parents 12b942d5 7142a273
No related branches found
No related tags found
No related merge requests found
...@@ -8,6 +8,6 @@ CFLAGS += -Wno-strict-aliasing ...@@ -8,6 +8,6 @@ CFLAGS += -Wno-strict-aliasing
.PHONY: all .PHONY: all
all: git-download all: git-download
$(MAKE) -C $(PKG_BUILDDIR) "$(MAKE)" -C $(PKG_BUILDDIR)
include $(RIOTBASE)/pkg/pkg.mk include $(RIOTBASE)/pkg/pkg.mk
...@@ -9,6 +9,6 @@ CFLAGS += -Wno-implicit-fallthrough ...@@ -9,6 +9,6 @@ CFLAGS += -Wno-implicit-fallthrough
all: git-download all: git-download
@cp Makefile.jerryscript $(PKG_BUILDDIR)/Makefile @cp Makefile.jerryscript $(PKG_BUILDDIR)/Makefile
$(MAKE) -C $(PKG_BUILDDIR) "$(MAKE)" -C $(PKG_BUILDDIR)
include $(RIOTBASE)/pkg/pkg.mk include $(RIOTBASE)/pkg/pkg.mk
...@@ -26,7 +26,7 @@ libjerry: ...@@ -26,7 +26,7 @@ libjerry:
-DEXTERNAL_COMPILE_FLAGS="$(EXT_CFLAGS)" \ -DEXTERNAL_COMPILE_FLAGS="$(EXT_CFLAGS)" \
-DMEM_HEAP_SIZE_KB=$(JERRYHEAP) -DMEM_HEAP_SIZE_KB=$(JERRYHEAP)
make -C $(BUILD_DIR) jerry-core jerry-ext jerry-port-default-minimal "$(MAKE)" -C $(BUILD_DIR) jerry-core jerry-ext jerry-port-default-minimal
cp $(BUILD_DIR)/lib/libjerry-core.a $(BINDIR)/jerryscript.a cp $(BUILD_DIR)/lib/libjerry-core.a $(BINDIR)/jerryscript.a
cp $(BUILD_DIR)/lib/libjerry-ext.a $(BINDIR)/jerryscript-ext.a cp $(BUILD_DIR)/lib/libjerry-ext.a $(BINDIR)/jerryscript-ext.a
cp $(BUILD_DIR)/lib/libjerry-port-default-minimal.a $(BINDIR)/jerryport-minimal.a cp $(BUILD_DIR)/lib/libjerry-port-default-minimal.a $(BINDIR)/jerryport-minimal.a
......
...@@ -6,6 +6,6 @@ PKG_LICENSE := MIT ...@@ -6,6 +6,6 @@ PKG_LICENSE := MIT
.PHONY: all .PHONY: all
all: git-download all: git-download
$(Q)$(MAKE) -C $(PKG_BUILDDIR) $(Q)"$(MAKE)" -C $(PKG_BUILDDIR)
include $(RIOTBASE)/pkg/pkg.mk include $(RIOTBASE)/pkg/pkg.mk
...@@ -6,6 +6,6 @@ PKG_LICENSE=BSD-3-Clause ...@@ -6,6 +6,6 @@ PKG_LICENSE=BSD-3-Clause
.PHONY: all .PHONY: all
all: git-download all: git-download
$(MAKE) -C $(PKG_BUILDDIR) "$(MAKE)" -C $(PKG_BUILDDIR)
include $(RIOTBASE)/pkg/pkg.mk include $(RIOTBASE)/pkg/pkg.mk
...@@ -6,6 +6,6 @@ PKG_LICENSE=BSD-2-Clause ...@@ -6,6 +6,6 @@ PKG_LICENSE=BSD-2-Clause
.PHONY: all .PHONY: all
all: git-download all: git-download
make -C $(PKG_BUILDDIR) "$(MAKE)" -C $(PKG_BUILDDIR)
include $(RIOTBASE)/pkg/pkg.mk include $(RIOTBASE)/pkg/pkg.mk
...@@ -9,6 +9,6 @@ INCLUDES+=-I$(TINYASN1_ROOT)/src ...@@ -9,6 +9,6 @@ INCLUDES+=-I$(TINYASN1_ROOT)/src
.PHONY: all .PHONY: all
all: git-download all: git-download
$(MAKE) -C $(PKG_BUILDDIR)/src "$(MAKE)" -C $(PKG_BUILDDIR)/src
include $(RIOTBASE)/pkg/pkg.mk include $(RIOTBASE)/pkg/pkg.mk
...@@ -11,6 +11,6 @@ all: git-download ...@@ -11,6 +11,6 @@ all: git-download
@cp $(PKG_BUILDDIR)/aes/Makefile.riot $(PKG_BUILDDIR)/aes/Makefile @cp $(PKG_BUILDDIR)/aes/Makefile.riot $(PKG_BUILDDIR)/aes/Makefile
@cp $(PKG_BUILDDIR)/ecc/Makefile.riot $(PKG_BUILDDIR)/ecc/Makefile @cp $(PKG_BUILDDIR)/ecc/Makefile.riot $(PKG_BUILDDIR)/ecc/Makefile
@cp $(PKG_BUILDDIR)/sha2/Makefile.riot $(PKG_BUILDDIR)/sha2/Makefile @cp $(PKG_BUILDDIR)/sha2/Makefile.riot $(PKG_BUILDDIR)/sha2/Makefile
$(MAKE) -C $(PKG_BUILDDIR) "$(MAKE)" -C $(PKG_BUILDDIR)
include $(RIOTBASE)/pkg/pkg.mk include $(RIOTBASE)/pkg/pkg.mk
...@@ -15,7 +15,7 @@ all: $(PKG_SRCDIR)/$(PKG_NAME).a ...@@ -15,7 +15,7 @@ all: $(PKG_SRCDIR)/$(PKG_NAME).a
prepare: $(PKG_SRCDIR)/Makefile prepare: $(PKG_SRCDIR)/Makefile
$(PKG_SRCDIR)/$(PKG_NAME).a: $(PKG_SRCDIR)/Makefile $(PKG_SRCDIR)/$(PKG_NAME).a: $(PKG_SRCDIR)/Makefile
$(Q)make -C $(<D) $(Q)"$(MAKE)" -C $(<D)
$(PKG_SRCDIR)/Makefile: $(PKG_BUILDDIR)/$(PKG_FILE) $(CURDIR)/patch.txt $(PKG_SRCDIR)/Makefile: $(PKG_BUILDDIR)/$(PKG_FILE) $(CURDIR)/patch.txt
rm -rf $(@D) rm -rf $(@D)
......
...@@ -7,6 +7,6 @@ PKG_LICENSE=MIT ...@@ -7,6 +7,6 @@ PKG_LICENSE=MIT
all: git-download all: git-download
@cp Makefile.umorse $(PKG_BUILDDIR)/Makefile @cp Makefile.umorse $(PKG_BUILDDIR)/Makefile
$(MAKE) -C $(PKG_BUILDDIR) "$(MAKE)" -C $(PKG_BUILDDIR)
include $(RIOTBASE)/pkg/pkg.mk include $(RIOTBASE)/pkg/pkg.mk
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment