diff --git a/cde/.gitignore b/cde/.gitignore index 834b71d75..803ec8231 100644 --- a/cde/.gitignore +++ b/cde/.gitignore @@ -390,7 +390,7 @@ doc/C/guides/ttGuide/TOC.sgm doc/C/guides/usersGuide/TOC.sgm doc/C/guides/man/TOC.sgm doc/C/cde.dti/ -doc/C/help-sdl/ +doc/C/help/*.sdl doc/C/m-guides/ doc/C/man/man1/ doc/C/man/man1m/ @@ -402,22 +402,22 @@ doc/de_DE.ISO8859-1/cde.dti/ doc/de_DE.ISO8859-1/guides/infoUGd/TOC.sgm doc/de_DE.ISO8859-1/guides/sysAdminGuide/TOC.sgm doc/de_DE.ISO8859-1/guides/usersGuide/TOC.sgm -doc/de_DE.ISO8859-1/help-sdl/ +doc/de_DE.ISO8859-1/help/*.sdl doc/es_ES.ISO8859-1/cde.dti/ doc/es_ES.ISO8859-1/guides/infoUGd/TOC.sgm doc/es_ES.ISO8859-1/guides/sysAdminGuide/TOC.sgm doc/es_ES.ISO8859-1/guides/usersGuide/TOC.sgm -doc/es_ES.ISO8859-1/help-sdl/ +doc/es_ES.ISO8859-1/help/*.sdl doc/fr_FR.ISO8859-1/cde.dti/ doc/fr_FR.ISO8859-1/guides/infoUGd/TOC.sgm doc/fr_FR.ISO8859-1/guides/sysAdminGuide/TOC.sgm doc/fr_FR.ISO8859-1/guides/usersGuide/TOC.sgm -doc/fr_FR.ISO8859-1/help-sdl/ +doc/fr_FR.ISO8859-1/help/*.sdl doc/it_IT.ISO8859-1/cde.dti/ doc/it_IT.ISO8859-1/guides/infoUGd/TOC.sgm doc/it_IT.ISO8859-1/guides/sysAdminGuide/TOC.sgm doc/it_IT.ISO8859-1/guides/usersGuide/TOC.sgm -doc/it_IT.ISO8859-1/help-sdl/ +doc/it_IT.ISO8859-1/help/*.sdl doc/ja_JP.dt-eucJP/m-guides/ doc/tmp/ doc/util/dbtoman/instant/instant diff --git a/cde/configure.ac b/cde/configure.ac index 38eefbd21..fbbbc4770 100644 --- a/cde/configure.ac +++ b/cde/configure.ac @@ -778,6 +778,7 @@ doc/util/dbtoman/Makefile doc/util/dbtoman/instant/Makefile doc/C/Makefile +doc/C/help/Makefile include/Makefile diff --git a/cde/doc/C/help/Makefile.am b/cde/doc/C/help/Makefile.am index dec84f492..2138732ba 100644 --- a/cde/doc/C/help/Makefile.am +++ b/cde/doc/C/help/Makefile.am @@ -1,20 +1,9 @@ -include ../../../programs/localized/templates/C.tmpl -include ../../common/help/Appmanager.tmpl -include ../../common/help/AppBuilder.tmpl -include ../../common/help/Calculator.tmpl -include ../../common/help/Calendar.tmpl -include ../../common/help/CreatAct.tmpl -include ../../common/help/FPanel.tmpl -include ../../common/help/Filemgr.tmpl -include ../../common/help/Help4Help.tmpl -include ../../common/help/Iconed.tmpl -include ../../common/help/Infomgr.tmpl -include ../../common/help/Intromgr.tmpl -include ../../common/help/LibDtPrint.tmpl -include ../../common/help/Loginmgr.tmpl -include ../../common/help/Mailer.tmpl -include ../../common/help/Printmgr.tmpl -include ../../common/help/PrnSetup.tmpl -include ../../common/help/Stylemgr.tmpl -include ../../common/help/Terminal.tmpl -include ../../common/help/Textedit.tmpl +MAINTAINERCLEANFILES = Makefile.in + +# FIXME dtdocbook needs to be fixed to allow parallel building here +.NOTPARALLEL: + +# this sets the LANG and HELP_LANG variables +include $(top_srcdir)/programs/localized/templates/C.am +# this does all the work +include $(top_srcdir)/doc/common/help/sdl-docs.am diff --git a/cde/doc/common/help/AppBuilder.tmpl b/cde/doc/common/help/AppBuilder.tmpl deleted file mode 100644 index 498be9a33..000000000 --- a/cde/doc/common/help/AppBuilder.tmpl +++ /dev/null @@ -1,7 +0,0 @@ -SRCS = \ - AppBuilder/Concepts.sgm AppBuilder/MetaInfo.sgm AppBuilder/book.sgm \ - AppBuilder/GEntity.sgm AppBuilder/Ref.sgm \ - AppBuilder/Home.sgm AppBuilder/Tasks.sgm - -NAME = AppBuilder -include ../../common/help/sdlvolume.tmpl diff --git a/cde/doc/common/help/Appmanager.tmpl b/cde/doc/common/help/Appmanager.tmpl deleted file mode 100644 index d824315c2..000000000 --- a/cde/doc/common/help/Appmanager.tmpl +++ /dev/null @@ -1,8 +0,0 @@ -SRCS = \ - Appmanager/GEntity.sgm Appmanager/TOC.sgm \ - Appmanager/Home.sgm Appmanager/Tasks.sgm \ - Appmanager/MetaInfo.sgm Appmanager/book.sgm \ - Appmanager/Ref.sgm - -NAME = Appmanager -include ../../common/help/sdlvolume.tmpl diff --git a/cde/doc/common/help/Calculator.tmpl b/cde/doc/common/help/Calculator.tmpl deleted file mode 100644 index 9c9ca2fac..000000000 --- a/cde/doc/common/help/Calculator.tmpl +++ /dev/null @@ -1,7 +0,0 @@ -SRCS = \ - Calculator/GEntity.sgm Calculator/Ref.sgm Calculator/book.sgm \ - Calculator/Home.sgm Calculator/TOC.sgm \ - Calculator/MetaInfo.sgm Calculator/Tasks.sgm - -NAME = Calculator -include ../../common/help/sdlvolume.tmpl diff --git a/cde/doc/common/help/Calendar.tmpl b/cde/doc/common/help/Calendar.tmpl deleted file mode 100644 index 538aebf0a..000000000 --- a/cde/doc/common/help/Calendar.tmpl +++ /dev/null @@ -1,7 +0,0 @@ -SRCS = \ - Calendar/Appendix.sgm Calendar/MetaInfo.sgm Calendar/Tasks.sgm \ - Calendar/GEntity.sgm Calendar/Ref.sgm Calendar/book.sgm \ - Calendar/Home.sgm Calendar/TOC.sgm - -NAME = Calendar -include ../../common/help/sdlvolume.tmpl diff --git a/cde/doc/common/help/CreatAct.tmpl b/cde/doc/common/help/CreatAct.tmpl deleted file mode 100644 index e0c678c71..000000000 --- a/cde/doc/common/help/CreatAct.tmpl +++ /dev/null @@ -1,7 +0,0 @@ -SRCS = \ - CreatAct/GEntity.sgm CreatAct/Ref.sgm CreatAct/book.sgm \ - CreatAct/Home.sgm CreatAct/TOC.sgm \ - CreatAct/MetaInfo.sgm CreatAct/Tasks.sgm - -NAME = CreatAct -include ../../common/help/sdlvolume.tmpl diff --git a/cde/doc/common/help/FPanel.tmpl b/cde/doc/common/help/FPanel.tmpl deleted file mode 100644 index 8dfdf5c27..000000000 --- a/cde/doc/common/help/FPanel.tmpl +++ /dev/null @@ -1,7 +0,0 @@ -SRCS = \ - FPanel/Appendix.sgm FPanel/MetaInfo.sgm FPanel/Using.sgm \ - FPanel/GEntity.sgm FPanel/Ref.sgm FPanel/book.sgm \ - FPanel/Home.sgm FPanel/TOC.sgm - -NAME = FPanel -include ../../common/help/sdlvolume.tmpl diff --git a/cde/doc/common/help/Filemgr.tmpl b/cde/doc/common/help/Filemgr.tmpl deleted file mode 100644 index 753c353ed..000000000 --- a/cde/doc/common/help/Filemgr.tmpl +++ /dev/null @@ -1,7 +0,0 @@ -SRCS = \ - Filemgr/Concepts.sgm Filemgr/Messages.sgm Filemgr/TOC.sgm \ - Filemgr/GEntity.sgm Filemgr/MetaInfo.sgm Filemgr/Tasks.sgm \ - Filemgr/Home.sgm Filemgr/Ref.sgm Filemgr/book.sgm - -NAME = Filemgr -include ../../common/help/Filemgr.tmpl diff --git a/cde/doc/common/help/Help4Help.tmpl b/cde/doc/common/help/Help4Help.tmpl deleted file mode 100644 index 148c8a601..000000000 --- a/cde/doc/common/help/Help4Help.tmpl +++ /dev/null @@ -1,9 +0,0 @@ -SRCS = \ - Help4Help/Appendix.sgm Help4Help/Ref.sgm \ - Help4Help/Concepts.sgm Help4Help/TOC.sgm \ - Help4Help/GEntity.sgm Help4Help/Tasks.sgm \ - Help4Help/Home.sgm Help4Help/book.sgm \ - Help4Help/MetaInfo.sgm - -NAME = Help4Help -include ../../common/help/sdlvolume.tmpl diff --git a/cde/doc/common/help/Iconed.tmpl b/cde/doc/common/help/Iconed.tmpl deleted file mode 100644 index 3c403a7a7..000000000 --- a/cde/doc/common/help/Iconed.tmpl +++ /dev/null @@ -1,7 +0,0 @@ -SRCS = \ - Iconed/Concepts.sgm Iconed/MetaInfo.sgm Iconed/Tasks.sgm \ - Iconed/GEntity.sgm Iconed/Ref.sgm Iconed/book.sgm \ - Iconed/Home.sgm Iconed/TOC.sgm - -NAME = Iconed -include ../../common/help/sdlvolume.tmpl diff --git a/cde/doc/common/help/Imakefile.tmpl b/cde/doc/common/help/Imakefile.tmpl deleted file mode 100644 index 6099e4f79..000000000 --- a/cde/doc/common/help/Imakefile.tmpl +++ /dev/null @@ -1,185 +0,0 @@ -XCOMM $XConsortium: Imakefile.tmpl /main/8 1996/10/30 18:57:11 rws $ -/* - * Master Imakefile to be included in the Imakefile of the help subdir of - * each locale. - * The list of volumes to be built for each locale is triggered by the related - * macros to be defined in the local Imakefile. - */ - -SDLDIR = ../help-sdl -#if UseNSGMLS -DBENV = LANG=$(LANG) SGML_SEARCH_PATH=".:.." -#else -DBENV = LANG=$(LANG) -#endif - -#ifdef HasAppmanager -APPMANAGER_SRCS = \ - Appmanager/GEntity.sgm Appmanager/TOC.sgm \ - Appmanager/Home.sgm Appmanager/Tasks.sgm \ - Appmanager/MetaInfo.sgm Appmanager/book.sgm \ - Appmanager/Ref.sgm - -MakeSdlVolume(Appmanager,$(SDLDIR),$(DBENV),$(DBOPTS),$(APPMANAGER_SRCS)) -#endif - -#ifdef HasAppBuilder -APPBUILDER_SRCS = \ - AppBuilder/Concepts.sgm AppBuilder/MetaInfo.sgm AppBuilder/book.sgm \ - AppBuilder/GEntity.sgm AppBuilder/Ref.sgm \ - AppBuilder/Home.sgm AppBuilder/Tasks.sgm - -MakeSdlVolume(AppBuilder,$(SDLDIR),$(DBENV),$(DBOPTS),$(APPBUILDER_SRCS)) -#endif - -#ifdef HasCalculator -CALCULATOR_SRCS = \ - Calculator/GEntity.sgm Calculator/Ref.sgm Calculator/book.sgm \ - Calculator/Home.sgm Calculator/TOC.sgm \ - Calculator/MetaInfo.sgm Calculator/Tasks.sgm - -MakeSdlVolume(Calculator,$(SDLDIR),$(DBENV),$(DBOPTS),$(CALCULATOR_SRCS)) -#endif - -#ifdef HasCalendar -CALENDAR_SRCS = \ - Calendar/Appendix.sgm Calendar/MetaInfo.sgm Calendar/Tasks.sgm \ - Calendar/GEntity.sgm Calendar/Ref.sgm Calendar/book.sgm \ - Calendar/Home.sgm Calendar/TOC.sgm - -MakeSdlVolume(Calendar,$(SDLDIR),$(DBENV),$(DBOPTS),$(CALENDAR_SRCS)) -#endif - -#ifdef HasCreatAct -CREATACT_SRCS = \ - CreatAct/GEntity.sgm CreatAct/Ref.sgm CreatAct/book.sgm \ - CreatAct/Home.sgm CreatAct/TOC.sgm \ - CreatAct/MetaInfo.sgm CreatAct/Tasks.sgm - -MakeSdlVolume(CreatAct,$(SDLDIR),$(DBENV),$(DBOPTS),$(CREATACT_SRCS)) -#endif - -#ifdef HasFPanel -FPANEL_SRCS = \ - FPanel/Appendix.sgm FPanel/MetaInfo.sgm FPanel/Using.sgm \ - FPanel/GEntity.sgm FPanel/Ref.sgm FPanel/book.sgm \ - FPanel/Home.sgm FPanel/TOC.sgm - -MakeSdlVolume(FPanel,$(SDLDIR),$(DBENV),$(DBOPTS),$(FPANEL_SRCS)) -#endif - -#ifdef HasFilemgr -FILEMGR_SRCS = \ - Filemgr/Concepts.sgm Filemgr/Messages.sgm Filemgr/TOC.sgm \ - Filemgr/GEntity.sgm Filemgr/MetaInfo.sgm Filemgr/Tasks.sgm \ - Filemgr/Home.sgm Filemgr/Ref.sgm Filemgr/book.sgm - -MakeSdlVolume(Filemgr,$(SDLDIR),$(DBENV),$(DBOPTS),$(FILEMGR_SRCS)) -#endif - -#ifdef HasHelp4Help -HELP4HELP_SRCS = \ - Help4Help/Appendix.sgm Help4Help/Ref.sgm \ - Help4Help/Concepts.sgm Help4Help/TOC.sgm \ - Help4Help/GEntity.sgm Help4Help/Tasks.sgm \ - Help4Help/Home.sgm Help4Help/book.sgm \ - Help4Help/MetaInfo.sgm - -MakeSdlVolume(Help4Help,$(SDLDIR),$(DBENV),$(DBOPTS),$(HELP4HELP_SRCS)) -#endif - -#ifdef HasIconed -ICONED_SRCS = \ - Iconed/Concepts.sgm Iconed/MetaInfo.sgm Iconed/Tasks.sgm \ - Iconed/GEntity.sgm Iconed/Ref.sgm Iconed/book.sgm \ - Iconed/Home.sgm Iconed/TOC.sgm - -MakeSdlVolume(Iconed,$(SDLDIR),$(DBENV),$(DBOPTS),$(ICONED_SRCS)) -#endif - -#ifdef HasInfomgr -INFOMGR_SRCS = \ - Infomgr/Home.sgm Infomgr/Ref.sgm \ - Infomgr/MetaInfo.sgm Infomgr/book.sgm - -MakeSdlVolume(Infomgr,$(SDLDIR),$(DBENV),$(DBOPTS),$(INFOMGR_SRCS)) -#endif - -#ifdef HasIntromgr -INTROMGR_SRCS = \ - Intromgr/Appendix.sgm Intromgr/Home.sgm Intromgr/Overview.sgm \ - Intromgr/GEntity.sgm Intromgr/Keyboard.sgm Intromgr/Windows.sgm \ - Intromgr/Help.sgm Intromgr/MetaInfo.sgm Intromgr/book.sgm - -MakeSdlVolume(Intromgr,$(SDLDIR),$(DBENV),$(DBOPTS),$(INTROMGR_SRCS)) -#endif - -#ifdef HasLibDtPrint -LIBDTPRINT_SRCS = \ - LibDtPrint/GEntity.sgm LibDtPrint/Home.sgm LibDtPrint/MetaInfo.sgm \ - LibDtPrint/book.sgm LibDtPrint/Ref.sgm - -MakeSdlVolume(LibDtPrint,$(SDLDIR),$(DBENV),$(DBOPTS),$(LIBDTPRINT_SRCS)) -#endif - -#ifdef HasLoginmgr -LOGINMGR_SRCS = \ - Loginmgr/Concepts.sgm Loginmgr/Ref.sgm Loginmgr/book.sgm \ - Loginmgr/Home.sgm Loginmgr/TOC.sgm \ - Loginmgr/MetaInfo.sgm Loginmgr/Tasks.sgm - -MakeSdlVolume(Loginmgr,$(SDLDIR),$(DBENV),$(DBOPTS),$(LOGINMGR_SRCS)) -#endif - -#ifdef HasMailer -MAILER_SRCS = \ - Mailer/Messages.sgm Mailer/TOC.sgm \ - Mailer/GEntity.sgm Mailer/MetaInfo.sgm Mailer/Tasks.sgm \ - Mailer/Home.sgm Mailer/Ref.sgm Mailer/book.sgm - -MakeSdlVolume(Mailer,$(SDLDIR),$(DBENV),$(DBOPTS),$(MAILER_SRCS)) -#endif - -#ifdef HasPrintmgr -PRINTMGR_SRCS = \ - Printmgr/GEntity.sgm Printmgr/Ref.sgm Printmgr/book.sgm \ - Printmgr/Home.sgm Printmgr/TOC.sgm \ - Printmgr/MetaInfo.sgm Printmgr/Tasks.sgm - -MakeSdlVolume(Printmgr,$(SDLDIR),$(DBENV),$(DBOPTS),$(PRINTMGR_SRCS)) -#endif - -#ifdef HasPrnSetup -PRNSETUP_SRCS = \ - PrnSetup/GEntity.sgm PrnSetup/Home.sgm PrnSetup/MetaInfo.sgm \ - PrnSetup/book.sgm PrnSetup/prnset.sgm - -MakeSdlVolume(PrnSetup,$(SDLDIR),$(DBENV),$(DBOPTS),$(PRNSETUP_SRCS)) -#endif - -#ifdef HasStylemgr -STYLEMGR_SRCS = \ - Stylemgr/Concepts.sgm Stylemgr/MetaInfo.sgm Stylemgr/Tasks.sgm \ - Stylemgr/GEntity.sgm Stylemgr/Ref.sgm Stylemgr/book.sgm \ - Stylemgr/Home.sgm Stylemgr/TOC.sgm - -MakeSdlVolume(Stylemgr,$(SDLDIR),$(DBENV),$(DBOPTS),$(STYLEMGR_SRCS)) -#endif - -#ifdef HasTerminal -TERMINAL_SRCS = \ - Terminal/GEntity.sgm Terminal/Ref.sgm Terminal/book.sgm \ - Terminal/Home.sgm Terminal/TOC.sgm \ - Terminal/MetaInfo.sgm Terminal/Tasks.sgm - -MakeSdlVolume(Terminal,$(SDLDIR),$(DBENV),$(DBOPTS),$(TERMINAL_SRCS)) -#endif - -#ifdef HasTextedit -TEXTEDIT_SRCS = \ - Textedit/GEntity.sgm Textedit/Ref.sgm Textedit/book.sgm \ - Textedit/Home.sgm Textedit/TOC.sgm \ - Textedit/MetaInfo.sgm Textedit/Tasks.sgm - -MakeSdlVolume(Textedit,$(SDLDIR),$(DBENV),$(DBOPTS),$(TEXTEDIT_SRCS)) -#endif diff --git a/cde/doc/common/help/Infomgr.tmpl b/cde/doc/common/help/Infomgr.tmpl deleted file mode 100644 index cbbbd40cd..000000000 --- a/cde/doc/common/help/Infomgr.tmpl +++ /dev/null @@ -1,6 +0,0 @@ -SRCS = \ - Infomgr/Home.sgm Infomgr/Ref.sgm \ - Infomgr/MetaInfo.sgm Infomgr/book.sgm - -NAME = Infomgr -include ../../common/help/sdlvolume.tmpl diff --git a/cde/doc/common/help/Intromgr.tmpl b/cde/doc/common/help/Intromgr.tmpl deleted file mode 100644 index 32ddb96d6..000000000 --- a/cde/doc/common/help/Intromgr.tmpl +++ /dev/null @@ -1,7 +0,0 @@ -SRCS = \ - Intromgr/Appendix.sgm Intromgr/Home.sgm Intromgr/Overview.sgm \ - Intromgr/GEntity.sgm Intromgr/Keyboard.sgm Intromgr/Windows.sgm \ - Intromgr/Help.sgm Intromgr/MetaInfo.sgm Intromgr/book.sgm - -NAME = Intromgr -include ../../common/help/sdlvolume.tmpl diff --git a/cde/doc/common/help/LibDtPrint.tmpl b/cde/doc/common/help/LibDtPrint.tmpl deleted file mode 100644 index 5af0d375d..000000000 --- a/cde/doc/common/help/LibDtPrint.tmpl +++ /dev/null @@ -1,6 +0,0 @@ -SRCS = \ - LibDtPrint/GEntity.sgm LibDtPrint/Home.sgm LibDtPrint/MetaInfo.sgm \ - LibDtPrint/book.sgm LibDtPrint/Ref.sgm - -NAME = LibDtPrint -include ../../common/help/sdlvolume.tmpl diff --git a/cde/doc/common/help/Loginmgr.tmpl b/cde/doc/common/help/Loginmgr.tmpl deleted file mode 100644 index d6c14dbe5..000000000 --- a/cde/doc/common/help/Loginmgr.tmpl +++ /dev/null @@ -1,7 +0,0 @@ -SRCS = \ - Loginmgr/Concepts.sgm Loginmgr/Ref.sgm Loginmgr/book.sgm \ - Loginmgr/Home.sgm Loginmgr/TOC.sgm \ - Loginmgr/MetaInfo.sgm Loginmgr/Tasks.sgm - -NAME = Loginmgr -include ../../common/help/sdlvolume.tmpl diff --git a/cde/doc/common/help/Mailer.tmpl b/cde/doc/common/help/Mailer.tmpl deleted file mode 100644 index 965962379..000000000 --- a/cde/doc/common/help/Mailer.tmpl +++ /dev/null @@ -1,7 +0,0 @@ -SRCS = \ - Mailer/Messages.sgm Mailer/TOC.sgm \ - Mailer/GEntity.sgm Mailer/MetaInfo.sgm Mailer/Tasks.sgm \ - Mailer/Home.sgm Mailer/Ref.sgm Mailer/book.sgm - -NAME = Mailer -include ../../common/help/sdlvolume.tmpl diff --git a/cde/doc/common/help/Printmgr.tmpl b/cde/doc/common/help/Printmgr.tmpl deleted file mode 100644 index cc830f630..000000000 --- a/cde/doc/common/help/Printmgr.tmpl +++ /dev/null @@ -1,7 +0,0 @@ -SRCS = \ - Printmgr/GEntity.sgm Printmgr/Ref.sgm Printmgr/book.sgm \ - Printmgr/Home.sgm Printmgr/TOC.sgm \ - Printmgr/MetaInfo.sgm Printmgr/Tasks.sgm - -NAME = Printmgr -include ../../common/help/sdlvolume.tmpl diff --git a/cde/doc/common/help/PrnSetup.tmpl b/cde/doc/common/help/PrnSetup.tmpl deleted file mode 100644 index 650201397..000000000 --- a/cde/doc/common/help/PrnSetup.tmpl +++ /dev/null @@ -1,6 +0,0 @@ -SRCS = \ - PrnSetup/GEntity.sgm PrnSetup/Home.sgm PrnSetup/MetaInfo.sgm \ - PrnSetup/book.sgm PrnSetup/prnset.sgm - -NAME = PrnSetup -include ../../common/help/sdlvolume.tmpl diff --git a/cde/doc/common/help/Stylemgr.tmpl b/cde/doc/common/help/Stylemgr.tmpl deleted file mode 100644 index 66da46a4c..000000000 --- a/cde/doc/common/help/Stylemgr.tmpl +++ /dev/null @@ -1,7 +0,0 @@ -SRCS = \ - Stylemgr/Concepts.sgm Stylemgr/MetaInfo.sgm Stylemgr/Tasks.sgm \ - Stylemgr/GEntity.sgm Stylemgr/Ref.sgm Stylemgr/book.sgm \ - Stylemgr/Home.sgm Stylemgr/TOC.sgm - -NAME = Stylemgr -include ../../common/help/sdlvolume.tmpl diff --git a/cde/doc/common/help/Terminal.tmpl b/cde/doc/common/help/Terminal.tmpl deleted file mode 100644 index bfc5eefab..000000000 --- a/cde/doc/common/help/Terminal.tmpl +++ /dev/null @@ -1,7 +0,0 @@ -SRCS = \ - Terminal/GEntity.sgm Terminal/Ref.sgm Terminal/book.sgm \ - Terminal/Home.sgm Terminal/TOC.sgm \ - Terminal/MetaInfo.sgm Terminal/Tasks.sgm - -NAME = Terminal -include ../../common/help/sdlvolume.tmpl diff --git a/cde/doc/common/help/Textedit.tmpl b/cde/doc/common/help/Textedit.tmpl deleted file mode 100644 index 0526e806e..000000000 --- a/cde/doc/common/help/Textedit.tmpl +++ /dev/null @@ -1,7 +0,0 @@ -SRCS = \ - Textedit/GEntity.sgm Textedit/Ref.sgm Textedit/book.sgm \ - Textedit/Home.sgm Textedit/TOC.sgm \ - Textedit/MetaInfo.sgm Textedit/Tasks.sgm - -NAME = Textedit -include ../../common/help/sdlvolume.tmpl diff --git a/cde/doc/common/help/sdl-docs.am b/cde/doc/common/help/sdl-docs.am new file mode 100644 index 000000000..6e6d3b161 --- /dev/null +++ b/cde/doc/common/help/sdl-docs.am @@ -0,0 +1,145 @@ +# build some SDL docs for the help system + +BUILT_SOURCES = Appmanager.sdl AppBuilder.sdl Calculator.sdl \ + Calendar.sdl CreatAct.sdl Filemgr.sdl FPanel.sdl Help4Help.sdl \ + Iconed.sdl Infomgr.sdl Intromgr.sdl LibDtPrint.sdl Loginmgr.sdl \ + Mailer.sdl Printmgr.sdl PrnSetup.sdl Stylemgr.sdl Terminal.sdl \ + Textedit.sdl + +CLEANFILES = $(BUILT_SOURCES) + +sdlhelpdir = $(CDE_INSTALLATION_TOP)/app-defaults/help/$(LANG) +dist_sdlhelp_DATA = $(BUILT_SOURCES) + +DTDOCBOOK = $(top_srcdir)/programs/dtdocbook/doc2sdl/dtdocbook +DOC2SDL_LOC = $(top_srcdir)/programs/dtdocbook/doc2sdl +DTHELP_HTAG2 = $(top_builddir)/programs/dthelp/parser/pass2/parser/dthelp_htag2 +INSTANT = $(top_builddir)/programs/dtdocbook/instant/instant +XLATE_LOCALE = $(top_builddir)/programs/dtdocbook/xlate_locale/xlate_locale +# replace this with a native version detected by autoconf someday +NSGMLS = $(top_builddir)/programs/nsgmls/nsgmls + +# let's try a rule here. I don't like the backticks for running basename +# but the $(basename...) seems to add a space for some reason + +%.sdl: + LANG=$(HELP_LANG) SGML_SEARCH_PATH=".:.." \ + DTLCXSEARCHPATH=$(top_srcdir)/lib/DtHelp \ + $(KSH) $(DTDOCBOOK) -t $(DOC2SDL_LOC) -H $(DTHELP_HTAG2) \ + -I $(INSTANT) -L $(XLATE_LOCALE) -S $(NSGMLS) \ + -o $@ `basename $@ .sdl`/book.sgm + +APPMANAGER_SRCS = Appmanager/GEntity.sgm Appmanager/TOC.sgm \ + Appmanager/Home.sgm Appmanager/Tasks.sgm Appmanager/MetaInfo.sgm \ + Appmanager/book.sgm Appmanager/Ref.sgm + +Appmanager.sdl: $(APPMANAGER_SRCS) + +APPBUILDER_SRCS = AppBuilder/Concepts.sgm AppBuilder/MetaInfo.sgm \ + AppBuilder/book.sgm AppBuilder/GEntity.sgm AppBuilder/Ref.sgm \ + AppBuilder/Home.sgm AppBuilder/Tasks.sgm + +AppBuilder.sdl: $(APPBUILDER_SRCS) + +CALCULATOR_SRCS = Calculator/GEntity.sgm Calculator/Ref.sgm \ + Calculator/book.sgm Calculator/Home.sgm Calculator/TOC.sgm \ + Calculator/MetaInfo.sgm Calculator/Tasks.sgm + +Calculator.sdl: $(CALCULATOR_SRCS) + +CALENDAR_SRCS = Calendar/Appendix.sgm Calendar/MetaInfo.sgm \ + Calendar/Tasks.sgm Calendar/GEntity.sgm Calendar/Ref.sgm \ + Calendar/book.sgm Calendar/Home.sgm Calendar/TOC.sgm + +Calendar.sdl: $(CALENDAR_SRCS) + +CREATACT_SRCS = CreatAct/GEntity.sgm CreatAct/Ref.sgm \ + CreatAct/book.sgm CreatAct/Home.sgm CreatAct/TOC.sgm \ + CreatAct/MetaInfo.sgm CreatAct/Tasks.sgm + +CreatAct.sdl: $(CREATACT_SRCS) + +FPANEL_SRCS = FPanel/Appendix.sgm FPanel/MetaInfo.sgm \ + FPanel/Using.sgm FPanel/GEntity.sgm FPanel/Ref.sgm \ + FPanel/book.sgm FPanel/Home.sgm FPanel/TOC.sgm + +FPanel.sdl: $(FPANEL_SRCS) + +FILEMGR_SRCS = Filemgr/Concepts.sgm Filemgr/Messages.sgm \ + Filemgr/TOC.sgm Filemgr/GEntity.sgm Filemgr/MetaInfo.sgm \ + Filemgr/Tasks.sgm Filemgr/Home.sgm Filemgr/Ref.sgm \ + Filemgr/book.sgm + +Filemgr.sdl: $(FILEMGR_SRCS) + +HELP4HELP_SRCS = Help4Help/Appendix.sgm Help4Help/Ref.sgm \ + Help4Help/Concepts.sgm Help4Help/TOC.sgm Help4Help/GEntity.sgm \ + Help4Help/Tasks.sgm Help4Help/Home.sgm Help4Help/book.sgm \ + Help4Help/MetaInfo.sgm + +Help4Help.sdl: $(HELP4HELP_SRCS) + +ICONED_SRCS = Iconed/Concepts.sgm Iconed/MetaInfo.sgm \ + Iconed/Tasks.sgm Iconed/GEntity.sgm Iconed/Ref.sgm \ + Iconed/book.sgm Iconed/Home.sgm Iconed/TOC.sgm + +Iconed.sdl: $(ICONED_SRCS) + +INFOMGR_SRCS = Infomgr/Home.sgm Infomgr/Ref.sgm Infomgr/MetaInfo.sgm \ + Infomgr/book.sgm + +Infomgr.sdl: $(INFOMGR_SRCS) + +INTROMGR_SRCS = Intromgr/Appendix.sgm Intromgr/Home.sgm \ + Intromgr/Overview.sgm Intromgr/GEntity.sgm Intromgr/Keyboard.sgm \ + Intromgr/Windows.sgm Intromgr/Help.sgm Intromgr/MetaInfo.sgm \ + Intromgr/book.sgm + +Intromgr.sdl: $(INTROMGR_SRCS) + +LIBDTPRINT_SRCS = LibDtPrint/GEntity.sgm LibDtPrint/Home.sgm \ + LibDtPrint/MetaInfo.sgm LibDtPrint/book.sgm LibDtPrint/Ref.sgm + +LibDtPrint.sdl: $(LIBDTPRINT_SRCS) + +LOGINMGR_SRCS = Loginmgr/Concepts.sgm Loginmgr/Ref.sgm \ + Loginmgr/book.sgm Loginmgr/Home.sgm Loginmgr/TOC.sgm \ + Loginmgr/MetaInfo.sgm Loginmgr/Tasks.sgm + +Loginmgr.sdl: $(LOGINMGR_SRCS) + +MAILER_SRCS = Mailer/Messages.sgm Mailer/TOC.sgm Mailer/GEntity.sgm \ + Mailer/MetaInfo.sgm Mailer/Tasks.sgm Mailer/Home.sgm \ + Mailer/Ref.sgm Mailer/book.sgm + +Mailer.sdl: $(MAILER_SRCS) + +PRINTMGR_SRCS = Printmgr/GEntity.sgm Printmgr/Ref.sgm \ + Printmgr/book.sgm Printmgr/Home.sgm Printmgr/TOC.sgm \ + Printmgr/MetaInfo.sgm Printmgr/Tasks.sgm + +Printmgr.sdl: $(PRINTMGR_SRCS) + +PRNSETUP_SRCS = PrnSetup/GEntity.sgm PrnSetup/Home.sgm \ + PrnSetup/MetaInfo.sgm PrnSetup/book.sgm PrnSetup/prnset.sgm + +PrnSetup.sdl: $(PRNSETUP_SRCS) + +STYLEMGR_SRCS = Stylemgr/Concepts.sgm Stylemgr/MetaInfo.sgm \ + Stylemgr/Tasks.sgm Stylemgr/GEntity.sgm Stylemgr/Ref.sgm \ + Stylemgr/book.sgm Stylemgr/Home.sgm Stylemgr/TOC.sgm + +Stylemgr.sdl: $(STYLEMGR_SRCS) + +TERMINAL_SRCS = Terminal/GEntity.sgm Terminal/Ref.sgm \ + Terminal/book.sgm Terminal/Home.sgm Terminal/TOC.sgm \ + Terminal/MetaInfo.sgm Terminal/Tasks.sgm + +Terminal.sdl: $(TERMINAL_SRCS) + +TEXTEDIT_SRCS = Textedit/GEntity.sgm Textedit/Ref.sgm \ + Textedit/book.sgm Textedit/Home.sgm Textedit/TOC.sgm \ + Textedit/MetaInfo.sgm Textedit/Tasks.sgm + +Textedit.sdl: $(TEXTEDIT_SRCS) + diff --git a/cde/doc/common/help/sdlvolume.tmpl b/cde/doc/common/help/sdlvolume.tmpl deleted file mode 100644 index 2c79fc961..000000000 --- a/cde/doc/common/help/sdlvolume.tmpl +++ /dev/null @@ -1,11 +0,0 @@ -all:: ../help-sdl/$(NAME).sdl - -../help-sdl/$(NAME).sdl: $(SRCS) - $(MKDIR_P) ../help-sdl - LANG=$(LANG) SGML_SEARCH_PATH=".:.." $(LD_LIBRARY_PATH) \ - DTLCXSEARCHPATH=$(srcdir)/lib/dthelp $(KSH) \ - $(srcdir)/programs/dtdocbook/doc2sdl/dtdocbook -o \ - ../help-sdl/$(NAME).sdl $(NAME)/book.sgm - -clean:: - $(RM) ../help-sdl/$(NAME).sdl $(NAME)/book.log diff --git a/cde/programs/localized/templates/C.am b/cde/programs/localized/templates/C.am index bd077d8a4..843a4a632 100644 --- a/cde/programs/localized/templates/C.am +++ b/cde/programs/localized/templates/C.am @@ -2,4 +2,4 @@ # variable for the C locale. LANG=C -SOURCE_LANG=C +HELP_LANG=C diff --git a/cde/programs/localized/templates/English.am b/cde/programs/localized/templates/English.am index ce033ddbb..dcec9287b 100644 --- a/cde/programs/localized/templates/English.am +++ b/cde/programs/localized/templates/English.am @@ -2,4 +2,4 @@ # variable for the C locale. LANG=en_US.UTF-8 -SOURCE_LANG=en_US.UTF-8 +HELP_LANG=C diff --git a/cde/programs/localized/templates/French.am b/cde/programs/localized/templates/French.am index 570ee5358..2f4fe70aa 100644 --- a/cde/programs/localized/templates/French.am +++ b/cde/programs/localized/templates/French.am @@ -13,5 +13,5 @@ if BSD LANG=fr_FR.UTF-8 endif -SOURCE_LANG=fr_FR.ISO8859-1 +HELP_LANG=fr_FR.ISO8859-1 diff --git a/cde/programs/localized/templates/German.am b/cde/programs/localized/templates/German.am index 5bfefb8f4..4aa7efa34 100644 --- a/cde/programs/localized/templates/German.am +++ b/cde/programs/localized/templates/German.am @@ -13,5 +13,5 @@ if BSD LANG=de_DE.UTF-8 endif -SOURCE_LANG=de_DE.ISO8859-1 +HELP_LANG=de_DE.ISO8859-1 diff --git a/cde/programs/localized/templates/Italian.am b/cde/programs/localized/templates/Italian.am index 8ec19134b..907e4a1b1 100644 --- a/cde/programs/localized/templates/Italian.am +++ b/cde/programs/localized/templates/Italian.am @@ -13,5 +13,5 @@ if BSD LANG=it_IT.UTF-8 endif -SOURCE_LANG=it_IT.ISO8859-1 +HELP_LANG=it_IT.ISO8859-1 diff --git a/cde/programs/localized/templates/Spanish.am b/cde/programs/localized/templates/Spanish.am index db222128c..60bcf3640 100644 --- a/cde/programs/localized/templates/Spanish.am +++ b/cde/programs/localized/templates/Spanish.am @@ -13,5 +13,5 @@ if BSD LANG=es_ES.UTF-8 endif -SOURCE_LANG=es_ES.ISO8859-1 +HELP_LANG=es_ES.ISO8859-1