Merge branch 'master' into autotools-conversion

2020-11-24 16:53:24 -07:00
parent 2b338e4241 dc45d133c9
commit 90e61dda5f
56 changed files with 307 additions and 186 deletions
--- a/cde/programs/dthelp/parser/pass1/parser/Imakefile
+++ b/cde/programs/dthelp/parser/pass1/parser/Imakefile
@@ -44,6 +44,7 @@ XLATEOBJECTS = $(HELPTAGSRC)/LocaleXlate.o $(HELPTAGSRC)/XlationSvc.o
 APPLOBJECTS = \
 	$(HELPTAGSRC)/custom.o \
 	$(HELPTAGSRC)/default.o \
+	$(HELPTAGSRC)/global.o \
 	$(HELPTAGSRC)/help.o \
 	$(HELPTAGSRC)/make.o \
 	$(HELPTAGSRC)/option.o \