From cbdb9cb3faf919d6cafc870e592718a5e857be04 Mon Sep 17 00:00:00 2001 From: Chase Date: Fri, 12 Feb 2021 10:06:33 -0600 Subject: [PATCH] dtksh: allow parallel building --- cde/.gitignore | 1 + cde/programs/dtksh/Makefile.am | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/cde/.gitignore b/cde/.gitignore index c08a0282a..35e050793 100644 --- a/cde/.gitignore +++ b/cde/.gitignore @@ -829,6 +829,7 @@ programs/dtinfo/tools/misc/treeres programs/dtksh/FEATURE programs/dtksh/dtksh programs/dtksh/init.c +programs/dtksh/DtFuncs.dtsh programs/dtksh/examples/CallDataTest4 programs/dtksh/examples/CallbackTest2 programs/dtksh/examples/DtCursorTest2 diff --git a/cde/programs/dtksh/Makefile.am b/cde/programs/dtksh/Makefile.am index 7cc303ae3..098c71e2a 100644 --- a/cde/programs/dtksh/Makefile.am +++ b/cde/programs/dtksh/Makefile.am @@ -1,9 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -# Can't build multi-core in here yet. -.NOTPARALLEL: - -CLEANFILES = init.c FEATURE +CLEANFILES = init.c FEATURE DtFuncs.dtsh SUBDIRS = examples @@ -21,6 +18,8 @@ KSH93LIBSHELL = $(KSH93SRC)/lib/libshell.a bin_PROGRAMS = dtksh +BUILT_SOURCES = init.c + dtksh_CPPFLAGS = -I$(KSH93SRC)/include/ast -I$(KSH93SRC)/src/cmd/ksh93/include \ -I$(KSH93SRC)/src/cmd/ksh93 -I${srcdir}/lib/DtPrint \ -I${srcdir}/lib/DtHelp '-DAST_VERSION=20111111' \ @@ -70,10 +69,11 @@ init.c: libshell.a: $(KSH93SLIBSHELL) dtksh-init.o $(CP) $(KSH93LIBSHELL) libshell.a; \ - ar d libshell.a init.o; \ + $(AR) d libshell.a init.o; \ $(AR) cq libshell.a dtksh-init.o clean-local: - cd ksh93 && ./bin/package clean + cd ksh93 && ./bin/package flat clean DtFuncs.dtsh: + $(CP) DtFuncs.sh DtFuncs.dtsh