[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master d0b1121 2/4: Simplify 'make' syntax
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master d0b1121 2/4: Simplify 'make' syntax |
Date: |
Sun, 11 Nov 2018 10:18:08 -0500 (EST) |
branch: master
commit d0b11213fe9a37e3211b1a09f5bd069cb8b2f46b
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Simplify 'make' syntax
Uniformly avoid conditional nesting obviated by this change announced
in 'NEWS' for make-3.81:
| The "else" conditional line can now be followed by any other valid
| conditional on the same line: this does not increase the depth of the
| conditional nesting, so only one "endif" is required to close the
| conditional.
---
configuration.make | 14 +++++---------
workhorse.make | 10 ++++------
2 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/configuration.make b/configuration.make
index 2ce1a6e..23753e0 100644
--- a/configuration.make
+++ b/configuration.make
@@ -33,15 +33,11 @@ endif
ifeq (MINGW,$(findstring MINGW,$(uname)))
platform-makefile := msw_msys.make
-else
- ifeq (CYGWIN,$(findstring CYGWIN,$(uname)))
- platform-makefile := msw_cygwin.make
- else
- ifeq (,$(uname))
- uname := msw_generic
- platform-makefile := msw_generic.make
- endif
- endif
+else ifeq (CYGWIN,$(findstring CYGWIN,$(uname)))
+ platform-makefile := msw_cygwin.make
+else ifeq (,$(uname))
+ uname := msw_generic
+ platform-makefile := msw_generic.make
endif
include $(srcdir)/$(platform-makefile)
diff --git a/workhorse.make b/workhorse.make
index 71555a5..53e7471 100644
--- a/workhorse.make
+++ b/workhorse.make
@@ -685,13 +685,11 @@ test_targets := unit_tests cgi_tests cli_tests
ifeq (gprof,$(findstring gprof,$(build_type)))
optimization_flag := -O0 -fno-omit-frame-pointer
gprof_flag := -pg
+else ifeq (safestdlib,$(findstring safestdlib,$(build_type)))
+ optimization_flag := -O0 -fno-omit-frame-pointer
+ libstdcxx_warning_macros := $(every_libstdcxx_warning_macro)
else
- ifeq (safestdlib,$(findstring safestdlib,$(build_type)))
- optimization_flag := -O0 -fno-omit-frame-pointer
- libstdcxx_warning_macros := $(every_libstdcxx_warning_macro)
- else
- optimization_flag := -O2 -fno-omit-frame-pointer
- endif
+ optimization_flag := -O2 -fno-omit-frame-pointer
endif
# An overriding version of 'my_prod.cpp', which is used to create a