From b64d91d5a942b0b7fcf9b94a38b362389e3c9294 Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Tue, 24 Mar 2020 17:54:47 -0600 Subject: [PATCH] app-defaults, config, types: re-enable parallel builds With a fixed merge utility, we can run these builds in parallel now without random corruption of the message files. --- cde/programs/localized/templates/app-defaults.am | 4 ---- cde/programs/localized/templates/config.am | 4 ---- cde/programs/localized/templates/types.am | 4 ---- 3 files changed, 12 deletions(-) diff --git a/cde/programs/localized/templates/app-defaults.am b/cde/programs/localized/templates/app-defaults.am index 548b00f0c..67c5c5a58 100644 --- a/cde/programs/localized/templates/app-defaults.am +++ b/cde/programs/localized/templates/app-defaults.am @@ -1,9 +1,5 @@ # process the app-defaults files... -# We can't do parallel builds here because MERGE is rather dumb and -# hardcodes file names and the like. -.NOTPARALLEL: - #NOTYET - Dtinfo BUILT_SOURCES = Dthelpview Dtimsstart Dtlogin Dthello Dtsession \ diff --git a/cde/programs/localized/templates/config.am b/cde/programs/localized/templates/config.am index d13e19ba4..30d5619c4 100644 --- a/cde/programs/localized/templates/config.am +++ b/cde/programs/localized/templates/config.am @@ -1,9 +1,5 @@ # process the config files... -# We can't do parallel builds here because MERGE is rather dumb and -# hardcodes file names and the like. -.NOTPARALLEL: - BUILT_SOURCES = sys.resources sys.session sys.font sys.dtwmrc \ Xresources dtfile.config home.session current.session \ display.home.session display.current.session 0100.session \ diff --git a/cde/programs/localized/templates/types.am b/cde/programs/localized/templates/types.am index a611f79ac..139016543 100644 --- a/cde/programs/localized/templates/types.am +++ b/cde/programs/localized/templates/types.am @@ -1,9 +1,5 @@ # process the types files... -# We can't do parallel builds here because MERGE is rather dumb and -# hardcodes file names and the like. -.NOTPARALLEL: - DTTYPES = autoStart.dt user-prefs.dt uxstd.dt dt.dt develop.dt \ datatypes.dt dtappman.dt dtfile.dt dtims.dt dtinfo.dt \ dtpad.dt xclients.dt dthelp.dt dthelpprint.dt print.dt \