From: Carlos O'Donell <carlos@redhat.com>
To: libc-alpha@sourceware.org
Cc: Carlos O'Donell <carlos@redhat.com>
Subject: [COMMITTED 05/10] dlfcn: Reformat Makefile.
Date: Sun, 25 Feb 2024 13:39:44 -0500 [thread overview]
Message-ID: <20240225183956.2534939-5-carlos@redhat.com> (raw)
In-Reply-To: <20240225183956.2534939-1-carlos@redhat.com>
Reflow and sort Makefile.
No code generation changes in non-test binary artifacts.
No regressions on x86_64 and i686.
---
dlfcn/Makefile | 74 ++++++++++++++++++++++++++++++++++++++++++--------
1 file changed, 62 insertions(+), 12 deletions(-)
diff --git a/dlfcn/Makefile b/dlfcn/Makefile
index 6944fb3610..d473773dd4 100644
--- a/dlfcn/Makefile
+++ b/dlfcn/Makefile
@@ -19,7 +19,11 @@ subdir := dlfcn
include ../Makeconfig
-headers := bits/dlfcn.h bits/dl_find_object.h dlfcn.h
+headers := \
+ bits/dl_find_object.h \
+ bits/dlfcn.h \
+ dlfcn.h \
+ # headers
extra-libs := libdl
libdl-routines := libdl-compat
routines = \
@@ -33,6 +37,7 @@ routines = \
dlsym \
dlvsym \
libc_dlerror_result \
+ # routines
extra-libs-others := libdl
@@ -49,24 +54,69 @@ shared-only-routines := dlopenold
endif
ifeq (yes,$(build-shared))
-tests = glrefmain failtest tst-dladdr default errmsg1 tstcxaatexit \
- bug-dlopen1 bug-dlsym1 tst-dlinfo bug-atexit1 bug-atexit2 \
- bug-atexit3 tstatexit bug-dl-leaf tst-rec-dlopen
+tests = \
+ bug-atexit1 \
+ bug-atexit2 \
+ bug-atexit3 \
+ bug-dl-leaf \
+ bug-dlopen1 \
+ bug-dlsym1 \
+ default \
+ errmsg1 \
+ failtest \
+ glrefmain \
+ tst-dladdr \
+ tst-dlinfo \
+ tst-rec-dlopen \
+ tstatexit \
+ tstcxaatexit \
+ # tests
endif
-modules-names = glreflib1 glreflib2 glreflib3 failtestmod defaultmod1 \
- defaultmod2 errmsg1mod modatexit modcxaatexit \
- bug-dlsym1-lib1 bug-dlsym1-lib2 bug-atexit1-lib \
- bug-atexit2-lib bug-dl-leaf-lib \
- bug-dl-leaf-lib-cb moddummy1 moddummy2
+modules-names = \
+ bug-atexit1-lib \
+ bug-atexit2-lib \
+ bug-dl-leaf-lib \
+ bug-dl-leaf-lib-cb \
+ bug-dlsym1-lib1 \
+ bug-dlsym1-lib2 \
+ defaultmod1 \
+ defaultmod2 \
+ errmsg1mod \
+ failtestmod \
+ glreflib1 \
+ glreflib2 \
+ glreflib3 \
+ modatexit \
+ modcxaatexit \
+ moddummy1 \
+ moddummy2 \
+ # modules-names
failtestmod.so-no-z-defs = yes
glreflib2.so-no-z-defs = yes
errmsg1mod.so-no-z-defs = yes
ifeq (yes,$(build-shared))
-tests += tststatic tststatic2 tststatic3 tststatic4 tststatic5
-tests-static += tststatic tststatic2 tststatic3 tststatic4 tststatic5
-modules-names += modstatic modstatic2 modstatic3 modstatic5
+tests += \
+ tststatic \
+ tststatic2 \
+ tststatic3 \
+ tststatic4 \
+ tststatic5 \
+ # tests
+tests-static += \
+ tststatic \
+ tststatic2 \
+ tststatic3 \
+ tststatic4 \
+ tststatic5 \
+ # tests-static
+modules-names += \
+ modstatic \
+ modstatic2 \
+ modstatic3 \
+ modstatic5 \
+ # modules-names
tststatic-ENV = LD_LIBRARY_PATH=$(ld-library-path):$(common-objpfx)elf
tststatic2-ENV = $(tststatic-ENV)
tststatic3-ENV = $(tststatic-ENV)
--
2.43.2
next prev parent reply other threads:[~2024-02-25 18:40 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-25 18:39 [COMMITTED 01/10] conform: " Carlos O'Donell
2024-02-25 18:39 ` [COMMITTED 02/10] csu: " Carlos O'Donell
2024-02-25 18:39 ` [COMMITTED 03/10] ctype: " Carlos O'Donell
2024-02-25 18:39 ` [COMMITTED 04/10] dirent: " Carlos O'Donell
2024-02-25 18:39 ` Carlos O'Donell [this message]
2024-02-25 18:39 ` [COMMITTED 06/10] gmon: " Carlos O'Donell
2024-02-25 18:39 ` [COMMITTED 07/10] hesiod: " Carlos O'Donell
2024-02-25 18:39 ` [COMMITTED 08/10] htl: " Carlos O'Donell
2024-02-25 18:39 ` [COMMITTED 09/10] htl/tests: " Carlos O'Donell
2024-02-25 18:39 ` [COMMITTED 10/10] hurd: " Carlos O'Donell
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=20240225183956.2534939-5-carlos@redhat.com \
--to=carlos@redhat.com \
--cc=libc-alpha@sourceware.org \
/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).