1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37
|
From 78f4945474f36a6f40e6661152bc92336f0371bc Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@debian.org>
Date: Mon, 26 Jun 2017 08:37:49 +0200
Subject: [PATCH 05/10] Makefile: Fix occasional parallel FTBFS
"cd modify && make" was running up to three times in parallel.
Fixes #21.
---
Makefile | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 77c8a98..3fe8324 100644
--- a/Makefile
+++ b/Makefile
@@ -25,14 +25,16 @@ MODIFY_TARGET = gobpack$(EXE) jnbpack$(EXE) jnbunpack$(EXE)
OBJS = main.o menu.o filter.o network.o
BINARIES = $(TARGET) $(MODIFY_TARGET)
-.PHONY: data
+.PHONY: data modify
all: $(BINARIES) jnbmenu
$(SDL_TARGET): globals.h
$(MAKE) -C sdl
-$(MODIFY_TARGET): globals.h
+$(MODIFY_TARGET): modify
+
+modify: globals.h
$(MAKE) -C modify
$(TARGET): $(OBJS) $(SDL_TARGET) data globals.h
--
2.20.1
|