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 | 20 | ||||
| -rwxr-xr-x | tools/gen-deps.sh | 4 |
5 files changed, 16 insertions, 16 deletions
@@ -5,7 +5,7 @@ Build Instructions ------------ - A POSIX-compliant 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/ - execline version 2.1.4.1 or later: http://skarnet.org/software/execline/ - s6 version 2.2.1.1 or later: http://skarnet.org/software/s6/ @@ -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 78e00a0..ccb32bf 100644 --- a/doc/index.html +++ b/doc/index.html @@ -46,7 +46,7 @@ scripts are also run in a controlled environment. <ul> <li> A POSIX-compliant 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 </li> <li> <a href="http://skarnet.org/software/execline/">execline</a> version diff --git a/package/deps.mak b/package/deps.mak index 53af35a..348c3db 100644 --- a/package/deps.mak +++ b/package/deps.mak @@ -31,23 +31,23 @@ src/s6-rc/s6-rc-update.o src/s6-rc/s6-rc-update.lo: src/s6-rc/s6-rc-update.c src src/s6-rc/s6-rc.o src/s6-rc/s6-rc.lo: src/s6-rc/s6-rc.c src/include/s6-rc/config.h src/include/s6-rc/s6rc.h libs6rc.a.xyzzy: src/libs6rc/s6rc_db_check_depcycles.o src/libs6rc/s6rc_db_check_pipelines.o src/libs6rc/s6rc_db_check_revdeps.o src/libs6rc/s6rc_db_read.o src/libs6rc/s6rc_db_read_sizes.o src/libs6rc/s6rc_db_read_uint32.o src/libs6rc/s6rc_graph_closure.o src/libs6rc/s6rc_lock.o src/libs6rc/s6rc_read_uint.o src/libs6rc/s6rc_sanitize_dir.o src/libs6rc/s6rc_servicedir_internal.o src/libs6rc/s6rc_servicedir_block.o src/libs6rc/s6rc_servicedir_unblock.o src/libs6rc/s6rc_servicedir_copy_offline.o src/libs6rc/s6rc_servicedir_copy_online.o src/libs6rc/s6rc_servicedir_manage.o -libs6rc.so.xyzzy: private EXTRA_LIBS := -ls6 -lskarnet +libs6rc.so.xyzzy: EXTRA_LIBS := -ls6 -lskarnet libs6rc.so.xyzzy: src/libs6rc/s6rc_db_check_depcycles.lo src/libs6rc/s6rc_db_check_pipelines.lo src/libs6rc/s6rc_db_check_revdeps.lo src/libs6rc/s6rc_db_read.lo src/libs6rc/s6rc_db_read_sizes.lo src/libs6rc/s6rc_db_read_uint32.lo src/libs6rc/s6rc_graph_closure.lo src/libs6rc/s6rc_lock.lo src/libs6rc/s6rc_read_uint.lo src/libs6rc/s6rc_sanitize_dir.lo src/libs6rc/s6rc_servicedir_internal.lo src/libs6rc/s6rc_servicedir_block.lo src/libs6rc/s6rc_servicedir_unblock.lo src/libs6rc/s6rc_servicedir_copy_offline.lo src/libs6rc/s6rc_servicedir_copy_online.lo src/libs6rc/s6rc_servicedir_manage.lo -s6-rc: private EXTRA_LIBS := ${TAINNOW_LIB} +s6-rc: EXTRA_LIBS := ${TAINNOW_LIB} s6-rc: src/s6-rc/s6-rc.o ${LIBS6RC} -lskarnet -s6-rc-bundle: private EXTRA_LIBS := +s6-rc-bundle: EXTRA_LIBS := s6-rc-bundle: src/s6-rc/s6-rc-bundle.o ${LIBS6RC} -lexecline -lskarnet -s6-rc-compile: private EXTRA_LIBS := +s6-rc-compile: EXTRA_LIBS := s6-rc-compile: src/s6-rc/s6-rc-compile.o ${LIBS6RC} -lexecline -lskarnet -s6-rc-db: private EXTRA_LIBS := +s6-rc-db: EXTRA_LIBS := s6-rc-db: src/s6-rc/s6-rc-db.o ${LIBS6RC} -lskarnet -s6-rc-dryrun: private EXTRA_LIBS := ${TAINNOW_LIB} +s6-rc-dryrun: EXTRA_LIBS := ${TAINNOW_LIB} s6-rc-dryrun: src/s6-rc/s6-rc-dryrun.o -lskarnet -s6-rc-fdholder-filler: private EXTRA_LIBS := ${TAINNOW_LIB} ${SOCKET_LIB} +s6-rc-fdholder-filler: EXTRA_LIBS := ${TAINNOW_LIB} ${SOCKET_LIB} s6-rc-fdholder-filler: src/s6-rc/s6-rc-fdholder-filler.o -ls6 -lskarnet -s6-rc-init: private EXTRA_LIBS := ${TAINNOW_LIB} ${SOCKET_LIB} +s6-rc-init: EXTRA_LIBS := ${TAINNOW_LIB} ${SOCKET_LIB} s6-rc-init: src/s6-rc/s6-rc-init.o ${LIBS6RC} -ls6 -lskarnet -s6-rc-oneshot-run: private EXTRA_LIBS := +s6-rc-oneshot-run: EXTRA_LIBS := s6-rc-oneshot-run: src/s6-rc/s6-rc-oneshot-run.o ${LIBS6RC} -lskarnet -s6-rc-update: private EXTRA_LIBS := ${TAINNOW_LIB} ${SOCKET_LIB} +s6-rc-update: EXTRA_LIBS := ${TAINNOW_LIB} ${SOCKET_LIB} s6-rc-update: src/s6-rc/s6-rc-update.o ${LIBS6RC} -ls6 -lexecline -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 |