[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master c2d460c 1/4: Rename 'platform-makefile', and
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master c2d460c 1/4: Rename 'platform-makefile', and don't pass it to submakefiles |
Date: |
Sat, 13 Apr 2019 12:09:51 -0400 (EDT) |
branch: master
commit c2d460c1a7b845696653083863c4e37b04404c0a
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Rename 'platform-makefile', and don't pass it to submakefiles
* GNUmakefile: Don't pass value to submakefiles, which never use it.
* configuration.make: Replace '-' in name by '_' for concinnity.
---
GNUmakefile | 1 -
configuration.make | 12 ++++++------
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/GNUmakefile b/GNUmakefile
index c258067..ca507a1 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -208,7 +208,6 @@ MAKETARGET = \
touchstone_dir='$(touchstone_dir)' \
toolset='$(toolset)' \
build_type='$(build_type)' \
- platform-makefile='$(platform-makefile)' \
USE_SO_ATTRIBUTES='$(USE_SO_ATTRIBUTES)' \
yyyymmddhhmm='$(yyyymmddhhmm)' \
$(MAKECMDGOALS)
diff --git a/configuration.make b/configuration.make
index 924ef56..bc0e00a 100644
--- a/configuration.make
+++ b/configuration.make
@@ -26,19 +26,19 @@
lmi_build_type := $(shell /usr/share/libtool/build-aux/config.guess)
ifeq (msys,$(findstring msys,$(lmi_build_type)))
- platform-makefile := msw_msys.make
+ platform_makefile := msw_msys.make
else ifeq (cygwin,$(findstring cygwin,$(lmi_build_type)))
- platform-makefile := msw_cygwin.make
+ platform_makefile := msw_cygwin.make
else
ifeq (mingw32,$(findstring mingw32,$(LMI_HOST)))
- platform-makefile := msw_generic.make
+ platform_makefile := msw_generic.make
else
- platform-makefile := posix_fhs.make
+ platform_makefile := posix_fhs.make
endif
endif
-include $(srcdir)/$(platform-makefile)
-$(srcdir)/$(platform-makefile):: ;
+include $(srcdir)/$(platform_makefile)
+$(srcdir)/$(platform_makefile):: ;
################################################################################