From afccc1a6d5fb0fa7133928bca27f3e9faa302a5e Mon Sep 17 00:00:00 2001 From: Gilles Peskine Date: Fri, 22 Dec 2023 09:35:34 +0100 Subject: [PATCH] Indent nested conditionals Signed-off-by: Gilles Peskine --- programs/Makefile | 21 +++++++++++---------- tests/Makefile | 27 ++++++++++++++------------- 2 files changed, 25 insertions(+), 23 deletions(-) diff --git a/programs/Makefile b/programs/Makefile index ebdadc0567..c0856b0ac3 100644 --- a/programs/Makefile +++ b/programs/Makefile @@ -43,16 +43,17 @@ WINDOWS_BUILD=1 endif ifdef WINDOWS_BUILD -DLEXT=dll -EXEXT=.exe -LOCAL_LDFLAGS += -lws2_32 -lbcrypt -ifdef SHARED -SHARED_SUFFIX=.$(DLEXT) -endif -else -DLEXT ?= so -EXEXT= -SHARED_SUFFIX= + DLEXT=dll + EXEXT=.exe + LOCAL_LDFLAGS += -lws2_32 -lbcrypt + ifdef SHARED + SHARED_SUFFIX=.$(DLEXT) + endif + +else # Not building for Windows + DLEXT ?= so + EXEXT= + SHARED_SUFFIX= endif ifdef WINDOWS diff --git a/tests/Makefile b/tests/Makefile index 29197b7c71..b044d2522c 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -47,20 +47,21 @@ WINDOWS_BUILD=1 endif ifdef WINDOWS_BUILD -DLEXT=dll -EXEXT=.exe -LOCAL_LDFLAGS += -lws2_32 -lbcrypt -ifdef SHARED -SHARED_SUFFIX=.$(DLEXT) -endif -else -DLEXT ?= so -EXEXT= -SHARED_SUFFIX= + DLEXT=dll + EXEXT=.exe + LOCAL_LDFLAGS += -lws2_32 -lbcrypt + ifdef SHARED + SHARED_SUFFIX=.$(DLEXT) + endif -ifeq ($(THREADING),pthread) -LOCAL_LDFLAGS += -lpthread -endif +else # Not building for Windows + DLEXT ?= so + EXEXT= + SHARED_SUFFIX= + + ifeq ($(THREADING),pthread) + LOCAL_LDFLAGS += -lpthread + endif endif ifdef WINDOWS