diff options
| -rw-r--r-- | INSTALL | 2 | ||||
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | doc/index.html | 2 | ||||
| -rw-r--r-- | package/deps.mak | 33 | ||||
| -rwxr-xr-x | tools/gen-deps.sh | 4 |
5 files changed, 22 insertions, 23 deletions
diff --git a/INSTALL b/INSTALL index d977540..76cb799 100644 --- a/INSTALL +++ b/INSTALL @@ -5,7 +5,7 @@ Build Instructions ------------ - A Linux-based system with a standard C development environment - - GNU make version 4.0 or later + - GNU make version 3.81 or later - skalibs version 2.3.7.1 or later: http://skarnet.org/software/skalibs/ This software is Linux-specific. It will run on a Linux kernel, diff --git a/Makefile b/Makefile index 6eba87f..c3b4a4a 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ it: all -make_need := 4.0 +make_need := 3.81 ifeq "" "$(strip $(filter $(make_need), $(firstword $(sort $(make_need) $(MAKE_VERSION)))))" fail := $(error Your make ($(MAKE_VERSION)) is too old. You need $(make_need) or newer) endif @@ -20,7 +20,7 @@ INTERNAL_LIBS := EXTRA_TARGETS := LIB_DEFS := -define library_definition = +define library_definition LIB$(firstword $(subst =, ,$(1))) := lib$(lastword $(subst =, ,$(1))).$(if $(DO_ALLSTATIC),a,so).xyzzy ifdef DO_SHARED SHARED_LIBS += lib$(lastword $(subst =, ,$(1))).so.xyzzy diff --git a/doc/index.html b/doc/index.html index f02fe69..9a95445 100644 --- a/doc/index.html +++ b/doc/index.html @@ -31,7 +31,7 @@ <ul> <li> A Linux-based system with a standard C development environment </li> - <li> GNU make, version 4.0 or later </li> + <li> GNU make, version 3.81 or later </li> <li> <a href="http://skarnet.org/software/skalibs/">skalibs</a> version 2.3.7.1 or later. It's a build-time requirement. It's also a run-time requirement if you link against the shared version of the skalibs diff --git a/package/deps.mak b/package/deps.mak index c013b69..00606ca 100644 --- a/package/deps.mak +++ b/package/deps.mak @@ -6,7 +6,6 @@ src/minutils/s6-chroot.o src/minutils/s6-chroot.lo: src/minutils/s6-chroot.c src/minutils/s6-devd.o src/minutils/s6-devd.lo: src/minutils/s6-devd.c src/include/s6-linux-utils/config.h src/minutils/s6-freeramdisk.o src/minutils/s6-freeramdisk.lo: src/minutils/s6-freeramdisk.c src/minutils/s6-halt.o src/minutils/s6-halt.lo: src/minutils/s6-halt.c -src/minutils/s6-hiercopy.o src/minutils/s6-hiercopy.lo: src/minutils/s6-hiercopy.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 @@ -27,35 +26,35 @@ 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: EXTRA_LIBS := s6-chroot: src/minutils/s6-chroot.o -lskarnet -s6-devd: private EXTRA_LIBS := +s6-devd: EXTRA_LIBS := s6-devd: src/minutils/s6-devd.o -lskarnet -s6-freeramdisk: private EXTRA_LIBS := +s6-freeramdisk: EXTRA_LIBS := s6-freeramdisk: src/minutils/s6-freeramdisk.o -lskarnet -s6-halt: private EXTRA_LIBS := +s6-halt: EXTRA_LIBS := s6-halt: src/minutils/s6-halt.o -lskarnet -s6-hostname: private EXTRA_LIBS := +s6-hostname: EXTRA_LIBS := s6-hostname: src/minutils/s6-hostname.o -lskarnet -s6-logwatch: private EXTRA_LIBS := +s6-logwatch: EXTRA_LIBS := s6-logwatch: src/minutils/s6-logwatch.o -lskarnet -s6-mount: private EXTRA_LIBS := +s6-mount: EXTRA_LIBS := s6-mount: src/minutils/s6-mount.o -lskarnet -s6-pivotchroot: private EXTRA_LIBS := +s6-pivotchroot: EXTRA_LIBS := s6-pivotchroot: src/minutils/s6-pivotchroot.o -lskarnet -s6-poweroff: private EXTRA_LIBS := +s6-poweroff: EXTRA_LIBS := s6-poweroff: src/minutils/s6-poweroff.o -lskarnet -s6-ps: private EXTRA_LIBS := +s6-ps: 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: EXTRA_LIBS := s6-reboot: src/minutils/s6-reboot.o -lskarnet -s6-swapoff: private EXTRA_LIBS := +s6-swapoff: EXTRA_LIBS := s6-swapoff: src/minutils/s6-swapoff.o -lskarnet -s6-swapon: private EXTRA_LIBS := +s6-swapon: EXTRA_LIBS := s6-swapon: src/minutils/s6-swapon.o -lskarnet -s6-uevent-listener: private EXTRA_LIBS := +s6-uevent-listener: EXTRA_LIBS := s6-uevent-listener: src/minutils/s6-uevent-listener.o -lskarnet -s6-uevent-spawner: private EXTRA_LIBS := +s6-uevent-spawner: EXTRA_LIBS := s6-uevent-spawner: src/minutils/s6-uevent-spawner.o -lskarnet -s6-umount: private EXTRA_LIBS := +s6-umount: EXTRA_LIBS := s6-umount: src/minutils/s6-umount.o -lskarnet diff --git a/tools/gen-deps.sh b/tools/gen-deps.sh index f8cf5ee..5c96dd1 100755 --- a/tools/gen-deps.sh +++ b/tools/gen-deps.sh @@ -66,7 +66,7 @@ for dir in $(ls -1 src | grep -v ^include) ; do fi done < src/$dir/deps-lib/$file echo "lib${file}.a.xyzzy:$deps" - echo "lib${file}.so.xyzzy: private EXTRA_LIBS :=$libs" + echo "lib${file}.so.xyzzy: EXTRA_LIBS :=$libs" echo "lib${file}.so.xyzzy:$(echo "$deps" | sed 's/\.o/.lo/g')" done @@ -83,7 +83,7 @@ for dir in $(ls -1 src | grep -v ^include) ; do deps="$deps $dep" fi done < src/$dir/deps-exe/$file - echo "$file: private EXTRA_LIBS :=$libs" + echo "$file: EXTRA_LIBS :=$libs" echo "$file: src/$dir/$file.o$deps" done done |