summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2015-10-12 11:17:12 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2015-10-12 11:17:12 +0000
commit09b48f62e39b58594fa8db8b7adb6b8a8e0ff8ff (patch)
treedaabb6ec8204ae615b437e1deea88bd66bc7b6cb
parentd3e43f5ccc6e07238ef8434eee17f74ceea6d51f (diff)
downloadexecline-09b48f62e39b58594fa8db8b7adb6b8a8e0ff8ff.tar.xz
Test make-3.81 compatibility
-rw-r--r--Makefile2
-rw-r--r--package/deps.mak2
-rwxr-xr-xtools/gen-deps.sh2
3 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 6eba87f..961f787 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
diff --git a/package/deps.mak b/package/deps.mak
index 715a661..3dd31cf 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -165,5 +165,5 @@ wait: src/execline/wait.o ${LIBEXECLINE} -lskarnet
withstdinas: private EXTRA_LIBS :=
withstdinas: src/execline/withstdinas.o -lskarnet
libexecline.a.xyzzy: src/libexecline/el_execsequence.o src/libexecline/el_getstrict.o src/libexecline/el_parse.o src/libexecline/el_parse_from_buffer.o src/libexecline/el_parse_from_string.o src/libexecline/el_popenv.o src/libexecline/el_pushenv.o src/libexecline/el_semicolon.o src/libexecline/el_spawn0.o src/libexecline/el_spawn1.o src/libexecline/el_substandrun.o src/libexecline/el_substandrun_str.o src/libexecline/el_substitute.o src/libexecline/el_transform.o src/libexecline/el_vardupl.o src/libexecline/exlsn_define.o src/libexecline/exlsn_elglob.o src/libexecline/exlsn_import.o src/libexecline/exlsn_multidefine.o src/libexecline/exlsn_exlp.o src/libexecline/exlsn_main.o src/libexecline/exlsn_free.o src/libexecline/exlp.o
-libexecline.so.xyzzy: private EXTRA_LIBS := -lskarnet
+libexecline.so.xyzzy: EXTRA_LIBS := -lskarnet
libexecline.so.xyzzy: src/libexecline/el_execsequence.lo src/libexecline/el_getstrict.lo src/libexecline/el_parse.lo src/libexecline/el_parse_from_buffer.lo src/libexecline/el_parse_from_string.lo src/libexecline/el_popenv.lo src/libexecline/el_pushenv.lo src/libexecline/el_semicolon.lo src/libexecline/el_spawn0.lo src/libexecline/el_spawn1.lo src/libexecline/el_substandrun.lo src/libexecline/el_substandrun_str.lo src/libexecline/el_substitute.lo src/libexecline/el_transform.lo src/libexecline/el_vardupl.lo src/libexecline/exlsn_define.lo src/libexecline/exlsn_elglob.lo src/libexecline/exlsn_import.lo src/libexecline/exlsn_multidefine.lo src/libexecline/exlsn_exlp.lo src/libexecline/exlsn_main.lo src/libexecline/exlsn_free.lo src/libexecline/exlp.lo
diff --git a/tools/gen-deps.sh b/tools/gen-deps.sh
index f8cf5ee..d3eaaa3 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