public inbox for cygwin-cvs@sourceware.org help / color / mirror / Atom feed
From: Corinna Vinschen <corinna@sourceware.org> To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: automake: fix warning in terms of the `ps' target Date: Thu, 29 Apr 2021 09:37:34 +0000 (GMT) [thread overview] Message-ID: <20210429093734.0D243399243E@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=84ffbfeb10181e82eef3d04a551943830881550b commit 84ffbfeb10181e82eef3d04a551943830881550b Author: Corinna Vinschen <corinna@vinschen.de> Date: Thu Apr 29 10:59:29 2021 +0200 Cygwin: automake: fix warning in terms of the `ps' target We are building a ps executable, but the rule to build the target collides with an auto-generated, documentation-related `ps' rule. Work around that by naming the executable "cygps" at build time and use a transform rule to rename it at installation time. Signed-off-by: Corinna Vinschen <corinna@vinschen.de> Diff: --- winsup/utils/Makefile.am | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/winsup/utils/Makefile.am b/winsup/utils/Makefile.am index 9e5fc8cc0..5283fb343 100644 --- a/winsup/utils/Makefile.am +++ b/winsup/utils/Makefile.am @@ -12,9 +12,12 @@ CFLAGS_COMMON=-Wimplicit-fallthrough=4 -Werror AM_CFLAGS=$(cflags_common) $(CFLAGS_COMMON) AM_CXXFLAGS=$(cxxflags_common) $(CFLAGS_COMMON) +# Note that we call ps cygps here, so as not to collide with the +# autogenerated texinfo rule with the name 'ps'... bin_PROGRAMS = \ chattr \ cygpath \ + cygps \ gencat \ getconf \ getfacl \ @@ -28,7 +31,6 @@ bin_PROGRAMS = \ mount \ passwd \ pldd \ - ps \ regtool \ setfacl \ setmetamode \ @@ -36,6 +38,9 @@ bin_PROGRAMS = \ tzset \ umount +# Rename cygps to ps at install time +transform = s/cygps/ps/; $(program_transform_name) + # dumper is only built if libbfd.a available if BUILD_DUMPER bin_PROGRAMS += dumper @@ -49,7 +54,7 @@ ldd_SOURCES = ldd.cc locale_SOURCES = locale.cc minidumper_SOURCES = minidumper.cc mount_SOURCES = mount.cc path.cc -ps_SOURCES = ps.cc +cygps_SOURCES = ps.cc regtool_SOURCES = regtool.cc umount_SOURCES = umount.cc @@ -74,7 +79,7 @@ ldd_LDADD = $(LDADD) -lpsapi -lntdll mount_CXXFLAGS = -DFSTAB_ONLY $(AM_CXXFLAGS) minidumper_LDADD = $(LDADD) -ldbghelp pldd_LDADD = $(LDADD) -lpsapi -ps_LDADD = $(LDADD) -lpsapi -lntdll +cygps_LDADD = $(LDADD) -lpsapi -lntdll if CROSS_BOOTSTRAP SUBDIRS = mingw
reply other threads:[~2021-04-29 9:37 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=20210429093734.0D243399243E@sourceware.org \ --to=corinna@sourceware.org \ --cc=cygwin-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: linkBe 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).