diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2014-12-16 02:45:05 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2014-12-16 02:45:05 +0000 |
| commit | 48c43e0d7549ee1f79f1070549419b4e44b2c01c (patch) | |
| tree | 1c84f0c1562161e13ab1082fa4fbdf5cd5555375 | |
| parent | 670e0a5a9459d255d354337c861f11dc2ca9091d (diff) | |
| download | s6-linux-utils-48c43e0d7549ee1f79f1070549419b4e44b2c01c.tar.xz | |
Update gen-deps.sh and deps.mak
| -rw-r--r-- | package/deps.mak | 17 | ||||
| -rwxr-xr-x | tools/gen-deps.sh | 8 |
2 files changed, 23 insertions, 2 deletions
diff --git a/package/deps.mak b/package/deps.mak index 7946756..50629e5 100644 --- a/package/deps.mak +++ b/package/deps.mak @@ -17,7 +17,7 @@ src/minutils/s6-reboot.o src/minutils/s6-reboot.lo: src/minutils/s6-reboot.c 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/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 @@ -25,18 +25,33 @@ src/minutils/s6ps_statparse.o src/minutils/s6ps_statparse.lo: src/minutils/s6ps_ 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 +s6-chroot: private EXTRA_LIBS := s6-chroot: src/minutils/s6-chroot.o -lskarnet +s6-devd: private EXTRA_LIBS := s6-devd: src/minutils/s6-devd.o -lskarnet +s6-freeramdisk: private EXTRA_LIBS := s6-freeramdisk: src/minutils/s6-freeramdisk.o -lskarnet +s6-halt: private EXTRA_LIBS := s6-halt: src/minutils/s6-halt.o -lskarnet +s6-hiercopy: private EXTRA_LIBS := s6-hiercopy: src/minutils/s6-hiercopy.o -lskarnet +s6-hostname: private EXTRA_LIBS := s6-hostname: src/minutils/s6-hostname.o -lskarnet +s6-logwatch: private EXTRA_LIBS := s6-logwatch: src/minutils/s6-logwatch.o -lskarnet +s6-mount: private EXTRA_LIBS := s6-mount: src/minutils/s6-mount.o -lskarnet +s6-pivotchroot: private EXTRA_LIBS := s6-pivotchroot: src/minutils/s6-pivotchroot.o -lskarnet +s6-poweroff: private EXTRA_LIBS := s6-poweroff: src/minutils/s6-poweroff.o -lskarnet +s6-ps: private EXTRA_LIBS := 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 -lskarnet +s6-reboot: private EXTRA_LIBS := s6-reboot: src/minutils/s6-reboot.o -lskarnet +s6-swapoff: private EXTRA_LIBS := s6-swapoff: src/minutils/s6-swapoff.o -lskarnet +s6-swapon: private EXTRA_LIBS := s6-swapon: src/minutils/s6-swapon.o -lskarnet +s6-umount: private EXTRA_LIBS := s6-umount: src/minutils/s6-umount.o -lskarnet diff --git a/tools/gen-deps.sh b/tools/gen-deps.sh index af31259..66f6d3e 100755 --- a/tools/gen-deps.sh +++ b/tools/gen-deps.sh @@ -68,12 +68,18 @@ for dir in $(ls -1 src | grep -v ^include) ; do for file in $(ls -1 src/$dir/deps-exe) ; do deps= + libs= while read dep ; do if echo $dep | grep -q -- \\.o$ ; then dep="src/$dir/$dep" fi - deps="$deps $dep" + if echo $dep | grep -q ^\\\$ ; then + libs="$libs $dep" + else + deps="$deps $dep" + fi done < src/$dir/deps-exe/$file + echo "$file: private EXTRA_LIBS :=$libs" echo "$file: src/$dir/$file.o$deps" done done |