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.

diff --git a/cde/programs/localized/templates/app-defaults.am b/cde/programs/localized/templates/app-defaults.am
index 548b00f0c2b553e4d4072aadb7542f55df2068ad..67c5c5a58eb3304d3b513066babd5d2a0f7c9f93 100644 (file)
--- 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 d13e19ba4f3ba806ee221cb54ba1afb3b9a6f015..30d5619c4831357966f75e8e9deb3113169348ec 100644 (file)
--- 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 a611f79ac7ba3157aeb404339b3921cb23b6507f..139016543c71577cf8b6beedd240b795b50b7d78 100644 (file)
--- 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          \