From eb2f851e6557812a4549788bf9ce03256dcef67b Mon Sep 17 00:00:00 2001
From: Ellen Wang <ellen>
Date: Sun, 21 Jul 2019 21:37:01 -0700
Subject: Don't relink zerotier-one every time.

Because zerotier-one depends on "one", which is a phony target,
making it relinks zerotier-one every time, which is probably
not the desired behavior.

In any case, zerotier-one, zerotier-cli, and zerotier-idtool are
real target, so they should have real dependencies and actions.
The "one" target now depends on these three files.

Behavior is mostly unchanged otherwise.
---
 make-linux.mk | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/make-linux.mk b/make-linux.mk
index 24e054dc..a9414d0c 100644
--- a/make-linux.mk
+++ b/make-linux.mk
@@ -257,19 +257,21 @@ ifeq ($(ZT_USE_ARM32_NEON_ASM_CRYPTO),1)
 	override CORE_OBJS+=ext/arm32-neon-salsa2012-asm/salsa2012.o
 endif
 
+.PHONY: all
 all:	one
 
-one:	$(CORE_OBJS) $(ONE_OBJS) one.o
+.PHONY: one
+one: zerotier-one zerotier-idtool zerotier-cli
+
+zerotier-one:	$(CORE_OBJS) $(ONE_OBJS) one.o
 	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o zerotier-one $(CORE_OBJS) $(ONE_OBJS) one.o $(LDLIBS)
 	$(STRIP) zerotier-one
-	ln -sf zerotier-one zerotier-idtool
-	ln -sf zerotier-one zerotier-cli
 
-zerotier-one: one
-
-zerotier-idtool: one
+zerotier-idtool: zerotier-one
+	ln -sf zerotier-one zerotier-idtool
 
-zerotier-cli: one
+zerotier-cli: zerotier-one
+	ln -sf zerotier-one zerotier-cli
 
 libzerotiercore.a:	FORCE
 	make CFLAGS="-O3 -fstack-protector -fPIC" CXXFLAGS="-O3 -std=c++11 -fstack-protector -fPIC" $(CORE_OBJS)
-- 
cgit v1.2.3