public inbox for cygwin-patches@cygwin.com
 help / color / mirror / Atom feed
From: Jon Turney <jon.turney@dronecode.org.uk>
To: cygwin-patches@cygwin.com
Cc: Jon Turney <jon.turney@dronecode.org.uk>
Subject: [PATCH 3/7] Remove autoconf variable DLL_NAME
Date: Sat, 31 Oct 2020 15:08:17 +0000	[thread overview]
Message-ID: <20201031150821.18041-4-jon.turney@dronecode.org.uk> (raw)
In-Reply-To: <20201031150821.18041-1-jon.turney@dronecode.org.uk>

Remove autoconf variable DLL_NAME, which has a constant value which is
only used in one place.
---
 winsup/cygwin/Makefile.in  | 4 ++--
 winsup/cygwin/configure.ac | 3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in
index cb9924b3a..89e1b7567 100644
--- a/winsup/cygwin/Makefile.in
+++ b/winsup/cygwin/Makefile.in
@@ -102,8 +102,8 @@ RUNTESTFLAGS =
 # native rebuilding issues (we don't want the build tools to see a partially
 # built cygwin.dll and attempt to use it instead of the old one).
 
-DLL_NAME:=@DLL_NAME@
-TEST_DLL_NAME:=${patsubst %1.dll,%0.dll,@DLL_NAME@}
+DLL_NAME:=cygwin1.dll
+TEST_DLL_NAME:=${patsubst %1.dll,%0.dll,$(DLL_NAME)}
 TEST_LIB_NAME:=libcygwin0.a
 STATIC_LIB_NAME:=libcygwin_s.a
 DIN_FILE=@DIN_FILE@ common.din
diff --git a/winsup/cygwin/configure.ac b/winsup/cygwin/configure.ac
index aafc4d925..658247099 100644
--- a/winsup/cygwin/configure.ac
+++ b/winsup/cygwin/configure.ac
@@ -61,14 +61,12 @@ esac
 
 case "$target_cpu" in
    i?86)
-		DLL_NAME="cygwin1.dll"
 		DLL_ENTRY="_dll_entry@12"
 		DEF_DLL_ENTRY="dll_entry@12"
 		DIN_FILE="i686.din"
 		TLSOFFSETS_H="tlsoffsets.h"
 		;;
    x86_64)
-		DLL_NAME="cygwin1.dll"
 		DLL_ENTRY="dll_entry"
 		DEF_DLL_ENTRY="dll_entry"
 		DIN_FILE="x86_64.din"
@@ -78,7 +76,6 @@ case "$target_cpu" in
 esac
 
 AC_CONFIGURE_ARGS
-AC_SUBST(DLL_NAME)
 AC_SUBST(DLL_ENTRY)
 AC_SUBST(DEF_DLL_ENTRY)
 AC_SUBST(DIN_FILE)
-- 
2.29.0


  parent reply	other threads:[~2020-10-31 15:08 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-31 15:08 [PATCH 0/7] Yet more Makefile/configure cleanups Jon Turney
2020-10-31 15:08 ` [PATCH 1/7] Remove intro2man.stamp on clean Jon Turney
2020-10-31 15:08 ` [PATCH 2/7] Drop AC_SUBST(build_exeext) Jon Turney
2020-10-31 15:08 ` Jon Turney [this message]
2020-10-31 15:08 ` [PATCH 4/7] Drop autoconf variable all_host Jon Turney
2020-10-31 15:08 ` [PATCH 5/7] Remove Makefile contents conditional on PREPROCESS, which is never defined Jon Turney
2020-10-31 15:08 ` [PATCH 6/7] Remove rules for building libcygwin_s.a Jon Turney
2020-10-31 15:08 ` [PATCH 7/7] Drop passing '-c' compiler flag into gentls_offsets Jon Turney
2020-11-02 11:21 ` [PATCH 0/7] Yet more Makefile/configure cleanups Corinna Vinschen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201031150821.18041-4-jon.turney@dronecode.org.uk \
    --to=jon.turney@dronecode.org.uk \
    --cc=cygwin-patches@cygwin.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).