public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Carlos O'Donell <carlos@sourceware.org>
To: glibc-cvs@sourceware.org
Subject: [glibc] dlfcn: Reformat Makefile.
Date: Sun, 25 Feb 2024 18:42:35 +0000 (GMT) [thread overview]
Message-ID: <20240225184235.BD2363858431@sourceware.org> (raw)
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=c432e667fc10777fba5f7be38fe659e6c40f7da4
commit c432e667fc10777fba5f7be38fe659e6c40f7da4
Author: Carlos O'Donell <carlos@redhat.com>
Date: Thu Jun 8 12:17:00 2023 -0400
dlfcn: Reformat Makefile.
Reflow and sort Makefile.
No code generation changes in non-test binary artifacts.
No regressions on x86_64 and i686.
Diff:
---
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)
reply other threads:[~2024-02-25 18:42 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20240225184235.BD2363858431@sourceware.org \
--to=carlos@sourceware.org \
--cc=glibc-cvs@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).