From b5c11104509288a0955e68fc8eac31b12748a0ca Mon Sep 17 00:00:00 2001
From: midipix <writeonce@midipix.org>
Date: Wed, 2 Jan 2019 10:34:08 -0500
Subject: build system: remove elf-specific make variables, as they're no
 longer needed.

---
 Makefile.in               | 14 ++------------
 config.usage              |  4 ----
 configure                 |  4 ----
 sofort/config/config.vars |  4 ----
 4 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 77882ae..be602cc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -83,10 +83,6 @@ PE_SUBSYSTEM 		= @pe_subsystem@
 PE_IMAGE_BASE 		= @pe_image_base@
 PE_CONFIG_DEFS  	= @pe_config_defs@
 
-ELF_EH_FRAME 		= @elf_eh_frame@
-ELF_HASH_STYLE 		= @elf_hash_style@
-ELF_CONFIG_DEFS 	= @elf_config_defs@
-
 NATIVE_HOST		= @native_host@
 NATIVE_CFGHOST		= @native_cfghost@
 NATIVE_CFLAGS		= @native_cflags@
@@ -286,7 +282,7 @@ clean:		clean-implib
 
 
 .display:	.display-project     .display-pkgconf     .display-env \
-		.display-tools .display-flags .display-pe .display-elf \
+		.display-tools .display-flags .display-pe              \
 		.display-dirs  .display-build .display-config
 
 .conf:		PAGER ?= less
@@ -382,12 +378,6 @@ clean:		clean-implib
 		@echo PE_CONFIG_DEFS:'         '$(PE_CONFIG_DEFS)
 		@echo
 
-.display-elf:
-		@echo ELF_EH_FRAME:'           '$(ELF_EH_FRAME)
-		@echo ELF_HASH_STYLE:'         '$(ELF_HASH_STYLE)
-		@echo ELF_CONFIG_DEFS:'        '$(ELF_CONFIG_DEFS)
-		@echo
-
 .display-dirs:
 		@echo PREFIX:'                 '$(PREFIX)
 		@echo EXEC_PREFIX:'            '$(EXEC_PREFIX)
@@ -469,7 +459,7 @@ clean:		clean-implib
 		clean distclean clean-implib version \
 		.display .conf \
 		.display-project .display-env .display-tools .display-flags \
-		.display-pe .display-elf .display-dirs .display-build \
+		.display-pe .display-dirs .display-build \
 		implib implib-ver implib-soname implib-solink \
 		install-implib install-implib-ver \
 		install-implib-soname install-implib-solink
diff --git a/config.usage b/config.usage
index f4c9446..87fbdd3 100644
--- a/config.usage
+++ b/config.usage
@@ -149,10 +149,6 @@ supported variables:
 	PE_IMAGE_BASE
 	PE_CONFIG_DEFS
 
-	ELF_EH_FRAME
-	ELF_HASH_STYLE
-	ELF_CONFIG_DEFS
-
 	NATIVE_CC
 	NATIVE_CPP
 	NATIVE_CXX
diff --git a/configure b/configure
index 7be6f75..23820a5 100755
--- a/configure
+++ b/configure
@@ -186,10 +186,6 @@ init_vars()
 	mb_pe_image_base=$PE_IMAGE_BASE
 	mb_pe_config_defs=$PE_CONFIG_DEFS
 
-	mb_elf_eh_frame=$ELF_EH_FRAME
-	mb_elf_hash_style=$ELF_HASH_STYLE
-	mb_elf_config_defs=$ELF_CONFIG_DEFS
-
 	# overrides
 	mb_user_cc=$CC
 	mb_user_cpp=$CPP
diff --git a/sofort/config/config.vars b/sofort/config/config.vars
index 17f6cd2..5cbc0e0 100644
--- a/sofort/config/config.vars
+++ b/sofort/config/config.vars
@@ -94,10 +94,6 @@ pe_subsystem
 pe_image_base
 pe_config_defs
 
-elf_eh_frame
-elf_hash_style
-elf_config_defs
-
 native_cc
 native_cpp
 native_cxx
-- 
cgit v1.2.3