[newlib-cygwin] Cygwin: automake: fix warning in terms of the `ps' target
Corinna Vinschen
corinna@sourceware.org
Thu Apr 29 09:37:34 GMT 2021
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
More information about the Cygwin-cvs
mailing list