summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2015-01-14 00:44:45 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2015-01-14 00:44:45 +0000
commit1f84ac05f76e73be294d74e5999e030a07221d68 (patch)
tree85ebf5545c0df31211755429c06e91ea50ee8eac /package
parent040737a72f3830d40f2c89be919479ddef97ef1d (diff)
downloadexecline-1f84ac05f76e73be294d74e5999e030a07221d68.tar.xz
- Parallel build fixv2.0.1.1
- version change to 2.0.1.1, release candidate
Diffstat (limited to 'package')
-rw-r--r--package/deps.mak50
-rw-r--r--package/info2
-rw-r--r--package/targets.mak6
3 files changed, 32 insertions, 26 deletions
diff --git a/package/deps.mak b/package/deps.mak
index 182f362..1794379 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -66,27 +66,27 @@ src/libexecline/exlsn_main.o src/libexecline/exlsn_main.lo: src/libexecline/exls
src/libexecline/exlsn_multidefine.o src/libexecline/exlsn_multidefine.lo: src/libexecline/exlsn_multidefine.c src/include/execline/execline.h src/include-local/exlsn.h
background: private EXTRA_LIBS :=
-background: src/execline/background.o -lexecline -lskarnet
+background: src/execline/background.o ${LIBEXECLINE} -lskarnet
backtick: private EXTRA_LIBS :=
-backtick: src/execline/backtick.o -lexecline -lskarnet
+backtick: src/execline/backtick.o ${LIBEXECLINE} -lskarnet
cd: private EXTRA_LIBS :=
cd: src/execline/cd.o -lskarnet
define: private EXTRA_LIBS :=
-define: src/execline/define.o -lexecline -lskarnet
+define: src/execline/define.o ${LIBEXECLINE} -lskarnet
dollarat: private EXTRA_LIBS :=
dollarat: src/execline/dollarat.o -lskarnet
elgetopt: private EXTRA_LIBS :=
-elgetopt: src/execline/elgetopt.o -lexecline -lskarnet
+elgetopt: src/execline/elgetopt.o ${LIBEXECLINE} -lskarnet
elgetpositionals: private EXTRA_LIBS :=
-elgetpositionals: src/execline/elgetpositionals.o -lexecline -lskarnet
+elgetpositionals: src/execline/elgetpositionals.o ${LIBEXECLINE} -lskarnet
elglob: private EXTRA_LIBS :=
-elglob: src/execline/elglob.o -lexecline -lskarnet
+elglob: src/execline/elglob.o ${LIBEXECLINE} -lskarnet
emptyenv: private EXTRA_LIBS :=
-emptyenv: src/execline/emptyenv.o -lexecline -lskarnet
+emptyenv: src/execline/emptyenv.o ${LIBEXECLINE} -lskarnet
exec: private EXTRA_LIBS :=
exec: src/execline/exec.o -lskarnet
execlineb: private EXTRA_LIBS :=
-execlineb: src/execline/execlineb.o -lexecline -lskarnet
+execlineb: src/execline/execlineb.o ${LIBEXECLINE} -lskarnet
exit: private EXTRA_LIBS :=
exit: src/execline/exit.o -lskarnet
export: private EXTRA_LIBS :=
@@ -100,11 +100,11 @@ fdmove: src/execline/fdmove.o -lskarnet
fdreserve: private EXTRA_LIBS :=
fdreserve: src/execline/fdreserve.o -lskarnet
forbacktickx: private EXTRA_LIBS :=
-forbacktickx: src/execline/forbacktickx.o -lexecline -lskarnet
+forbacktickx: src/execline/forbacktickx.o ${LIBEXECLINE} -lskarnet
foreground: private EXTRA_LIBS :=
-foreground: src/execline/foreground.o -lexecline -lskarnet
+foreground: src/execline/foreground.o ${LIBEXECLINE} -lskarnet
forx: private EXTRA_LIBS :=
-forx: src/execline/forx.o -lexecline -lskarnet
+forx: src/execline/forx.o ${LIBEXECLINE} -lskarnet
getpid: private EXTRA_LIBS :=
getpid: src/execline/getpid.o -lskarnet
heredoc: private EXTRA_LIBS :=
@@ -112,40 +112,40 @@ heredoc: src/execline/heredoc.o -lskarnet
homeof: private EXTRA_LIBS :=
homeof: src/execline/homeof.o -lskarnet
if: private EXTRA_LIBS :=
-if: src/execline/if.o -lexecline -lskarnet
+if: src/execline/if.o ${LIBEXECLINE} -lskarnet
ifelse: private EXTRA_LIBS :=
-ifelse: src/execline/ifelse.o -lexecline -lskarnet
+ifelse: src/execline/ifelse.o ${LIBEXECLINE} -lskarnet
ifte: private EXTRA_LIBS :=
-ifte: src/execline/ifte.o -lexecline -lskarnet
+ifte: src/execline/ifte.o ${LIBEXECLINE} -lskarnet
ifthenelse: private EXTRA_LIBS :=
-ifthenelse: src/execline/ifthenelse.o -lexecline -lskarnet
+ifthenelse: src/execline/ifthenelse.o ${LIBEXECLINE} -lskarnet
import: private EXTRA_LIBS :=
-import: src/execline/import.o -lexecline -lskarnet
+import: src/execline/import.o ${LIBEXECLINE} -lskarnet
importas: private EXTRA_LIBS :=
-importas: src/execline/importas.o -lexecline -lskarnet
+importas: src/execline/importas.o ${LIBEXECLINE} -lskarnet
loopwhilex: private EXTRA_LIBS :=
-loopwhilex: src/execline/loopwhilex.o -lexecline -lskarnet
+loopwhilex: src/execline/loopwhilex.o ${LIBEXECLINE} -lskarnet
multidefine: private EXTRA_LIBS :=
-multidefine: src/execline/multidefine.o -lexecline -lskarnet
+multidefine: src/execline/multidefine.o ${LIBEXECLINE} -lskarnet
multisubstitute: private EXTRA_LIBS :=
-multisubstitute: src/execline/multisubstitute.o -lexecline -lskarnet
+multisubstitute: src/execline/multisubstitute.o ${LIBEXECLINE} -lskarnet
pipeline: private EXTRA_LIBS :=
-pipeline: src/execline/pipeline.o -lexecline -lskarnet
+pipeline: src/execline/pipeline.o ${LIBEXECLINE} -lskarnet
piperw: private EXTRA_LIBS :=
piperw: src/execline/piperw.o -lskarnet
redirfd: private EXTRA_LIBS :=
redirfd: src/execline/redirfd.o -lskarnet
runblock: private EXTRA_LIBS :=
-runblock: src/execline/runblock.o -lexecline -lskarnet
+runblock: src/execline/runblock.o ${LIBEXECLINE} -lskarnet
shift: private EXTRA_LIBS :=
-shift: src/execline/shift.o -lexecline -lskarnet
+shift: src/execline/shift.o ${LIBEXECLINE} -lskarnet
tryexec: private EXTRA_LIBS :=
-tryexec: src/execline/tryexec.o -lexecline -lskarnet
+tryexec: src/execline/tryexec.o ${LIBEXECLINE} -lskarnet
umask: private EXTRA_LIBS :=
umask: src/execline/umask.o -lskarnet
unexport: private EXTRA_LIBS :=
unexport: src/execline/unexport.o -lskarnet
wait: private EXTRA_LIBS :=
-wait: src/execline/wait.o -lexecline -lskarnet
+wait: src/execline/wait.o ${LIBEXECLINE} -lskarnet
libexecline.a: src/libexecline/el_execsequence.o src/libexecline/el_getstrict.o src/libexecline/el_obsolescent.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: src/libexecline/el_execsequence.lo src/libexecline/el_getstrict.lo src/libexecline/el_obsolescent.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/package/info b/package/info
index 22ec255..9856244 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
package=execline
-version=2.0.1.0
+version=2.0.1.1
category=admin
package_macro_name=EXECLINE
diff --git a/package/targets.mak b/package/targets.mak
index 2ecfe72..6f58541 100644
--- a/package/targets.mak
+++ b/package/targets.mak
@@ -44,6 +44,12 @@ wait
SBIN_TARGETS :=
LIBEXEC_TARGETS :=
+ifdef DO_ALLSTATIC
+LIBEXECLINE := libexecline.a
+else
+LIBEXECLINE := libexecline.so
+endif
+
ifdef DO_SHARED
SHARED_LIBS := libexecline.so
endif