From 2f8984613e17f9e5971ec338240b0bb6d2dd1cc6 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Sat, 11 Feb 2023 08:13:14 +0000 Subject: Code refactor; only s6-ps has remaining globals now Signed-off-by: Laurent Bercot --- package/deps.mak | 67 ++++++++++++++++++++++++++++++----------------------- package/targets.mak | 1 - 2 files changed, 38 insertions(+), 30 deletions(-) (limited to 'package') diff --git a/package/deps.mak b/package/deps.mak index 3150147..0dac63f 100644 --- a/package/deps.mak +++ b/package/deps.mak @@ -2,44 +2,53 @@ # This file has been generated by tools/gen-deps.sh # -src/minutils/rngseed.o src/minutils/rngseed.lo: src/minutils/rngseed.c src/include/s6-linux-utils/config.h -src/minutils/s6-chroot.o src/minutils/s6-chroot.lo: src/minutils/s6-chroot.c -src/minutils/s6-freeramdisk.o src/minutils/s6-freeramdisk.lo: src/minutils/s6-freeramdisk.c -src/minutils/s6-hostname.o src/minutils/s6-hostname.lo: src/minutils/s6-hostname.c -src/minutils/s6-logwatch.o src/minutils/s6-logwatch.lo: src/minutils/s6-logwatch.c -src/minutils/s6-mount.o src/minutils/s6-mount.lo: src/minutils/s6-mount.c src/minutils/mount-constants.h -src/minutils/s6-pivotchroot.o src/minutils/s6-pivotchroot.lo: src/minutils/s6-pivotchroot.c -src/minutils/s6-ps.o src/minutils/s6-ps.lo: src/minutils/s6-ps.c src/minutils/s6-ps.h -src/minutils/s6-swapoff.o src/minutils/s6-swapoff.lo: src/minutils/s6-swapoff.c -src/minutils/s6-swapon.o src/minutils/s6-swapon.lo: src/minutils/s6-swapon.c -src/minutils/s6-umount.o src/minutils/s6-umount.lo: src/minutils/s6-umount.c -src/minutils/s6ps_grcache.o src/minutils/s6ps_grcache.lo: src/minutils/s6ps_grcache.c src/minutils/s6-ps.h -src/minutils/s6ps_otree.o src/minutils/s6ps_otree.lo: src/minutils/s6ps_otree.c src/minutils/s6-ps.h -src/minutils/s6ps_pfield.o src/minutils/s6ps_pfield.lo: src/minutils/s6ps_pfield.c src/minutils/s6-ps.h -src/minutils/s6ps_pwcache.o src/minutils/s6ps_pwcache.lo: src/minutils/s6ps_pwcache.c src/minutils/s6-ps.h -src/minutils/s6ps_statparse.o src/minutils/s6ps_statparse.lo: src/minutils/s6ps_statparse.c src/minutils/s6-ps.h -src/minutils/s6ps_ttycache.o src/minutils/s6ps_ttycache.lo: src/minutils/s6ps_ttycache.c src/minutils/s6-ps.h -src/minutils/s6ps_wchan.o src/minutils/s6ps_wchan.lo: src/minutils/s6ps_wchan.c src/minutils/s6-ps.h +src/libps/s6ps_grcache.o src/libps/s6ps_grcache.lo: src/libps/s6ps_grcache.c src/include-local/s6-ps.h +src/libps/s6ps_otree.o src/libps/s6ps_otree.lo: src/libps/s6ps_otree.c src/include-local/s6-ps.h +src/libps/s6ps_pfield.o src/libps/s6ps_pfield.lo: src/libps/s6ps_pfield.c src/include-local/s6-ps.h +src/libps/s6ps_pwcache.o src/libps/s6ps_pwcache.lo: src/libps/s6ps_pwcache.c src/include-local/s6-ps.h +src/libps/s6ps_statparse.o src/libps/s6ps_statparse.lo: src/libps/s6ps_statparse.c src/include-local/s6-ps.h +src/libps/s6ps_ttycache.o src/libps/s6ps_ttycache.lo: src/libps/s6ps_ttycache.c src/include-local/s6-ps.h +src/libps/s6ps_wchan.o src/libps/s6ps_wchan.lo: src/libps/s6ps_wchan.c src/include-local/s6-ps.h +src/s6-linux-utils/rngseed.o src/s6-linux-utils/rngseed.lo: src/s6-linux-utils/rngseed.c src/include/s6-linux-utils/config.h +src/s6-linux-utils/s6-chroot.o src/s6-linux-utils/s6-chroot.lo: src/s6-linux-utils/s6-chroot.c +src/s6-linux-utils/s6-freeramdisk.o src/s6-linux-utils/s6-freeramdisk.lo: src/s6-linux-utils/s6-freeramdisk.c +src/s6-linux-utils/s6-hostname.o src/s6-linux-utils/s6-hostname.lo: src/s6-linux-utils/s6-hostname.c +src/s6-linux-utils/s6-logwatch.o src/s6-linux-utils/s6-logwatch.lo: src/s6-linux-utils/s6-logwatch.c +src/s6-linux-utils/s6-mount.o src/s6-linux-utils/s6-mount.lo: src/s6-linux-utils/s6-mount.c src/include-local/mount-constants.h +src/s6-linux-utils/s6-pivotchroot.o src/s6-linux-utils/s6-pivotchroot.lo: src/s6-linux-utils/s6-pivotchroot.c +src/s6-linux-utils/s6-ps.o src/s6-linux-utils/s6-ps.lo: src/s6-linux-utils/s6-ps.c src/include-local/s6-ps.h +src/s6-linux-utils/s6-swapoff.o src/s6-linux-utils/s6-swapoff.lo: src/s6-linux-utils/s6-swapoff.c +src/s6-linux-utils/s6-swapon.o src/s6-linux-utils/s6-swapon.lo: src/s6-linux-utils/s6-swapon.c +src/s6-linux-utils/s6-umount.o src/s6-linux-utils/s6-umount.lo: src/s6-linux-utils/s6-umount.c +ifeq ($(strip $(STATIC_LIBS_ARE_PIC)),) +libs6ps.a.xyzzy: src/libps/s6ps_grcache.o src/libps/s6ps_otree.o src/libps/s6ps_pfield.o src/libps/s6ps_pwcache.o src/libps/s6ps_statparse.o src/libps/s6ps_ttycache.o src/libps/s6ps_wchan.o +else +libs6ps.a.xyzzy: src/libps/s6ps_grcache.lo src/libps/s6ps_otree.lo src/libps/s6ps_pfield.lo src/libps/s6ps_pwcache.lo src/libps/s6ps_statparse.lo src/libps/s6ps_ttycache.lo src/libps/s6ps_wchan.lo +endif +libs6ps.so.xyzzy: EXTRA_LIBS := +libs6ps.so.xyzzy: src/libps/s6ps_grcache.lo src/libps/s6ps_otree.lo src/libps/s6ps_pfield.lo src/libps/s6ps_pwcache.lo src/libps/s6ps_statparse.lo src/libps/s6ps_ttycache.lo src/libps/s6ps_wchan.lo +s6-linux-utils: EXTRA_LIBS := -lskarnet ${SYSCLOCK_LIB} ${MAYBEPTHREAD_LIB} +s6-linux-utils: src/multicall/s6-linux-utils.o libs6ps.a.xyzzy ${LIBNSSS} rngseed: EXTRA_LIBS := -lskarnet ${SYSCLOCK_LIB} -rngseed: src/minutils/rngseed.o +rngseed: src/s6-linux-utils/rngseed.o s6-chroot: EXTRA_LIBS := -lskarnet -s6-chroot: src/minutils/s6-chroot.o +s6-chroot: src/s6-linux-utils/s6-chroot.o s6-freeramdisk: EXTRA_LIBS := -lskarnet -s6-freeramdisk: src/minutils/s6-freeramdisk.o +s6-freeramdisk: src/s6-linux-utils/s6-freeramdisk.o s6-hostname: EXTRA_LIBS := -lskarnet -s6-hostname: src/minutils/s6-hostname.o +s6-hostname: src/s6-linux-utils/s6-hostname.o s6-logwatch: EXTRA_LIBS := -lskarnet -s6-logwatch: src/minutils/s6-logwatch.o +s6-logwatch: src/s6-linux-utils/s6-logwatch.o s6-mount: EXTRA_LIBS := -lskarnet -s6-mount: src/minutils/s6-mount.o +s6-mount: src/s6-linux-utils/s6-mount.o s6-pivotchroot: EXTRA_LIBS := -lskarnet -s6-pivotchroot: src/minutils/s6-pivotchroot.o +s6-pivotchroot: src/s6-linux-utils/s6-pivotchroot.o s6-ps: EXTRA_LIBS := -lskarnet ${MAYBEPTHREAD_LIB} -s6-ps: src/minutils/s6-ps.o src/minutils/s6ps_statparse.o src/minutils/s6ps_otree.o src/minutils/s6ps_pfield.o src/minutils/s6ps_pwcache.o src/minutils/s6ps_grcache.o src/minutils/s6ps_ttycache.o src/minutils/s6ps_wchan.o ${LIBNSSS} +s6-ps: src/s6-linux-utils/s6-ps.o libs6ps.a.xyzzy ${LIBNSSS} s6-swapoff: EXTRA_LIBS := -lskarnet -s6-swapoff: src/minutils/s6-swapoff.o +s6-swapoff: src/s6-linux-utils/s6-swapoff.o s6-swapon: EXTRA_LIBS := -lskarnet -s6-swapon: src/minutils/s6-swapon.o +s6-swapon: src/s6-linux-utils/s6-swapon.o s6-umount: EXTRA_LIBS := -lskarnet -s6-umount: src/minutils/s6-umount.o +s6-umount: src/s6-linux-utils/s6-umount.o diff --git a/package/targets.mak b/package/targets.mak index f42cb5a..fb7af4c 100644 --- a/package/targets.mak +++ b/package/targets.mak @@ -12,4 +12,3 @@ s6-swapon \ s6-umount LIBEXEC_TARGETS := - -- cgit 1.4.1