8128641814
The existing build system would only require wide ncurses for a wide watch and even if the library was there would not link anything else to it. The first issue which #123 made me think of, is if ncursesw was there and ncurses is not, why not use ncursesw? A more major issue is if programs such as slabtop are linked to ncurses, then certain languages will display their text wrong, as found in #237. The days of assuming ASCII only is ok are over the build system now does the following: 1. If ncursesw is available use this for all relevant programs 2. If ncursesw is not but ncurses is, use this instead 3. If you enable 8bit watch and either disable ncurses or we cannot find ncursesw error at configure time. In related news, I hate M4sh. References: procps-ng/procps#123 procps-ng/procps#237 Signed-off-by: Craig Small <csmall@dropbear.xyz>
415 lines
8.0 KiB
Makefile
415 lines
8.0 KiB
Makefile
|
|
CYGWINFLAGS =
|
|
if CYGWIN
|
|
CYGWINFLAGS += -lintl
|
|
usrbin_exec_PROGRAMS =
|
|
endif
|
|
|
|
AM_CPPFLAGS = \
|
|
-include $(top_builddir)/config.h \
|
|
-I$(top_srcdir) \
|
|
-I$(top_srcdir)/include \
|
|
-Wno-unused-result \
|
|
-DLOCALEDIR=\"$(localedir)\" \
|
|
@HARDEN_CFLAGS@
|
|
|
|
AM_LDFLAGS = @HARDEN_LDFLAGS@
|
|
|
|
PACKAGE_VERSION = @PACKAGE_VERSION@
|
|
|
|
ACLOCAL_AMFLAGS = -I m4
|
|
SUBDIRS = \
|
|
include \
|
|
man-po \
|
|
po \
|
|
testsuite
|
|
|
|
AM_CFLAGS = -Iproc
|
|
LDADD = ./proc/libproc-2.la $(CYGWINFLAGS)
|
|
|
|
if CYGWIN
|
|
AM_LDFLAGS += ./proc/libproc-2.la $(CYGWINFLAGS)
|
|
endif
|
|
|
|
transform =
|
|
|
|
if !CYGWIN
|
|
transform += s/pscommand/ps/; $(program_transform_name)
|
|
sbin_PROGRAMS = \
|
|
sysctl
|
|
else
|
|
transform += s/pscommand/procps/; $(program_transform_name)
|
|
endif
|
|
|
|
if !CYGWIN
|
|
bin_PROGRAMS = \
|
|
ps/pscommand \
|
|
free \
|
|
pgrep \
|
|
pkill \
|
|
pmap \
|
|
pwdx \
|
|
tload \
|
|
uptime \
|
|
vmstat
|
|
if BUILD_PIDWAIT
|
|
bin_PROGRAMS += pidwait
|
|
endif
|
|
else
|
|
usrbin_exec_PROGRAMS += \
|
|
ps/pscommand \
|
|
free \
|
|
pgrep \
|
|
pkill \
|
|
pmap \
|
|
uptime \
|
|
vmstat
|
|
endif
|
|
|
|
lib_LTLIBRARIES = \
|
|
proc/libproc-2.la
|
|
|
|
dist_man_MANS = \
|
|
free.1 \
|
|
pgrep.1 \
|
|
pkill.1 \
|
|
pmap.1 \
|
|
uptime.1 \
|
|
vmstat.8 \
|
|
doc/procps.3 \
|
|
doc/procps_pids.3 \
|
|
doc/procps_misc.3
|
|
|
|
if !CYGWIN
|
|
dist_man_MANS += \
|
|
pwdx.1 \
|
|
tload.1 \
|
|
sysctl.8 \
|
|
sysctl.conf.5 \
|
|
ps/ps.1
|
|
|
|
if BUILD_PIDWAIT
|
|
dist_man_MANS += pidwait.1
|
|
endif
|
|
endif
|
|
|
|
EXTRA_DIST = \
|
|
.version \
|
|
autogen.sh \
|
|
contrib \
|
|
COPYING.LIB \
|
|
misc/git-version-gen \
|
|
Documentation/CodingStyle.md \
|
|
Documentation/TODO \
|
|
ps/HACKING \
|
|
ps/regression \
|
|
$(DIST_MAN_POTS)
|
|
|
|
if !CYGWIN
|
|
EXTRA_DIST += \
|
|
sysctl.conf
|
|
endif
|
|
|
|
procpsngdir = $(docdir)
|
|
dist_procpsng_DATA = \
|
|
Documentation/bugs.md \
|
|
Documentation/FAQ \
|
|
Documentation/libproc.supp
|
|
|
|
if BUILD_PIDOF
|
|
if !CYGWIN
|
|
bin_PROGRAMS += pidof
|
|
else
|
|
usrbin_exec_PROGRAMS += pidof
|
|
endif
|
|
dist_man_MANS += pidof.1
|
|
pidof_SOURCES = pidof.c lib/fileutils.c
|
|
else
|
|
EXTRA_DIST += pidof.1
|
|
endif
|
|
|
|
if BUILD_KILL
|
|
if CYGWIN
|
|
transform += ;s/^kill/prockill/; $(program_transform_name)
|
|
usrbin_exec_PROGRAMS += kill
|
|
else
|
|
bin_PROGRAMS += kill
|
|
endif
|
|
dist_man_MANS += kill.1
|
|
kill_SOURCES = kill.c lib/strutils.c lib/fileutils.c lib/signals.c
|
|
kill_LDADD =
|
|
else
|
|
EXTRA_DIST += kill.1
|
|
endif
|
|
|
|
if BUILD_W
|
|
if CYGWIN
|
|
usrbin_exec_PROGRAMS += w
|
|
else
|
|
bin_PROGRAMS += w
|
|
endif
|
|
|
|
dist_man_MANS += w.1
|
|
w_SOURCES = w.c lib/fileutils.c
|
|
else
|
|
EXTRA_DIST += w.1
|
|
endif
|
|
|
|
if WITH_NCURSES
|
|
if !CYGWIN
|
|
bin_PROGRAMS += \
|
|
watch \
|
|
top/top
|
|
else
|
|
usrbin_exec_PROGRAMS += \
|
|
watch \
|
|
top/top
|
|
endif
|
|
|
|
dist_man_MANS += \
|
|
watch.1 \
|
|
top/top.1
|
|
if !CYGWIN
|
|
bin_PROGRAMS += \
|
|
slabtop
|
|
dist_man_MANS += \
|
|
slabtop.1
|
|
slabtop_SOURCES = slabtop.c lib/strutils.c lib/fileutils.c
|
|
slabtop_LDADD = $(LDADD) @NCURSES_LIBS@
|
|
endif
|
|
watch_SOURCES = watch.c lib/strutils.c lib/fileutils.c
|
|
watch_LDADD = @NCURSES_LIBS@ $(CYGWINFLAGS)
|
|
top_top_SOURCES = \
|
|
top/top.h \
|
|
top/top.c \
|
|
top/top_nls.h \
|
|
top/top_nls.c \
|
|
lib/fileutils.c \
|
|
lib/signals.c
|
|
if CYGWIN
|
|
top_top_SOURCES += lib/strverscmp.c
|
|
endif
|
|
|
|
top_top_LDADD = $(LDADD) @NCURSES_LIBS@ $(DL_LIB)
|
|
endif
|
|
|
|
if BUILD_SKILL
|
|
if !CYGWIN
|
|
bin_PROGRAMS += \
|
|
skill \
|
|
snice
|
|
else
|
|
usrbin_exec_PROGRAMS += \
|
|
skill \
|
|
snice
|
|
endif
|
|
skill_SOURCES = skill.c lib/strutils.c lib/fileutils.c lib/signals.c
|
|
snice_SOURCES = skill.c lib/strutils.c lib/fileutils.c lib/signals.c
|
|
dist_man_MANS += \
|
|
skill.1 \
|
|
snice.1
|
|
else
|
|
EXTRA_DIST += \
|
|
skill.1 \
|
|
snice.1
|
|
endif
|
|
|
|
free_SOURCES = free.c lib/strutils.c lib/fileutils.c
|
|
pgrep_SOURCES = pgrep.c lib/fileutils.c lib/signals.c
|
|
pkill_SOURCES = pgrep.c lib/fileutils.c lib/signals.c
|
|
pmap_SOURCES = pmap.c lib/fileutils.c
|
|
if BUILD_PIDWAIT
|
|
pidwait_SOURCES = pgrep.c lib/fileutils.c lib/signals.c
|
|
endif
|
|
if !CYGWIN
|
|
pwdx_SOURCES = pwdx.c lib/fileutils.c
|
|
pwdx_LDADD= $(CYGWINFLAGS)
|
|
sysctl_SOURCES = \
|
|
sysctl.c \
|
|
lib/fileutils.c \
|
|
lib/procio.c
|
|
sysctl_LDADD=
|
|
endif
|
|
tload_SOURCES = tload.c lib/strutils.c lib/fileutils.c
|
|
uptime_SOURCES = uptime.c lib/fileutils.c
|
|
vmstat_SOURCES = vmstat.c lib/strutils.c lib/fileutils.c
|
|
|
|
|
|
# See http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
|
|
LIBproc_2_CURRENT=0
|
|
LIBproc_2_REVISION=0
|
|
LIBproc_2_AGE=0
|
|
|
|
proc_libproc_2_la_LIBADD = $(LIB_KPARTS)
|
|
|
|
if WITH_SYSTEMD
|
|
proc_libproc_2_la_LIBADD += @SYSTEMD_LIBS@
|
|
endif
|
|
|
|
if WITH_ELOGIND
|
|
proc_libproc_2_la_LIBADD += @ELOGIND_LIBS@
|
|
endif
|
|
|
|
proc_libproc_2_la_LDFLAGS = \
|
|
-version-info $(LIBproc_2_CURRENT):$(LIBproc_2_REVISION):$(LIBproc_2_AGE) \
|
|
-no-undefined \
|
|
-Wl,--version-script=$(top_srcdir)/proc/libproc-2.sym
|
|
|
|
proc_libproc_2_la_SOURCES = \
|
|
proc/devname.c \
|
|
proc/devname.h \
|
|
proc/diskstats.c \
|
|
proc/diskstats.h \
|
|
proc/escape.c \
|
|
proc/escape.h \
|
|
proc/procps-private.h \
|
|
proc/meminfo.c \
|
|
proc/meminfo.h \
|
|
proc/misc.h \
|
|
proc/namespace.c \
|
|
proc/numa.c \
|
|
proc/numa.h \
|
|
proc/pids.c \
|
|
proc/pids.h \
|
|
proc/pwcache.c \
|
|
proc/pwcache.h \
|
|
proc/readproc.c \
|
|
proc/readproc.h \
|
|
proc/slabinfo.c \
|
|
proc/slabinfo.h \
|
|
proc/stat.c \
|
|
proc/stat.h \
|
|
proc/sysinfo.c \
|
|
proc/version.c \
|
|
proc/vmstat.c \
|
|
proc/vmstat.h \
|
|
proc/wchan.c \
|
|
proc/wchan.h \
|
|
proc/uptime.c \
|
|
proc/xtra-procps-debug.h
|
|
|
|
proc_libproc_2_la_includedir = $(includedir)/procps/
|
|
proc_libproc_2_la_include_HEADERS = \
|
|
proc/diskstats.h \
|
|
proc/meminfo.h \
|
|
proc/misc.h \
|
|
proc/pids.h \
|
|
proc/slabinfo.h \
|
|
proc/stat.h \
|
|
proc/vmstat.h \
|
|
proc/xtra-procps-debug.h
|
|
|
|
pkgconfigdir = $(libdir)/pkgconfig
|
|
pkgconfig_DATA = \
|
|
proc/libproc-2.pc
|
|
|
|
EXTRA_DIST += proc/libproc-2.sym
|
|
|
|
# ps/pscommand
|
|
|
|
ps_pscommand_SOURCES = \
|
|
ps/common.h \
|
|
ps/display.c \
|
|
ps/global.c \
|
|
ps/help.c \
|
|
ps/output.c \
|
|
ps/parser.c \
|
|
ps/select.c \
|
|
ps/sortformat.c \
|
|
ps/stacktrace.c \
|
|
lib/fileutils.c \
|
|
lib/signals.c
|
|
|
|
|
|
# Test programs required for dejagnu or standalone testing
|
|
check_PROGRAMS = \
|
|
lib/test_strutils \
|
|
lib/test_fileutils \
|
|
lib/test_process \
|
|
lib/test_strtod_nol \
|
|
lib/test_shm
|
|
|
|
lib_test_strutils_SOURCES = lib/test_strutils.c lib/strutils.c
|
|
lib_test_strutils_LDADD = $(CYGWINFLAGS)
|
|
lib_test_fileutils_SOURCES = lib/test_fileutils.c lib/fileutils.c
|
|
lib_test_fileutils_LDADD = $(CYGWINFLAGS)
|
|
lib_test_process_SOURCES = lib/test_process.c
|
|
lib_test_process_LDADD = $(CYGWINFLAGS)
|
|
lib_test_strtod_nol_SOURCES = lib/test_strtod_nol.c lib/strutils.c
|
|
lib_test_strtod_nol_LDADD = $(CYGWINFLAGS)
|
|
lib_test_shm_SOURCES = lib/test_shm.c lib/strutils.c
|
|
lib_test_shm_LDADD = $(CYGWINFLAGS)
|
|
|
|
check_PROGRAMS += \
|
|
proc/test_Itemtables \
|
|
proc/test_pids \
|
|
proc/test_uptime \
|
|
proc/test_sysinfo \
|
|
proc/test_version \
|
|
proc/test_namespace
|
|
|
|
proc_test_Itemtables_SOURCES = proc/test_Itemtables.c
|
|
proc_test_Itemtables_LDADD = proc/libproc-2.la
|
|
proc_test_pids_SOURCES = proc/test_pids.c
|
|
proc_test_pids_LDADD = proc/libproc-2.la
|
|
proc_test_uptime_SOURCES = proc/test_uptime.c
|
|
proc_test_uptime_LDADD = proc/libproc-2.la
|
|
proc_test_sysinfo_SOURCES = proc/test_sysinfo.c
|
|
proc_test_sysinfo_LDADD = proc/libproc-2.la
|
|
proc_test_version_SOURCES = proc/test_version.c
|
|
proc_test_version_LDADD = proc/libproc-2.la
|
|
proc_test_namespace_SOURCES = proc/test_namespace.c
|
|
proc_test_namespace_LDADD = proc/libproc-2.la
|
|
|
|
if CYGWIN
|
|
skill_LDADD = $(CYGWINFLAGS)
|
|
kill_LDADD = $(CYGWINFLAGS)
|
|
free_LDADD = $(CYGWINFLAGS)
|
|
pgrep_LDADD = $(CYGWINFLAGS)
|
|
pkill_LDADD = $(CYGWINFLAGS)
|
|
pidof_LDADD = $(CYGWINFLAGS)
|
|
pmap_LDADD = $(CYGWINFLAGS)
|
|
snice_LDADD = $(CYGWINFLAGS)
|
|
tload_LDADD = $(CYGWINFLAGS)
|
|
uptime_LDADD = $(CYGWINFLAGS)
|
|
w_LDADD = $(CYGWINFLAGS)
|
|
vmstat_LDADD = $(CYGWINFLAGS)
|
|
endif
|
|
|
|
if EXAMPLE_FILES
|
|
if !CYGWIN
|
|
sysconf_DATA = sysctl.conf
|
|
endif
|
|
endif
|
|
|
|
BUILT_SOURCES = $(top_srcdir)/.version
|
|
|
|
check-lib: clean
|
|
$(MAKE) CFLAGS=-DITEMTABLE_DEBUG proc/test_Itemtables
|
|
$(top_builddir)/proc/test_Itemtables
|
|
$(MAKE) clean &>/dev/null
|
|
|
|
# Test programs not used by dejagnu but run directly
|
|
TESTS = \
|
|
proc/test_pids \
|
|
proc/test_uptime \
|
|
proc/test_sysinfo \
|
|
proc/test_version \
|
|
proc/test_namespace \
|
|
lib/test_fileutils \
|
|
lib/test_strtod_nol
|
|
|
|
# Automake should do this, but it doesn't
|
|
check: $(check_PROGRAMS) $(PROGRAMS)
|
|
|
|
$(top_srcdir)/.version:
|
|
touch $(top_srcdir)/.version
|
|
echo $(VERSION) > $@-t && mv $@-t $@
|
|
dist-hook:
|
|
echo $(VERSION) > $(distdir)/.tarball-version
|
|
|
|
get-trans:
|
|
echo "Getting the latest translations from translationproject.org..."
|
|
rsync -Lrtvz translationproject.org::tp/latest/procps-ng/ po
|
|
rsync -Lrtvz translationproject.org::tp/latest/procps-ng-man/ man-po
|