From bdf9256ab2077a2da3b7ad48910cae047addce61 Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Thu, 2 Dec 2021 17:21:48 -0700 Subject: [PATCH 01/25] dtinfo/dtinfo: initial stab at making it build --- cde/configure.ac | 24 +++ cde/programs/Makefile.am | 13 +- cde/programs/dtinfo/Makefile.am | 2 +- .../dtinfo/dtinfo/install/lib/Makefile.am | 5 +- .../dtinfo/install/lib/bitmaps/Makefile.am | 17 ++ cde/programs/dtinfo/dtinfo/src/.gitignore | 3 + .../dtinfo/dtinfo/src/Agents/Classlist.mk | 8 +- .../dtinfo/dtinfo/src/Agents/Makefile.am | 18 +++ .../dtinfo/dtinfo/src/Basic/Classlist.mk | 6 +- .../dtinfo/dtinfo/src/Basic/Makefile.am | 13 ++ cde/programs/dtinfo/dtinfo/src/Classlist.mk | 2 +- .../dtinfo/dtinfo/src/Graphics/Classlist.mk | 6 +- .../dtinfo/dtinfo/src/Graphics/Makefile.am | 13 ++ cde/programs/dtinfo/dtinfo/src/Makefile.am | 153 +++++++++++++++++- .../dtinfo/dtinfo/src/Managers/Classlist.mk | 8 +- .../dtinfo/dtinfo/src/Managers/EnvMgr.C | 2 +- .../dtinfo/dtinfo/src/Managers/Makefile.am | 18 +++ .../dtinfo/dtinfo/src/Marks/Classlist.mk | 6 +- .../dtinfo/dtinfo/src/Marks/Makefile.am | 13 ++ .../dtinfo/dtinfo/src/Messages/Classlist.mk | 4 +- .../dtinfo/dtinfo/src/Messages/Makefile.am | 15 ++ .../dtinfo/src/OliasSearch/Classlist.mk | 6 +- .../dtinfo/dtinfo/src/OliasSearch/Makefile.am | 13 ++ .../dtinfo/src/OnlineRender/Classlist.mk | 4 +- .../dtinfo/src/OnlineRender/Makefile.am | 18 +++ .../dtinfo/dtinfo/src/Other/Classlist.mk | 8 +- .../dtinfo/dtinfo/src/Other/Makefile.am | 18 +++ .../dtinfo/src/Preferences/Classlist.mk | 6 +- .../dtinfo/dtinfo/src/Preferences/Makefile.am | 13 ++ .../dtinfo/dtinfo/src/Query/Classlist.mk | 8 +- .../dtinfo/dtinfo/src/Query/Makefile.am | 18 +++ .../dtinfo/dtinfo/src/Support/Classlist.mk | 6 +- .../dtinfo/dtinfo/src/Support/Makefile.am | 13 ++ .../dtinfo/dtinfo/src/UAS/Classlist.mk | 4 +- .../dtinfo/dtinfo/src/UAS/Makefile.am | 13 ++ .../dtinfo/dtinfo/src/Widgets/Makefile.am | 11 ++ .../dtinfo/dtinfo/src/cgm/Makefile.am | 18 +++ cde/programs/dtinfo/dtinfo/src/cgm/testcgm.c | 6 +- .../dtinfo/dtinfo/src/templates/dtinfo_env.mk | 30 ++++ .../dtinfo/dtinfo/wwl/src/Makefile.am | 2 +- 40 files changed, 504 insertions(+), 60 deletions(-) create mode 100644 cde/programs/dtinfo/dtinfo/install/lib/bitmaps/Makefile.am create mode 100644 cde/programs/dtinfo/dtinfo/src/.gitignore create mode 100644 cde/programs/dtinfo/dtinfo/src/Agents/Makefile.am create mode 100644 cde/programs/dtinfo/dtinfo/src/Basic/Makefile.am create mode 100644 cde/programs/dtinfo/dtinfo/src/Graphics/Makefile.am create mode 100644 cde/programs/dtinfo/dtinfo/src/Managers/Makefile.am create mode 100644 cde/programs/dtinfo/dtinfo/src/Marks/Makefile.am create mode 100644 cde/programs/dtinfo/dtinfo/src/Messages/Makefile.am create mode 100644 cde/programs/dtinfo/dtinfo/src/OliasSearch/Makefile.am create mode 100644 cde/programs/dtinfo/dtinfo/src/OnlineRender/Makefile.am create mode 100644 cde/programs/dtinfo/dtinfo/src/Other/Makefile.am create mode 100644 cde/programs/dtinfo/dtinfo/src/Preferences/Makefile.am create mode 100644 cde/programs/dtinfo/dtinfo/src/Query/Makefile.am create mode 100644 cde/programs/dtinfo/dtinfo/src/Support/Makefile.am create mode 100644 cde/programs/dtinfo/dtinfo/src/UAS/Makefile.am create mode 100644 cde/programs/dtinfo/dtinfo/src/Widgets/Makefile.am create mode 100644 cde/programs/dtinfo/dtinfo/src/cgm/Makefile.am create mode 100644 cde/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk diff --git a/cde/configure.ac b/cde/configure.ac index eeeb992bc..48882c847 100644 --- a/cde/configure.ac +++ b/cde/configure.ac @@ -726,6 +726,30 @@ programs/dtinfo/mmdb/StyleSheet/Makefile programs/dtinfo/clients/Makefile programs/dtinfo/clients/dtinfo_start/Makefile +programs/dtinfo/dtinfo/Makefile +programs/dtinfo/dtinfo/wwl/Makefile +programs/dtinfo/dtinfo/wwl/src/Makefile +programs/dtinfo/dtinfo/src/Makefile +programs/dtinfo/dtinfo/src/Widgets/Makefile +programs/dtinfo/dtinfo/src/Support/Makefile +programs/dtinfo/dtinfo/src/UAS/Makefile +programs/dtinfo/dtinfo/src/Basic/Makefile +programs/dtinfo/dtinfo/src/OliasSearch/Makefile +programs/dtinfo/dtinfo/src/Marks/Makefile +programs/dtinfo/dtinfo/src/Graphics/Makefile +programs/dtinfo/dtinfo/src/Preferences/Makefile +programs/dtinfo/dtinfo/src/Managers/Makefile +programs/dtinfo/dtinfo/src/Other/Makefile +programs/dtinfo/dtinfo/src/Query/Makefile +programs/dtinfo/dtinfo/src/Agents/Makefile +programs/dtinfo/dtinfo/src/OnlineRender/Makefile +programs/dtinfo/dtinfo/src/Messages/Makefile +programs/dtinfo/dtinfo/src/cgm/Makefile +programs/dtinfo/dtinfo/install/Makefile +programs/dtinfo/dtinfo/install/lib/Makefile +programs/dtinfo/dtinfo/install/lib/bitmaps/Makefile +programs/dtinfo/dtinfo/install/lib/fonts/Makefile + programs/types/Makefile programs/tttypes/Makefile diff --git a/cde/programs/Makefile.am b/cde/programs/Makefile.am index 6fa53144e..03e4dc725 100644 --- a/cde/programs/Makefile.am +++ b/cde/programs/Makefile.am @@ -1,8 +1,9 @@ MAINTAINERCLEANFILES = Makefile.in -SUBDIRS = backdrops icons dsdm dtmail dtpad dtfile dtwm dtlogin \ - dtsession dthello dtstyle dtexec dtdbcache dticon dtterm dtcalc \ - dtaction dtspcd dtscreen dtksh dtcm dtsearchpath dtappbuilder palettes \ - dtappintegrate dtprintegrate dtconfig dtcreate dtprintinfo fontaliases \ - dtdspmsg ttsnoop dtimsstart dtpdm dtsr dtpdmd dtinfo types \ - tttypes util dtopen localized dthelp nsgmls dtdocbook +SUBDIRS = backdrops icons dsdm dtmail dtpad dtfile dtwm dtlogin \ + dtsession dthello dtstyle dtexec dtdbcache dticon dtterm \ + dtcalc dtaction dtspcd dtscreen dtksh dtcm dtsearchpath \ + dtappbuilder palettes dtappintegrate dtprintegrate dtconfig \ + dtcreate dtprintinfo fontaliases dtdspmsg ttsnoop dtimsstart \ + dtpdm dtsr dtpdmd dtinfo types tttypes util dtopen localized \ + dthelp nsgmls dtdocbook dtinfo diff --git a/cde/programs/dtinfo/Makefile.am b/cde/programs/dtinfo/Makefile.am index 4c5987afa..629e6d7ce 100644 --- a/cde/programs/dtinfo/Makefile.am +++ b/cde/programs/dtinfo/Makefile.am @@ -1,5 +1,5 @@ MAINTAINERCLEANFILES = Makefile.in -SUBDIRS = tools DtMmdb mmdb clients +SUBDIRS = tools DtMmdb mmdb clients dtinfo #NOTYET dtinfo dtinfogen diff --git a/cde/programs/dtinfo/dtinfo/install/lib/Makefile.am b/cde/programs/dtinfo/dtinfo/install/lib/Makefile.am index 7feeb3f17..b1a92efb0 100644 --- a/cde/programs/dtinfo/dtinfo/install/lib/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/install/lib/Makefile.am @@ -2,6 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in etcdir = $(CDE_CONFIGURATION_TOP) -SUBDIRS = fonts +SUBDIRS = bitmaps fonts -etc_PROGRAMS = mmdb.mark.spec +infolibdir = $(CDE_INSTALLATION_TOP)/infolib +infolib_DATA = mmdb.mark.spec diff --git a/cde/programs/dtinfo/dtinfo/install/lib/bitmaps/Makefile.am b/cde/programs/dtinfo/dtinfo/install/lib/bitmaps/Makefile.am new file mode 100644 index 000000000..82536440f --- /dev/null +++ b/cde/programs/dtinfo/dtinfo/install/lib/bitmaps/Makefile.am @@ -0,0 +1,17 @@ +MAINTAINERCLEANFILES = Makefile.in + +FILES= bomb bomb16 bomb16m bomb32 bomb32m bombm browse.xbm \ + browse_ins.xbm web_browse.xbm web_browse_ins.xbm default.xpm \ + deiconify.xbm detached.xpm help.xbm help_ins.xbm history.xbm \ + history_ins.xbm iconify.xbm locked.xbm logo.xpm.ps marks.xbm \ + marks_ins.xbm pinin.xbm pinmid.xbm pinout.xbm quit.xbm \ + search.xbm search_ins.xbm semilocked.xbm unlocked.xbm + +# The last dir level for install is for language, default C + +cdir = $(CDE_INSTALLATION_TOP)/appconfig/icons/C +c_DATA = $(FILES) + + +jadir = $(CDE_INSTALLATION_TOP)/appconfig/icons/ja +ja_DATA = $(FILES) diff --git a/cde/programs/dtinfo/dtinfo/src/.gitignore b/cde/programs/dtinfo/dtinfo/src/.gitignore new file mode 100644 index 000000000..3fd94e989 --- /dev/null +++ b/cde/programs/dtinfo/dtinfo/src/.gitignore @@ -0,0 +1,3 @@ +OnlineRender/OnlineRender.d +OnlineRender/OnlineRender.h +cgm/testcgm diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/Classlist.mk b/cde/programs/dtinfo/dtinfo/src/Agents/Classlist.mk index 71cec8e1d..0b35c108e 100644 --- a/cde/programs/dtinfo/dtinfo/src/Agents/Classlist.mk +++ b/cde/programs/dtinfo/dtinfo/src/Agents/Classlist.mk @@ -1,6 +1,6 @@ -/* $XConsortium: Classlist.mk /main/8 1996/10/30 14:39:26 drk $ */ +# $XConsortium: Classlist.mk /main/8 1996/10/30 14:39:26 drk $ -CLASSES= \ +Agents_CLASSES= \ Agent \ Dialog \ ListView \ @@ -33,7 +33,7 @@ UrlAgent \ AddLibraryAgent -SRCS=AgentMotif.C \ +Agents_SRCS=AgentMotif.C \ MessageAgentMotif.C \ IcccmAgent.C \ AnchorCanvas.C \ @@ -63,7 +63,7 @@ ScopeMenu.C \ UrlAgentMotif.C \ AddLibraryAgentMotif.C -MSGS= \ +Agents_MSGS= \ Agent.msg \ AddLibraryAgent.msg \ BookmarkEdit.msg \ diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Agents/Makefile.am new file mode 100644 index 000000000..40dcaf69b --- /dev/null +++ b/cde/programs/dtinfo/dtinfo/src/Agents/Makefile.am @@ -0,0 +1,18 @@ +MAINTAINERCLEANFILES = Makefile.in + +noinst_LIBRARIES = libAgents.a + +# get our env +include ../templates/dtinfo_env.mk + +# class info +include Classlist.mk + +libAgents_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) +libAgents_a_SOURCES = ../Prelude.h $(Agents_SRCS) + +BUILT_SOURCES = Agents.msg +CLEANFILES = $(BUILT_SOURCES) + +Agents.msg: + cat $(Agents_MSGS) > $@ diff --git a/cde/programs/dtinfo/dtinfo/src/Basic/Classlist.mk b/cde/programs/dtinfo/dtinfo/src/Basic/Classlist.mk index 7d2f6a256..9992ac78c 100644 --- a/cde/programs/dtinfo/dtinfo/src/Basic/Classlist.mk +++ b/cde/programs/dtinfo/dtinfo/src/Basic/Classlist.mk @@ -1,5 +1,5 @@ -/* $XConsortium: Classlist.mk /main/3 1996/10/30 14:40:00 drk $ */ -CLASSES=\ +# $XConsortium: Classlist.mk /main/3 1996/10/30 14:40:00 drk $ +Basic_CLASSES=\ Error \ FolioObject \ BitField \ @@ -26,7 +26,7 @@ ClientEventHandler \ NodeDisplayData \ NodeViewInfo -SRCS= \ +Basic_SRCS= \ FolioObject.C \ BitField.C \ OString.C \ diff --git a/cde/programs/dtinfo/dtinfo/src/Basic/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Basic/Makefile.am new file mode 100644 index 000000000..2a0af0919 --- /dev/null +++ b/cde/programs/dtinfo/dtinfo/src/Basic/Makefile.am @@ -0,0 +1,13 @@ +MAINTAINERCLEANFILES = Makefile.in + +noinst_LIBRARIES = libBasic.a + +# get our env +include ../templates/dtinfo_env.mk + +# class info +include Classlist.mk + +libBasic_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) + +libBasic_a_SOURCES = ../Prelude.h $(Basic_SRCS) diff --git a/cde/programs/dtinfo/dtinfo/src/Classlist.mk b/cde/programs/dtinfo/dtinfo/src/Classlist.mk index 3c18e2d20..d801cfab6 100644 --- a/cde/programs/dtinfo/dtinfo/src/Classlist.mk +++ b/cde/programs/dtinfo/dtinfo/src/Classlist.mk @@ -1,4 +1,4 @@ -/* $XConsortium: Classlist.mk /main/4 1996/10/30 14:40:34 drk $ */ +# $XConsortium: Classlist.mk /main/4 1996/10/30 14:40:34 drk $ CLASSLIBS= \ Support \ UAS \ diff --git a/cde/programs/dtinfo/dtinfo/src/Graphics/Classlist.mk b/cde/programs/dtinfo/dtinfo/src/Graphics/Classlist.mk index 940a52807..b60eeef4f 100644 --- a/cde/programs/dtinfo/dtinfo/src/Graphics/Classlist.mk +++ b/cde/programs/dtinfo/dtinfo/src/Graphics/Classlist.mk @@ -1,6 +1,6 @@ -/* $XConsortium: Classlist.mk /main/4 1996/10/30 14:41:07 drk $ */ -CLASSES= \ +# $XConsortium: Classlist.mk /main/4 1996/10/30 14:41:07 drk $ +Graphics_CLASSES= \ PixmapGraphic -SRCS= \ +Graphics_SRCS= \ PixmapGraphic.C diff --git a/cde/programs/dtinfo/dtinfo/src/Graphics/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Graphics/Makefile.am new file mode 100644 index 000000000..c9a7faeda --- /dev/null +++ b/cde/programs/dtinfo/dtinfo/src/Graphics/Makefile.am @@ -0,0 +1,13 @@ +MAINTAINERCLEANFILES = Makefile.in + +noinst_LIBRARIES = libGraphics.a + +# get our env +include ../templates/dtinfo_env.mk + +# class info +include Classlist.mk + +libGraphics_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) + +libGraphics_a_SOURCES = ../Prelude.h $(Graphics_SRCS) diff --git a/cde/programs/dtinfo/dtinfo/src/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Makefile.am index 10402a440..b5618260d 100644 --- a/cde/programs/dtinfo/dtinfo/src/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/Makefile.am @@ -1,11 +1,154 @@ MAINTAINERCLEANFILES = Makefile.in -SUBDIRS = Agents Basic +include templates/dtinfo_env.mk -bin_PROGRAMS = dtinfo +include Classlist.mk -dtinfo_CPPFLAGS = -DEXPAND_TEMPLATES -I.. +# CLASSLIST is defined in the top (dtinfo) level Classlist.mk file +SUBDIRS = Widgets $(CLASSLIBS) Messages cgm -dtinfo_LDADD = lib +RESFILES = Macros.res Strings.res Messages.res Query/QueryEditor.res \ + Agents/BookmarkEdit.res Agents/MapAgent.res \ + Agents/MarkList.res Agents/PrintPanelAgent.res \ + Agents/Preferences.res Agents/SearchResultsAgent.res \ + Agents/NodeHistoryAgent.res Agents/NodeWindowAgent.res \ + Agents/GraphicAgent.res Query/QueryTermView.res -dtinfo_SOURCES = main.C main_c_api.c + +BUILT_SOURCES = Prelude.h Support/Support.d Support/Support.h \ + UAS/UAS.d UAS/UAS.h Basic/Basic.d Basic/Basic.h \ + OliasSearch/OliasSearch.d OliasSearch/OliasSearch.h \ + Marks/Marks.d Marks/Marks.h Graphics/Graphics.d \ + Graphics/Graphics.h Preferences/Preferences.d \ + Preferences/Preferences.h Managers/Managers.d \ + Managers/Managers.h Other/Other.d Other/Other.h Query/Query.d \ + Query/Query.h Agents/Agents.d Agents/Agents.h \ + OnlineRender/OnlineRender.d OnlineRender/OnlineRender.h \ + \ + Dtinfo + +CLEANFILES = $(BUILT_SOURCES) + +Prelude.h: + $(top_builddir)/programs/dtinfo/tools/misc/pmaker $(CLASSLIBS) + +Dtinfo: Dtinfo.res $(RESFILES) + $(CPP_PROGRAM) -traditional -nostdinc -C Dtinfo.res | $(TREERES) > $@ + +##### hacking area +# Support +include Support/Classlist.mk +Support/Support.d: Support/Classlist.mk + cd Support && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d Support $(Support_CLASSES) + +Support/Support.h: Support/Classlist.mk + cd Support && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h Support $(Support_CLASSES) + + +# UAS +include UAS/Classlist.mk +UAS/UAS.d: UAS/Classlist.mk + cd UAS && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d UAS $(UAS_CLASSES) + +UAS/UAS.h: UAS/Classlist.mk + cd UAS && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h UAS $(UAS_CLASSES) + + +# Basic +include Basic/Classlist.mk +Basic/Basic.d: Basic/Classlist.mk + cd Basic && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d Basic $(Basic_CLASSES) + +Basic/Basic.h: Basic/Classlist.mk + cd Basic && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h Basic $(Basic_CLASSES) + + +# OliasSearch +include OliasSearch/Classlist.mk +OliasSearch/OliasSearch.d: OliasSearch/Classlist.mk + cd OliasSearch && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d OliasSearch $(OliasSearch_CLASSES) + +OliasSearch/OliasSearch.h: OliasSearch/Classlist.mk + cd OliasSearch && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h OliasSearch $(OliasSearch_CLASSES) + + +# Marks +include Marks/Classlist.mk +Marks/Marks.d: Marks/Classlist.mk + cd Marks && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d Marks $(Marks_CLASSES) + +Marks/Marks.h: Marks/Classlist.mk + cd Marks && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h Marks $(Marks_CLASSES) + + +# Graphics +include Graphics/Classlist.mk +Graphics/Graphics.d: Graphics/Classlist.mk + cd Graphics && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d Graphics $(Graphics_CLASSES) + +Graphics/Graphics.h: Graphics/Classlist.mk + cd Graphics && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h Graphics $(Graphics_CLASSES) + + +# Preferences +include Preferences/Classlist.mk +Preferences/Preferences.d: Preferences/Classlist.mk + cd Preferences && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d Preferences $(Preferences_CLASSES) + +Preferences/Preferences.h: Preferences/Classlist.mk + cd Preferences && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h Preferences $(Preferences_CLASSES) + + +# Managers +include Managers/Classlist.mk +Managers/Managers.d: Managers/Classlist.mk + cd Managers && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d Managers $(Managers_CLASSES) + +Managers/Managers.h: Managers/Classlist.mk + cd Managers && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h Managers $(Managers_CLASSES) + + +# Other +include Other/Classlist.mk +Other/Other.d: Other/Classlist.mk + cd Other && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d Other $(Other_CLASSES) + +Other/Other.h: Other/Classlist.mk + cd Other && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h Other $(Other_CLASSES) + + +# Query +include Query/Classlist.mk +Query/Query.d: Query/Classlist.mk + cd Query && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d Query $(Query_CLASSES) + +Query/Query.h: Query/Classlist.mk + cd Query && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h Query $(Query_CLASSES) + + +# Agents +include Agents/Classlist.mk +Agents/Agents.d: Agents/Classlist.mk + cd Agents && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d Agents $(Agents_CLASSES) + +Agents/Agents.h: Agents/Classlist.mk + cd Agents && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h Agents $(Agents_CLASSES) + + +# OnlineRender +include OnlineRender/Classlist.mk +OnlineRender/OnlineRender.d: OnlineRender/Classlist.mk + cd OnlineRender && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d OnlineRender $(OnlineRender_CLASSES) + +OnlineRender/OnlineRender.h: OnlineRender/Classlist.mk + cd OnlineRender && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h OnlineRender $(OnlineRender_CLASSES) + + + +#bin_PROGRAMS = dtinfo + +#dtinfo_CPPFLAGS = -DEXPAND_TEMPLATES -I.. + +#dtinfo_LDADD = lib + +#dtinfo_SOURCES = main.C main_c_api.c diff --git a/cde/programs/dtinfo/dtinfo/src/Managers/Classlist.mk b/cde/programs/dtinfo/dtinfo/src/Managers/Classlist.mk index a584a50ab..076a9d27a 100644 --- a/cde/programs/dtinfo/dtinfo/src/Managers/Classlist.mk +++ b/cde/programs/dtinfo/dtinfo/src/Managers/Classlist.mk @@ -1,5 +1,5 @@ -/* $XConsortium: Classlist.mk /main/11 1996/10/30 14:41:40 drk $ */ -CLASSES= \ +# $XConsortium: Classlist.mk /main/11 1996/10/30 14:41:40 drk $ +Managers_CLASSES= \ ErrorMgr \ MessageMgr \ StyleSheetMgr \ @@ -26,7 +26,7 @@ InputMgrX \ UrlMgr \ EnvMgr -SRCS=MessageMgr.C \ +Managers_SRCS=MessageMgr.C \ StyleSheetMgr.C \ SearchMgr.C \ NodeMgr.C \ @@ -53,7 +53,7 @@ CatMgr.C \ WString.C \ EnvMgr.C -MSGS= \ +Managers_MSGS= \ CatMgr.msg \ EnvMgr.msg \ TtIpcMgr.msg diff --git a/cde/programs/dtinfo/dtinfo/src/Managers/EnvMgr.C b/cde/programs/dtinfo/dtinfo/src/Managers/EnvMgr.C index e2f9e9aac..4d7d2488e 100644 --- a/cde/programs/dtinfo/dtinfo/src/Managers/EnvMgr.C +++ b/cde/programs/dtinfo/dtinfo/src/Managers/EnvMgr.C @@ -47,7 +47,7 @@ using namespace std; #include -#include +#include
// xList, NodeViewInfo, NodeWindowAgent & NodeMgr used only for // getting sections from NodeMgr diff --git a/cde/programs/dtinfo/dtinfo/src/Managers/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Managers/Makefile.am new file mode 100644 index 000000000..f1152eccc --- /dev/null +++ b/cde/programs/dtinfo/dtinfo/src/Managers/Makefile.am @@ -0,0 +1,18 @@ +MAINTAINERCLEANFILES = Makefile.in + +noinst_LIBRARIES = libManagers.a + +# get our env +include ../templates/dtinfo_env.mk + +# class info +include Classlist.mk + +libManagers_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) +libManagers_a_SOURCES = ../Prelude.h $(Managers_SRCS) + +BUILT_SOURCES = Managers.msg +CLEANFILES = $(BUILT_SOURCES) + +Managers.msg: + cat $(Managers_MSGS) > $@ diff --git a/cde/programs/dtinfo/dtinfo/src/Marks/Classlist.mk b/cde/programs/dtinfo/dtinfo/src/Marks/Classlist.mk index bf2ef3d5d..9c2a3a036 100644 --- a/cde/programs/dtinfo/dtinfo/src/Marks/Classlist.mk +++ b/cde/programs/dtinfo/dtinfo/src/Marks/Classlist.mk @@ -1,10 +1,10 @@ -/* $XConsortium: Classlist.mk /main/4 1996/10/30 14:42:20 drk $ */ -CLASSES=\ +# $XConsortium: Classlist.mk /main/4 1996/10/30 14:42:20 drk $ +Marks_CLASSES=\ Mark \ Anchor \ MarkBase -SRCS= \ +Marks_SRCS= \ Mark.C \ Anchor.C \ Mark_mmdb.C \ diff --git a/cde/programs/dtinfo/dtinfo/src/Marks/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Marks/Makefile.am new file mode 100644 index 000000000..504d4310b --- /dev/null +++ b/cde/programs/dtinfo/dtinfo/src/Marks/Makefile.am @@ -0,0 +1,13 @@ +MAINTAINERCLEANFILES = Makefile.in + +noinst_LIBRARIES = libMarks.a + +# get our env +include ../templates/dtinfo_env.mk + +# class info +include Classlist.mk + +libMarks_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) + +libMarks_a_SOURCES = ../Prelude.h $(Marks_SRCS) diff --git a/cde/programs/dtinfo/dtinfo/src/Messages/Classlist.mk b/cde/programs/dtinfo/dtinfo/src/Messages/Classlist.mk index 28bd17074..1e13390b2 100644 --- a/cde/programs/dtinfo/dtinfo/src/Messages/Classlist.mk +++ b/cde/programs/dtinfo/dtinfo/src/Messages/Classlist.mk @@ -1,6 +1,6 @@ -/* $XConsortium: Classlist.mk /main/2 1996/10/30 14:42:56 drk $ */ +# $XConsortium: Classlist.mk /main/2 1996/10/30 14:42:56 drk $ -MSGS= \ +Messages_MSGS= \ Message.msg \ Version.msg diff --git a/cde/programs/dtinfo/dtinfo/src/Messages/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Messages/Makefile.am new file mode 100644 index 000000000..d7a22fecb --- /dev/null +++ b/cde/programs/dtinfo/dtinfo/src/Messages/Makefile.am @@ -0,0 +1,15 @@ +MAINTAINERCLEANFILES = Makefile.in + +noinst_DATA = Messages.msg + +# get our env +include ../templates/dtinfo_env.mk + +# class info +include Classlist.mk + +BUILT_SOURCES = Messages.msg +CLEANFILES = $(BUILT_SOURCES) + +Messages.msg: + cat $(Messages_MSGS) > $@ diff --git a/cde/programs/dtinfo/dtinfo/src/OliasSearch/Classlist.mk b/cde/programs/dtinfo/dtinfo/src/OliasSearch/Classlist.mk index dd3d03f2f..186b157bc 100644 --- a/cde/programs/dtinfo/dtinfo/src/OliasSearch/Classlist.mk +++ b/cde/programs/dtinfo/dtinfo/src/OliasSearch/Classlist.mk @@ -1,6 +1,6 @@ -/* $XConsortium: Classlist.mk /main/3 1996/10/30 14:43:34 drk $ */ -CLASSES=\ +# $XConsortium: Classlist.mk /main/3 1996/10/30 14:43:34 drk $ +OliasSearch_CLASSES=\ ResultID -SRCS=\ +OliasSearch_SRCS=\ ResultID.C diff --git a/cde/programs/dtinfo/dtinfo/src/OliasSearch/Makefile.am b/cde/programs/dtinfo/dtinfo/src/OliasSearch/Makefile.am new file mode 100644 index 000000000..23e86c222 --- /dev/null +++ b/cde/programs/dtinfo/dtinfo/src/OliasSearch/Makefile.am @@ -0,0 +1,13 @@ +MAINTAINERCLEANFILES = Makefile.in + +noinst_LIBRARIES = libOliasSearch.a + +# get our env +include ../templates/dtinfo_env.mk + +# class info +include Classlist.mk + +libOliasSearch_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) + +libOliasSearch_a_SOURCES = ../Prelude.h $(OliasSearch_SRCS) diff --git a/cde/programs/dtinfo/dtinfo/src/OnlineRender/Classlist.mk b/cde/programs/dtinfo/dtinfo/src/OnlineRender/Classlist.mk index 5fd5299cb..fe39632bf 100644 --- a/cde/programs/dtinfo/dtinfo/src/OnlineRender/Classlist.mk +++ b/cde/programs/dtinfo/dtinfo/src/OnlineRender/Classlist.mk @@ -1,5 +1,5 @@ -/* $XConsortium: Classlist.mk /main/2 1996/10/30 14:44:11 drk $ */ +# $XConsortium: Classlist.mk /main/2 1996/10/30 14:44:11 drk $ -MSGS=\ +OnlineRender_MSGS=\ CanvasRenderer.msg diff --git a/cde/programs/dtinfo/dtinfo/src/OnlineRender/Makefile.am b/cde/programs/dtinfo/dtinfo/src/OnlineRender/Makefile.am new file mode 100644 index 000000000..9d108d752 --- /dev/null +++ b/cde/programs/dtinfo/dtinfo/src/OnlineRender/Makefile.am @@ -0,0 +1,18 @@ +MAINTAINERCLEANFILES = Makefile.in + +noinst_LIBRARIES = libOnlineRender.a + +# get our env +include ../templates/dtinfo_env.mk + +# class info +include Classlist.mk + +libOnlineRender_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) +libOnlineRender_a_SOURCES = ../Prelude.h $(OnlineRender_SRCS) + +BUILT_SOURCES = OnlineRender.msg +CLEANFILES = $(BUILT_SOURCES) + +OnlineRender.msg: + cat $(OnlineRender_MSGS) > $@ diff --git a/cde/programs/dtinfo/dtinfo/src/Other/Classlist.mk b/cde/programs/dtinfo/dtinfo/src/Other/Classlist.mk index 09a3d6d9f..02747b9ee 100644 --- a/cde/programs/dtinfo/dtinfo/src/Other/Classlist.mk +++ b/cde/programs/dtinfo/dtinfo/src/Other/Classlist.mk @@ -1,13 +1,13 @@ -/* $XConsortium: Classlist.mk /main/5 1996/10/30 14:44:59 drk $ */ +# $XConsortium: Classlist.mk /main/5 1996/10/30 14:44:59 drk $ -CLASSES= \ +Other_CLASSES= \ AppPrintData \ WindowSystem -SRCS= \ +Other_SRCS= \ AppPrintData.C \ WindowSystemMotif.C -MSGS=\ +Other_MSGS=\ WindowSystem.msg diff --git a/cde/programs/dtinfo/dtinfo/src/Other/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Other/Makefile.am new file mode 100644 index 000000000..5fa82023f --- /dev/null +++ b/cde/programs/dtinfo/dtinfo/src/Other/Makefile.am @@ -0,0 +1,18 @@ +MAINTAINERCLEANFILES = Makefile.in + +noinst_LIBRARIES = libOther.a + +# get our env +include ../templates/dtinfo_env.mk + +# class info +include Classlist.mk + +libOther_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) +libOther_a_SOURCES = ../Prelude.h $(Other_SRCS) + +BUILT_SOURCES = Other.msg +CLEANFILES = $(BUILT_SOURCES) + +Other.msg: + cat $(Other_MSGS) > $@ diff --git a/cde/programs/dtinfo/dtinfo/src/Preferences/Classlist.mk b/cde/programs/dtinfo/dtinfo/src/Preferences/Classlist.mk index 31f6c6d2b..fc8fb196b 100644 --- a/cde/programs/dtinfo/dtinfo/src/Preferences/Classlist.mk +++ b/cde/programs/dtinfo/dtinfo/src/Preferences/Classlist.mk @@ -1,13 +1,13 @@ -/* $XConsortium: Classlist.mk /main/3 1996/08/21 15:43:21 drk $ */ +# $XConsortium: Classlist.mk /main/3 1996/08/21 15:43:21 drk $ -CLASSES= \ +Preferences_CLASSES= \ UserPreference \ IntegerPref \ BooleanPref \ StringPref \ WindowGeometryPref -SRCS=\ +Preferences_SRCS=\ UserPreference.C \ IntegerPref.C \ BooleanPref.C \ diff --git a/cde/programs/dtinfo/dtinfo/src/Preferences/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Preferences/Makefile.am new file mode 100644 index 000000000..9171333d8 --- /dev/null +++ b/cde/programs/dtinfo/dtinfo/src/Preferences/Makefile.am @@ -0,0 +1,13 @@ +MAINTAINERCLEANFILES = Makefile.in + +noinst_LIBRARIES = libPreferences.a + +# get our env +include ../templates/dtinfo_env.mk + +# class info +include Classlist.mk + +libPreferences_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) + +libPreferences_a_SOURCES = ../Prelude.h $(Preferences_SRCS) diff --git a/cde/programs/dtinfo/dtinfo/src/Query/Classlist.mk b/cde/programs/dtinfo/dtinfo/src/Query/Classlist.mk index ffe355669..9710ed331 100644 --- a/cde/programs/dtinfo/dtinfo/src/Query/Classlist.mk +++ b/cde/programs/dtinfo/dtinfo/src/Query/Classlist.mk @@ -1,18 +1,18 @@ -/* $XConsortium: Classlist.mk /main/4 1996/08/21 15:43:28 drk $ */ +# $XConsortium: Classlist.mk /main/4 1996/08/21 15:43:28 drk $ -CLASSES= \ +Query_CLASSES= \ QueryTerm \ QueryTermView \ QueryGroupView \ QueryGroup \ QueryEditor -SRCS= \ +Query_SRCS= \ QueryEditor.C \ QueryTermView.C \ QueryGroupView.C \ QueryTerm.C \ QueryGroup.C -MSGS= \ +Query_MSGS= \ QueryEditor.msg diff --git a/cde/programs/dtinfo/dtinfo/src/Query/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Query/Makefile.am new file mode 100644 index 000000000..7ac210cd9 --- /dev/null +++ b/cde/programs/dtinfo/dtinfo/src/Query/Makefile.am @@ -0,0 +1,18 @@ +MAINTAINERCLEANFILES = Makefile.in + +noinst_LIBRARIES = libQuery.a + +# get our env +include ../templates/dtinfo_env.mk + +# class info +include Classlist.mk + +libQuery_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) +libQuery_a_SOURCES = ../Prelude.h $(Query_SRCS) + +BUILT_SOURCES = Query.msg +CLEANFILES = $(BUILT_SOURCES) + +Query.msg: + cat $(Query_MSGS) > $@ diff --git a/cde/programs/dtinfo/dtinfo/src/Support/Classlist.mk b/cde/programs/dtinfo/dtinfo/src/Support/Classlist.mk index d4e2d35de..77e9321e4 100644 --- a/cde/programs/dtinfo/dtinfo/src/Support/Classlist.mk +++ b/cde/programs/dtinfo/dtinfo/src/Support/Classlist.mk @@ -1,8 +1,8 @@ -/* $XConsortium: Classlist.mk /main/4 1996/10/30 14:45:39 drk $ */ -CLASSES=\ +# $XConsortium: Classlist.mk /main/4 1996/10/30 14:45:39 drk $ +Support_CLASSES=\ xList \ InputNotifier -SRCS= \ +Support_SRCS= \ List_base.C \ UtilityFunctions.C diff --git a/cde/programs/dtinfo/dtinfo/src/Support/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Support/Makefile.am new file mode 100644 index 000000000..bbc3200c7 --- /dev/null +++ b/cde/programs/dtinfo/dtinfo/src/Support/Makefile.am @@ -0,0 +1,13 @@ +MAINTAINERCLEANFILES = Makefile.in + +noinst_LIBRARIES = libSupport.a + +# get our env +include ../templates/dtinfo_env.mk + +# class info +include Classlist.mk + +libSupport_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) + +libSupport_a_SOURCES = ../Prelude.h $(Support_SRCS) diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/Classlist.mk b/cde/programs/dtinfo/dtinfo/src/UAS/Classlist.mk index 4d78d2c48..472cc89db 100644 --- a/cde/programs/dtinfo/dtinfo/src/UAS/Classlist.mk +++ b/cde/programs/dtinfo/dtinfo/src/UAS/Classlist.mk @@ -1,6 +1,6 @@ -/* $XConsortium: Classlist.mk /main/4 1996/10/30 14:46:56 drk $ */ +# $XConsortium: Classlist.mk /main/4 1996/10/30 14:46:56 drk $ -MSGS = \ +UAS_MSGS = \ Base \ DtSR \ MMDB diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/Makefile.am b/cde/programs/dtinfo/dtinfo/src/UAS/Makefile.am new file mode 100644 index 000000000..b8e60e114 --- /dev/null +++ b/cde/programs/dtinfo/dtinfo/src/UAS/Makefile.am @@ -0,0 +1,13 @@ +MAINTAINERCLEANFILES = Makefile.in + +noinst_LIBRARIES = libUAS.a + +# get our env +include ../templates/dtinfo_env.mk + +# class info +include Classlist.mk + +libUAS_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) + +libUAS_a_SOURCES = ../Prelude.h $(UAS_SRCS) diff --git a/cde/programs/dtinfo/dtinfo/src/Widgets/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Widgets/Makefile.am new file mode 100644 index 000000000..bc8729872 --- /dev/null +++ b/cde/programs/dtinfo/dtinfo/src/Widgets/Makefile.am @@ -0,0 +1,11 @@ +MAINTAINERCLEANFILES = Makefile.in + +noinst_LIBRARIES = libWidgets.a + +# get our env +include ../templates/dtinfo_env.mk + +libWidgets_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) + +libWidgets_a_SOURCES = Pixmap.c Tree.c Panner.c Simple.c Porthole.c \ + XawInitFake.c TabButton.c Restraint.c WXmOpButton.C diff --git a/cde/programs/dtinfo/dtinfo/src/cgm/Makefile.am b/cde/programs/dtinfo/dtinfo/src/cgm/Makefile.am new file mode 100644 index 000000000..95cfab6af --- /dev/null +++ b/cde/programs/dtinfo/dtinfo/src/cgm/Makefile.am @@ -0,0 +1,18 @@ +MAINTAINERCLEANFILES = Makefile.in + +noinst_LIBRARIES = libcgm.a + +# get our env +include ../templates/dtinfo_env.mk + +# class info +libcgm_a_CFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) \ + -I$(top_srcdir)/include/DtI + +libcgm_a_SOURCES = cgmcmds.c cgmcommon.c cgmio.c cgmtext.c getcgm.c + +noinst_PROGRAMS = testcgm +testcgm_CPPFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) \ + -I$(top_srcdir)/include/DtI +testcgm_SOURCES = testcgm.c +testcgm_LDADD = libcgm.a $(DTCLIENTLIBS) $(XTOOLLIB) diff --git a/cde/programs/dtinfo/dtinfo/src/cgm/testcgm.c b/cde/programs/dtinfo/dtinfo/src/cgm/testcgm.c index 34e405bda..7065bda76 100644 --- a/cde/programs/dtinfo/dtinfo/src/cgm/testcgm.c +++ b/cde/programs/dtinfo/dtinfo/src/cgm/testcgm.c @@ -30,7 +30,7 @@ #include "spec.h" #include "GraphicsP.h" -main(int argc, char **argv) +int main(int argc, char **argv) { XGCValues myStruct; unsigned long mask; @@ -42,7 +42,7 @@ main(int argc, char **argv) Pixel *ret_colors; int ret_number, pageNo; GC myGC; - Pixmap myPixmap = NULL; + Pixmap myPixmap = 0; char *fileName; int i; _DtGrStream stream ; @@ -58,7 +58,7 @@ main(int argc, char **argv) 512, 512, 2, BlackPixel(display, scr_num), WhitePixel(display, scr_num)); - XSetStandardProperties(display, win, "VCGM", "VCGM", NULL, NULL, 0, + XSetStandardProperties(display, win, "VCGM", "VCGM", 0, NULL, 0, NULL); XMapWindow(display, win); /* find out what we actually got */ diff --git a/cde/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk b/cde/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk new file mode 100644 index 000000000..086235ea9 --- /dev/null +++ b/cde/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk @@ -0,0 +1,30 @@ +# Some common env variables needed by the various modules + +# common defines +DTINFO_DEFINES = -DWideCharSupport -DUseWideChars -DInternationalize \ +-DJapaneseLocal -DUseMotifXpm -DUseTooltalk -DUseSessionMgmt \ +-DDTSEARCH -DCDE_NEXT -DEXPAND_TEMPLATES + +# where stuff is +OLIAS = $(top_srcdir)/programs/dtinfo +CONTROL=$(OLIAS)/control +LIBRARY = $(OLIAS)/library +WWL = $(OLIAS)/dtinfo/wwl +MMDB = $(OLIAS)/DtMmdb +EXCEPTIONS = $(MMDB)/dti_excs +TOOLS = $(OLIAS)/tools +UAS = $(OLIAS)/dtinfo/src/UAS + +WWL_INCLUDES = -I$(WWL)/include +WWL_LIBS=$(STATIC) -L$(WWL)/src -lWWL +EXCEPTIONS_INCLUDES = -I$(EXCEPTIONS) +MMDB_INCLUDES = -I$(MMDB) +UAS_INCLUDES = -I$(UAS)/Base +COMMON_CLASS_INCLUDES = -I$(MMDB)/dti_cc -I$(MMDB) +COMMON_CLASS_LIBDIR = $(STATIC) -L$(MMDB)/dti_cc +STYLE_SHEET_INCLUDES = -I$(MMDB)/StyleSheet +TREERES = $(TOOLS)/misc/treeres + +DTINFO_INCLUDES = -I.. $(UAS_INCLUDES) $(EXCEPTIONS_INCLUDES) \ + $(WWL_INCLUDES) $(TREE_INCLUDES) $(STYLE_SHEET_INCLUDES) \ + $(COMMON_CLASS_INCLUDES) diff --git a/cde/programs/dtinfo/dtinfo/wwl/src/Makefile.am b/cde/programs/dtinfo/dtinfo/wwl/src/Makefile.am index b62994505..e3a1adb87 100644 --- a/cde/programs/dtinfo/dtinfo/wwl/src/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/wwl/src/Makefile.am @@ -5,7 +5,7 @@ noinst_LIBRARIES = libWWL.a libWWL_a_CXXFLAGS = -I../include if SOLARIS -lbWWL_a_CXXFLAGS += -DSYSV -DSVR4 +libWWL_a_CXXFLAGS += -DSYSV -DSVR4 endif libWWL_a_SOURCES = WArgList.C WCallback.C WComposite.C \ From b24fd0461960f6a3f9fc30f1752c3c765e5c6454 Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Fri, 3 Dec 2021 14:18:02 -0700 Subject: [PATCH 02/25] dtinfo: get src/UAS building, finish msg and res building Also, rework the way we build convenience libs for the classes to use libtool. This fixes some potential linking issues and dependency checking. Next up will be to see if we can link and install it, along with it's message catalogs, resources, etc. --- cde/configure.ac | 3 + .../dtinfo/dtinfo/src/Agents/Makefile.am | 6 +- .../dtinfo/dtinfo/src/Basic/Makefile.am | 7 +- .../dtinfo/dtinfo/src/Graphics/Makefile.am | 7 +- cde/programs/dtinfo/dtinfo/src/Makefile.am | 118 ++---------------- .../dtinfo/dtinfo/src/Managers/Makefile.am | 6 +- .../dtinfo/dtinfo/src/Marks/Makefile.am | 7 +- .../dtinfo/dtinfo/src/OliasSearch/Makefile.am | 7 +- .../dtinfo/src/OnlineRender/Makefile.am | 6 +- .../dtinfo/dtinfo/src/Other/Makefile.am | 6 +- .../dtinfo/dtinfo/src/Preferences/Makefile.am | 7 +- .../dtinfo/dtinfo/src/Query/Makefile.am | 6 +- .../dtinfo/dtinfo/src/Support/Makefile.am | 7 +- .../dtinfo/dtinfo/src/UAS/Base/Classlist.mk | 8 +- .../dtinfo/dtinfo/src/UAS/Base/Makefile.am | 19 +++ .../dtinfo/dtinfo/src/UAS/Classlist.mk | 6 +- .../dtinfo/dtinfo/src/UAS/DtSR/Classlist.mk | 8 +- .../dtinfo/src/UAS/DtSR/DtSR_BookcaseEntry.hh | 2 +- .../dtinfo/src/UAS/DtSR/DtSR_SearchEngine.hh | 2 +- .../dtinfo/dtinfo/src/UAS/DtSR/DtSR_Stems.hh | 2 +- .../dtinfo/dtinfo/src/UAS/DtSR/Makefile.am | 19 +++ .../dtinfo/dtinfo/src/UAS/MMDB/Classlist.mk | 8 +- .../dtinfo/dtinfo/src/UAS/MMDB/Makefile.am | 19 +++ .../dtinfo/dtinfo/src/UAS/Makefile.am | 17 ++- .../dtinfo/dtinfo/src/Widgets/Makefile.am | 6 +- .../dtinfo/dtinfo/src/cgm/Makefile.am | 8 +- .../src/templates/dtinfo-dfiles-hfiles.mk | 109 ++++++++++++++++ .../dtinfo/dtinfo/src/templates/dtinfo_env.mk | 1 + cde/programs/dtinfo/tools/misc/Makefile.am | 2 + 29 files changed, 263 insertions(+), 166 deletions(-) create mode 100644 cde/programs/dtinfo/dtinfo/src/UAS/Base/Makefile.am create mode 100644 cde/programs/dtinfo/dtinfo/src/UAS/DtSR/Makefile.am create mode 100644 cde/programs/dtinfo/dtinfo/src/UAS/MMDB/Makefile.am create mode 100644 cde/programs/dtinfo/dtinfo/src/templates/dtinfo-dfiles-hfiles.mk diff --git a/cde/configure.ac b/cde/configure.ac index 48882c847..b6ae31608 100644 --- a/cde/configure.ac +++ b/cde/configure.ac @@ -733,6 +733,9 @@ programs/dtinfo/dtinfo/src/Makefile programs/dtinfo/dtinfo/src/Widgets/Makefile programs/dtinfo/dtinfo/src/Support/Makefile programs/dtinfo/dtinfo/src/UAS/Makefile +programs/dtinfo/dtinfo/src/UAS/Base/Makefile +programs/dtinfo/dtinfo/src/UAS/MMDB/Makefile +programs/dtinfo/dtinfo/src/UAS/DtSR/Makefile programs/dtinfo/dtinfo/src/Basic/Makefile programs/dtinfo/dtinfo/src/OliasSearch/Makefile programs/dtinfo/dtinfo/src/Marks/Makefile diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Agents/Makefile.am index 40dcaf69b..481ab3433 100644 --- a/cde/programs/dtinfo/dtinfo/src/Agents/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/Agents/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -noinst_LIBRARIES = libAgents.a +noinst_LTLIBRARIES = libAgents.la # get our env include ../templates/dtinfo_env.mk @@ -8,8 +8,8 @@ include ../templates/dtinfo_env.mk # class info include Classlist.mk -libAgents_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) -libAgents_a_SOURCES = ../Prelude.h $(Agents_SRCS) +libAgents_la_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) +libAgents_la_SOURCES = ../Prelude.h $(Agents_SRCS) BUILT_SOURCES = Agents.msg CLEANFILES = $(BUILT_SOURCES) diff --git a/cde/programs/dtinfo/dtinfo/src/Basic/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Basic/Makefile.am index 2a0af0919..838e76858 100644 --- a/cde/programs/dtinfo/dtinfo/src/Basic/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/Basic/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -noinst_LIBRARIES = libBasic.a +noinst_LTLIBRARIES = libBasic.la # get our env include ../templates/dtinfo_env.mk @@ -8,6 +8,7 @@ include ../templates/dtinfo_env.mk # class info include Classlist.mk -libBasic_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) +libBasic_la_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) + +libBasic_la_SOURCES = ../Prelude.h $(Basic_SRCS) -libBasic_a_SOURCES = ../Prelude.h $(Basic_SRCS) diff --git a/cde/programs/dtinfo/dtinfo/src/Graphics/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Graphics/Makefile.am index c9a7faeda..958c194b4 100644 --- a/cde/programs/dtinfo/dtinfo/src/Graphics/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/Graphics/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -noinst_LIBRARIES = libGraphics.a +noinst_LTLIBRARIES = libGraphics.la # get our env include ../templates/dtinfo_env.mk @@ -8,6 +8,7 @@ include ../templates/dtinfo_env.mk # class info include Classlist.mk -libGraphics_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) +libGraphics_la_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) + +libGraphics_la_SOURCES = ../Prelude.h $(Graphics_SRCS) -libGraphics_a_SOURCES = ../Prelude.h $(Graphics_SRCS) diff --git a/cde/programs/dtinfo/dtinfo/src/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Makefile.am index b5618260d..b7fb10d27 100644 --- a/cde/programs/dtinfo/dtinfo/src/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/Makefile.am @@ -1,7 +1,9 @@ MAINTAINERCLEANFILES = Makefile.in +# get our env variables include templates/dtinfo_env.mk +# get the toplevel Classlist include Classlist.mk # CLASSLIST is defined in the top (dtinfo) level Classlist.mk file @@ -35,115 +37,21 @@ Prelude.h: Dtinfo: Dtinfo.res $(RESFILES) $(CPP_PROGRAM) -traditional -nostdinc -C Dtinfo.res | $(TREERES) > $@ -##### hacking area -# Support -include Support/Classlist.mk -Support/Support.d: Support/Classlist.mk - cd Support && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d Support $(Support_CLASSES) +# dtinfo class dfiles and hfiles building +include templates/dtinfo-dfiles-hfiles.mk -Support/Support.h: Support/Classlist.mk - cd Support && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h Support $(Support_CLASSES) +# gather up the messages and generate the file. MSGS comes from the +# dtinfo/src/Classlist.mk file. +noinst_DATA = dtinfo.msg.updated -# UAS -include UAS/Classlist.mk -UAS/UAS.d: UAS/Classlist.mk - cd UAS && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d UAS $(UAS_CLASSES) - -UAS/UAS.h: UAS/Classlist.mk - cd UAS && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h UAS $(UAS_CLASSES) - - -# Basic -include Basic/Classlist.mk -Basic/Basic.d: Basic/Classlist.mk - cd Basic && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d Basic $(Basic_CLASSES) - -Basic/Basic.h: Basic/Classlist.mk - cd Basic && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h Basic $(Basic_CLASSES) - - -# OliasSearch -include OliasSearch/Classlist.mk -OliasSearch/OliasSearch.d: OliasSearch/Classlist.mk - cd OliasSearch && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d OliasSearch $(OliasSearch_CLASSES) - -OliasSearch/OliasSearch.h: OliasSearch/Classlist.mk - cd OliasSearch && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h OliasSearch $(OliasSearch_CLASSES) - - -# Marks -include Marks/Classlist.mk -Marks/Marks.d: Marks/Classlist.mk - cd Marks && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d Marks $(Marks_CLASSES) - -Marks/Marks.h: Marks/Classlist.mk - cd Marks && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h Marks $(Marks_CLASSES) - - -# Graphics -include Graphics/Classlist.mk -Graphics/Graphics.d: Graphics/Classlist.mk - cd Graphics && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d Graphics $(Graphics_CLASSES) - -Graphics/Graphics.h: Graphics/Classlist.mk - cd Graphics && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h Graphics $(Graphics_CLASSES) - - -# Preferences -include Preferences/Classlist.mk -Preferences/Preferences.d: Preferences/Classlist.mk - cd Preferences && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d Preferences $(Preferences_CLASSES) - -Preferences/Preferences.h: Preferences/Classlist.mk - cd Preferences && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h Preferences $(Preferences_CLASSES) - - -# Managers -include Managers/Classlist.mk -Managers/Managers.d: Managers/Classlist.mk - cd Managers && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d Managers $(Managers_CLASSES) - -Managers/Managers.h: Managers/Classlist.mk - cd Managers && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h Managers $(Managers_CLASSES) - - -# Other -include Other/Classlist.mk -Other/Other.d: Other/Classlist.mk - cd Other && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d Other $(Other_CLASSES) - -Other/Other.h: Other/Classlist.mk - cd Other && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h Other $(Other_CLASSES) - - -# Query -include Query/Classlist.mk -Query/Query.d: Query/Classlist.mk - cd Query && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d Query $(Query_CLASSES) - -Query/Query.h: Query/Classlist.mk - cd Query && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h Query $(Query_CLASSES) - - -# Agents -include Agents/Classlist.mk -Agents/Agents.d: Agents/Classlist.mk - cd Agents && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d Agents $(Agents_CLASSES) - -Agents/Agents.h: Agents/Classlist.mk - cd Agents && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h Agents $(Agents_CLASSES) - - -# OnlineRender -include OnlineRender/Classlist.mk -OnlineRender/OnlineRender.d: OnlineRender/Classlist.mk - cd OnlineRender && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d OnlineRender $(OnlineRender_CLASSES) - -OnlineRender/OnlineRender.h: OnlineRender/Classlist.mk - cd OnlineRender && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h OnlineRender $(OnlineRender_CLASSES) - +dtinfo.msg.updated: + (msgs=; for i in $(MSGS) ; do msgs="$$msgs $$i/$$i.msg"; done; \ + cat $$msgs >dtinfo.cpp && \ + $(CPP_PROGRAM) -traditional -nostdinc -P -C dtinfo_msg.tmpl | $(MSGSETS) > dtinfo.msg.updated; \ + $(RM) dtinfo.cpp ) +CLEANFILES += dtinfo.msg.updated dtinfo.cpp #bin_PROGRAMS = dtinfo diff --git a/cde/programs/dtinfo/dtinfo/src/Managers/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Managers/Makefile.am index f1152eccc..467f1907e 100644 --- a/cde/programs/dtinfo/dtinfo/src/Managers/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/Managers/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -noinst_LIBRARIES = libManagers.a +noinst_LTLIBRARIES = libManagers.la # get our env include ../templates/dtinfo_env.mk @@ -8,8 +8,8 @@ include ../templates/dtinfo_env.mk # class info include Classlist.mk -libManagers_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) -libManagers_a_SOURCES = ../Prelude.h $(Managers_SRCS) +libManagers_la_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) +libManagers_la_SOURCES = ../Prelude.h $(Managers_SRCS) BUILT_SOURCES = Managers.msg CLEANFILES = $(BUILT_SOURCES) diff --git a/cde/programs/dtinfo/dtinfo/src/Marks/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Marks/Makefile.am index 504d4310b..fa1fa0af1 100644 --- a/cde/programs/dtinfo/dtinfo/src/Marks/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/Marks/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -noinst_LIBRARIES = libMarks.a +noinst_LTLIBRARIES = libMarks.la # get our env include ../templates/dtinfo_env.mk @@ -8,6 +8,7 @@ include ../templates/dtinfo_env.mk # class info include Classlist.mk -libMarks_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) +libMarks_la_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) + +libMarks_la_SOURCES = ../Prelude.h $(Marks_SRCS) -libMarks_a_SOURCES = ../Prelude.h $(Marks_SRCS) diff --git a/cde/programs/dtinfo/dtinfo/src/OliasSearch/Makefile.am b/cde/programs/dtinfo/dtinfo/src/OliasSearch/Makefile.am index 23e86c222..5328f1b18 100644 --- a/cde/programs/dtinfo/dtinfo/src/OliasSearch/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/OliasSearch/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -noinst_LIBRARIES = libOliasSearch.a +noinst_LTLIBRARIES = libOliasSearch.la # get our env include ../templates/dtinfo_env.mk @@ -8,6 +8,7 @@ include ../templates/dtinfo_env.mk # class info include Classlist.mk -libOliasSearch_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) +libOliasSearch_la_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) + +libOliasSearch_la_SOURCES = ../Prelude.h $(OliasSearch_SRCS) -libOliasSearch_a_SOURCES = ../Prelude.h $(OliasSearch_SRCS) diff --git a/cde/programs/dtinfo/dtinfo/src/OnlineRender/Makefile.am b/cde/programs/dtinfo/dtinfo/src/OnlineRender/Makefile.am index 9d108d752..c88c4ae4d 100644 --- a/cde/programs/dtinfo/dtinfo/src/OnlineRender/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/OnlineRender/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -noinst_LIBRARIES = libOnlineRender.a +noinst_LTLIBRARIES = libOnlineRender.la # get our env include ../templates/dtinfo_env.mk @@ -8,8 +8,8 @@ include ../templates/dtinfo_env.mk # class info include Classlist.mk -libOnlineRender_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) -libOnlineRender_a_SOURCES = ../Prelude.h $(OnlineRender_SRCS) +libOnlineRender_la_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) +libOnlineRender_la_SOURCES = ../Prelude.h $(OnlineRender_SRCS) BUILT_SOURCES = OnlineRender.msg CLEANFILES = $(BUILT_SOURCES) diff --git a/cde/programs/dtinfo/dtinfo/src/Other/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Other/Makefile.am index 5fa82023f..58498c804 100644 --- a/cde/programs/dtinfo/dtinfo/src/Other/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/Other/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -noinst_LIBRARIES = libOther.a +noinst_LTLIBRARIES = libOther.la # get our env include ../templates/dtinfo_env.mk @@ -8,8 +8,8 @@ include ../templates/dtinfo_env.mk # class info include Classlist.mk -libOther_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) -libOther_a_SOURCES = ../Prelude.h $(Other_SRCS) +libOther_la_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) +libOther_la_SOURCES = ../Prelude.h $(Other_SRCS) BUILT_SOURCES = Other.msg CLEANFILES = $(BUILT_SOURCES) diff --git a/cde/programs/dtinfo/dtinfo/src/Preferences/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Preferences/Makefile.am index 9171333d8..7b3ade344 100644 --- a/cde/programs/dtinfo/dtinfo/src/Preferences/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/Preferences/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -noinst_LIBRARIES = libPreferences.a +noinst_LTLIBRARIES = libPreferences.la # get our env include ../templates/dtinfo_env.mk @@ -8,6 +8,7 @@ include ../templates/dtinfo_env.mk # class info include Classlist.mk -libPreferences_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) +libPreferences_la_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) + +libPreferences_la_SOURCES = ../Prelude.h $(Preferences_SRCS) -libPreferences_a_SOURCES = ../Prelude.h $(Preferences_SRCS) diff --git a/cde/programs/dtinfo/dtinfo/src/Query/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Query/Makefile.am index 7ac210cd9..1a5c473ef 100644 --- a/cde/programs/dtinfo/dtinfo/src/Query/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/Query/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -noinst_LIBRARIES = libQuery.a +noinst_LTLIBRARIES = libQuery.la # get our env include ../templates/dtinfo_env.mk @@ -8,8 +8,8 @@ include ../templates/dtinfo_env.mk # class info include Classlist.mk -libQuery_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) -libQuery_a_SOURCES = ../Prelude.h $(Query_SRCS) +libQuery_la_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) +libQuery_la_SOURCES = ../Prelude.h $(Query_SRCS) BUILT_SOURCES = Query.msg CLEANFILES = $(BUILT_SOURCES) diff --git a/cde/programs/dtinfo/dtinfo/src/Support/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Support/Makefile.am index bbc3200c7..8e4a49736 100644 --- a/cde/programs/dtinfo/dtinfo/src/Support/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/Support/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -noinst_LIBRARIES = libSupport.a +noinst_LTLIBRARIES = libSupport.la # get our env include ../templates/dtinfo_env.mk @@ -8,6 +8,7 @@ include ../templates/dtinfo_env.mk # class info include Classlist.mk -libSupport_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) +libSupport_la_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) + +libSupport_la_SOURCES = ../Prelude.h $(Support_SRCS) -libSupport_a_SOURCES = ../Prelude.h $(Support_SRCS) diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/Base/Classlist.mk b/cde/programs/dtinfo/dtinfo/src/UAS/Base/Classlist.mk index cad625577..a4fbbd352 100644 --- a/cde/programs/dtinfo/dtinfo/src/UAS/Base/Classlist.mk +++ b/cde/programs/dtinfo/dtinfo/src/UAS/Base/Classlist.mk @@ -1,7 +1,7 @@ -/* $XConsortium: Classlist.mk /main/5 1996/10/30 14:46:19 drk $ */ -CLASSES= +# $XConsortium: Classlist.mk /main/5 1996/10/30 14:46:19 drk $ +Base_CLASSES= -SRCS= \ +Base_SRCS= \ UAS_Base.C \ UAS_Buffer.C \ UAS_Collection.C \ @@ -20,6 +20,6 @@ UAS_TextRun.C \ UAS_String.C \ UAS_StyleSheet.C -MSGS=\ +Base_MSGS=\ UAS_Base.msg diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/Base/Makefile.am b/cde/programs/dtinfo/dtinfo/src/UAS/Base/Makefile.am new file mode 100644 index 000000000..b9b7a3248 --- /dev/null +++ b/cde/programs/dtinfo/dtinfo/src/UAS/Base/Makefile.am @@ -0,0 +1,19 @@ +MAINTAINERCLEANFILES = Makefile.in + +noinst_LTLIBRARIES = libBase.la + +# get our env +include ../../templates/dtinfo_env.mk + +# class info +include Classlist.mk + +libBase_la_CXXFLAGS = -I.. -I ../.. -I../Support $(DTINFO_DEFINES) \ + $(DTINFO_INCLUDES) +libBase_la_SOURCES = $(Base_SRCS) + +BUILT_SOURCES = Base.msg +CLEANFILES = $(BUILT_SOURCES) + +Base.msg: + cat $(Base_MSGS) > $@ diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/Classlist.mk b/cde/programs/dtinfo/dtinfo/src/UAS/Classlist.mk index 472cc89db..695412c0e 100644 --- a/cde/programs/dtinfo/dtinfo/src/UAS/Classlist.mk +++ b/cde/programs/dtinfo/dtinfo/src/UAS/Classlist.mk @@ -1,7 +1,7 @@ # $XConsortium: Classlist.mk /main/4 1996/10/30 14:46:56 drk $ UAS_MSGS = \ -Base \ -DtSR \ -MMDB +Base/Base.msg \ +DtSR/DtSR.msg \ +MMDB/MMDB.msg diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/Classlist.mk b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/Classlist.mk index dc5086928..9b7d24735 100644 --- a/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/Classlist.mk +++ b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/Classlist.mk @@ -1,7 +1,7 @@ -/* $XConsortium: Classlist.mk /main/5 1996/10/30 14:47:36 drk $ */ -CLASSES= +# $XConsortium: Classlist.mk /main/5 1996/10/30 14:47:36 drk $ +DtSR_CLASSES= -SRCS= \ +DtSR_SRCS= \ DtSR_BookcaseEntry.C \ DtSR_Parser.C \ DtSR_SearchEngine.C \ @@ -12,6 +12,6 @@ DtSR_SearchZones.C \ Tml_TextRenderer.C \ TextParser.C -MSGS= \ +DtSR_MSGS= \ DtSR_Parser.msg \ DtSR_SearchEngine.msg diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_BookcaseEntry.hh b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_BookcaseEntry.hh index 4401f6e7f..5b5f7828a 100644 --- a/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_BookcaseEntry.hh +++ b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_BookcaseEntry.hh @@ -35,7 +35,7 @@ #include "DtSR_Stems.hh" extern "C" { -#include "Search.h" +#include "Dt/Search.h" } class DtSR_BookcaseEntry : public UAS_BookcaseEntry diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_SearchEngine.hh b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_SearchEngine.hh index a1d717b31..4f1a2ebd3 100644 --- a/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_SearchEngine.hh +++ b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_SearchEngine.hh @@ -31,7 +31,7 @@ #include "UAS_SearchEngine.hh" extern "C" { -#include "Search.h" +#include "Dt/Search.h" } #include "DtSR_Parser.hh" diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_Stems.hh b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_Stems.hh index fd827e1e0..99e0ba610 100644 --- a/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_Stems.hh +++ b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/DtSR_Stems.hh @@ -25,7 +25,7 @@ #define _DTSR_STEMS_HH_ extern "C" { -#include "Search.h" +#include "Dt/Search.h" } #include "UAS_Base.hh" diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/Makefile.am b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/Makefile.am new file mode 100644 index 000000000..98f5a9971 --- /dev/null +++ b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/Makefile.am @@ -0,0 +1,19 @@ +MAINTAINERCLEANFILES = Makefile.in + +noinst_LTLIBRARIES = libDtSR.la + +# get our env +include ../../templates/dtinfo_env.mk + +# class info +include Classlist.mk + +libDtSR_la_CXXFLAGS = -I../Base -I./Util_Classes -I../.. \ + $(DTINFO_DEFINES) $(DTINFO_INCLUDES) +libDtSR_la_SOURCES = $(DtSR_SRCS) + +BUILT_SOURCES = DtSR.msg +CLEANFILES = $(BUILT_SOURCES) + +DtSR.msg: + cat $(DtSR_MSGS) > $@ diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/MMDB/Classlist.mk b/cde/programs/dtinfo/dtinfo/src/UAS/MMDB/Classlist.mk index a627f986e..68a8266b3 100644 --- a/cde/programs/dtinfo/dtinfo/src/UAS/MMDB/Classlist.mk +++ b/cde/programs/dtinfo/dtinfo/src/UAS/MMDB/Classlist.mk @@ -1,7 +1,7 @@ -/* $XConsortium: Classlist.mk /main/4 1996/10/30 14:48:10 drk $ */ -CLASSES= +# $XConsortium: Classlist.mk /main/4 1996/10/30 14:48:10 drk $ +MMDB_CLASSES= -SRCS= \ +MMDB_SRCS= \ MMDB.C \ MMDB_Common.C \ MMDB_Factory.C \ @@ -11,5 +11,5 @@ MMDB_BookCase.C \ MMDB_EmbeddedObject.C \ MMDB_StyleSheet.C -MSGS=\ +MMDB_MSGS=\ UAS_MMDB.msg diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/MMDB/Makefile.am b/cde/programs/dtinfo/dtinfo/src/UAS/MMDB/Makefile.am new file mode 100644 index 000000000..170665df4 --- /dev/null +++ b/cde/programs/dtinfo/dtinfo/src/UAS/MMDB/Makefile.am @@ -0,0 +1,19 @@ +MAINTAINERCLEANFILES = Makefile.in + +noinst_LTLIBRARIES = libMMDB.la + +# get our env +include ../../templates/dtinfo_env.mk + +# class info +include Classlist.mk + +libMMDB_la_CXXFLAGS = -I../Base -I../.. $(DTINFO_DEFINES) \ + $(DTINFO_INCLUDES) +libMMDB_la_SOURCES = $(MMDB_SRCS) + +BUILT_SOURCES = MMDB.msg +CLEANFILES = $(BUILT_SOURCES) + +MMDB.msg: + cat $(MMDB_MSGS) > $@ diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/Makefile.am b/cde/programs/dtinfo/dtinfo/src/UAS/Makefile.am index b8e60e114..083273f13 100644 --- a/cde/programs/dtinfo/dtinfo/src/UAS/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/UAS/Makefile.am @@ -1,6 +1,8 @@ MAINTAINERCLEANFILES = Makefile.in -noinst_LIBRARIES = libUAS.a +SUBDIRS = Base MMDB DtSR + +noinst_LTLIBRARIES = libUAS.la # get our env include ../templates/dtinfo_env.mk @@ -8,6 +10,15 @@ include ../templates/dtinfo_env.mk # class info include Classlist.mk -libUAS_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) +libUAS_la_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) +libUAS_la_SOURCES = +# this should make sure this is linked with a C++ compiler +nodist_EXTRA_libUAS_la_SOURCES = dummy.cxx +libUAS_la_LIBADD = Base/libBase.la MMDB/libMMDB.la DtSR/libDtSR.la -libUAS_a_SOURCES = ../Prelude.h $(UAS_SRCS) +noinst_DATA = UAS.msg + +UAS.msg: $(UAS_MSGS) + cat $(UAS_MSGS) > $@ + +CLEANFILES = UAS.msg diff --git a/cde/programs/dtinfo/dtinfo/src/Widgets/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Widgets/Makefile.am index bc8729872..738e254e8 100644 --- a/cde/programs/dtinfo/dtinfo/src/Widgets/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/Widgets/Makefile.am @@ -1,11 +1,11 @@ MAINTAINERCLEANFILES = Makefile.in -noinst_LIBRARIES = libWidgets.a +noinst_LTLIBRARIES = libWidgets.la # get our env include ../templates/dtinfo_env.mk -libWidgets_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) +libWidgets_la_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) -libWidgets_a_SOURCES = Pixmap.c Tree.c Panner.c Simple.c Porthole.c \ +libWidgets_la_SOURCES = Pixmap.c Tree.c Panner.c Simple.c Porthole.c \ XawInitFake.c TabButton.c Restraint.c WXmOpButton.C diff --git a/cde/programs/dtinfo/dtinfo/src/cgm/Makefile.am b/cde/programs/dtinfo/dtinfo/src/cgm/Makefile.am index 95cfab6af..fdda10eec 100644 --- a/cde/programs/dtinfo/dtinfo/src/cgm/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/cgm/Makefile.am @@ -1,18 +1,18 @@ MAINTAINERCLEANFILES = Makefile.in -noinst_LIBRARIES = libcgm.a +noinst_LTLIBRARIES = libcgm.la # get our env include ../templates/dtinfo_env.mk # class info -libcgm_a_CFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) \ +libcgm_la_CFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) \ -I$(top_srcdir)/include/DtI -libcgm_a_SOURCES = cgmcmds.c cgmcommon.c cgmio.c cgmtext.c getcgm.c +libcgm_la_SOURCES = cgmcmds.c cgmcommon.c cgmio.c cgmtext.c getcgm.c noinst_PROGRAMS = testcgm testcgm_CPPFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) \ -I$(top_srcdir)/include/DtI testcgm_SOURCES = testcgm.c -testcgm_LDADD = libcgm.a $(DTCLIENTLIBS) $(XTOOLLIB) +testcgm_LDADD = libcgm.la $(DTCLIENTLIBS) $(XTOOLLIB) diff --git a/cde/programs/dtinfo/dtinfo/src/templates/dtinfo-dfiles-hfiles.mk b/cde/programs/dtinfo/dtinfo/src/templates/dtinfo-dfiles-hfiles.mk new file mode 100644 index 000000000..6f2da0ed7 --- /dev/null +++ b/cde/programs/dtinfo/dtinfo/src/templates/dtinfo-dfiles-hfiles.mk @@ -0,0 +1,109 @@ +## Build the dfiles and hfiles components for each of the class modules. +## Moved into this file to keep Makefile.am in dtinfo/src readable + +# Support +include Support/Classlist.mk +Support/Support.d: Support/Classlist.mk + cd Support && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d Support $(Support_CLASSES) + +Support/Support.h: Support/Classlist.mk + cd Support && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h Support $(Support_CLASSES) + + +# UAS +include UAS/Classlist.mk +UAS/UAS.d: UAS/Classlist.mk + cd UAS && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d UAS $(UAS_CLASSES) + +UAS/UAS.h: UAS/Classlist.mk + cd UAS && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h UAS $(UAS_CLASSES) + + +# Basic +include Basic/Classlist.mk +Basic/Basic.d: Basic/Classlist.mk + cd Basic && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d Basic $(Basic_CLASSES) + +Basic/Basic.h: Basic/Classlist.mk + cd Basic && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h Basic $(Basic_CLASSES) + + +# OliasSearch +include OliasSearch/Classlist.mk +OliasSearch/OliasSearch.d: OliasSearch/Classlist.mk + cd OliasSearch && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d OliasSearch $(OliasSearch_CLASSES) + +OliasSearch/OliasSearch.h: OliasSearch/Classlist.mk + cd OliasSearch && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h OliasSearch $(OliasSearch_CLASSES) + + +# Marks +include Marks/Classlist.mk +Marks/Marks.d: Marks/Classlist.mk + cd Marks && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d Marks $(Marks_CLASSES) + +Marks/Marks.h: Marks/Classlist.mk + cd Marks && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h Marks $(Marks_CLASSES) + + +# Graphics +include Graphics/Classlist.mk +Graphics/Graphics.d: Graphics/Classlist.mk + cd Graphics && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d Graphics $(Graphics_CLASSES) + +Graphics/Graphics.h: Graphics/Classlist.mk + cd Graphics && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h Graphics $(Graphics_CLASSES) + + +# Preferences +include Preferences/Classlist.mk +Preferences/Preferences.d: Preferences/Classlist.mk + cd Preferences && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d Preferences $(Preferences_CLASSES) + +Preferences/Preferences.h: Preferences/Classlist.mk + cd Preferences && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h Preferences $(Preferences_CLASSES) + + +# Managers +include Managers/Classlist.mk +Managers/Managers.d: Managers/Classlist.mk + cd Managers && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d Managers $(Managers_CLASSES) + +Managers/Managers.h: Managers/Classlist.mk + cd Managers && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h Managers $(Managers_CLASSES) + + +# Other +include Other/Classlist.mk +Other/Other.d: Other/Classlist.mk + cd Other && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d Other $(Other_CLASSES) + +Other/Other.h: Other/Classlist.mk + cd Other && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h Other $(Other_CLASSES) + + +# Query +include Query/Classlist.mk +Query/Query.d: Query/Classlist.mk + cd Query && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d Query $(Query_CLASSES) + +Query/Query.h: Query/Classlist.mk + cd Query && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h Query $(Query_CLASSES) + + +# Agents +include Agents/Classlist.mk +Agents/Agents.d: Agents/Classlist.mk + cd Agents && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d Agents $(Agents_CLASSES) + +Agents/Agents.h: Agents/Classlist.mk + cd Agents && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h Agents $(Agents_CLASSES) + + +# OnlineRender +include OnlineRender/Classlist.mk +OnlineRender/OnlineRender.d: OnlineRender/Classlist.mk + cd OnlineRender && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles d OnlineRender $(OnlineRender_CLASSES) + +OnlineRender/OnlineRender.h: OnlineRender/Classlist.mk + cd OnlineRender && $(top_builddir)/../programs/dtinfo/tools/misc/dfiles h OnlineRender $(OnlineRender_CLASSES) diff --git a/cde/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk b/cde/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk index 086235ea9..9a2b9751c 100644 --- a/cde/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk +++ b/cde/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk @@ -24,6 +24,7 @@ COMMON_CLASS_INCLUDES = -I$(MMDB)/dti_cc -I$(MMDB) COMMON_CLASS_LIBDIR = $(STATIC) -L$(MMDB)/dti_cc STYLE_SHEET_INCLUDES = -I$(MMDB)/StyleSheet TREERES = $(TOOLS)/misc/treeres +MSGSETS = $(TOOLS)/misc/msgsets DTINFO_INCLUDES = -I.. $(UAS_INCLUDES) $(EXCEPTIONS_INCLUDES) \ $(WWL_INCLUDES) $(TREE_INCLUDES) $(STYLE_SHEET_INCLUDES) \ diff --git a/cde/programs/dtinfo/tools/misc/Makefile.am b/cde/programs/dtinfo/tools/misc/Makefile.am index 6595e14c9..3aa8dfd49 100644 --- a/cde/programs/dtinfo/tools/misc/Makefile.am +++ b/cde/programs/dtinfo/tools/misc/Makefile.am @@ -10,6 +10,8 @@ dfiles_SOURCES = dfiles.c pmaker_SOURCES = pmaker.c +# JET - this one migth need to be regenned via the lex file someday... +# Maybe it should always be regenned? msgsets_SOURCES = msgsets.C treeres: treeres.src From 97b2f86eba118747853b7081f48237696942e1ec Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Sat, 4 Dec 2021 15:27:14 -0700 Subject: [PATCH 03/25] dtinfo/mmdb: redo the way this library is built Specifically: - use libtool so that the top level library contains the actual objects, and not just the sub-archives, which the linker will just ignore. - create the source files via symlinks rather than referencing them with relative paths. Doing it that way causes a 'make clean' to delete objects in DtMmdb/ which is wrong. - fix up utility/ - it seemed to be building more source files than the original Imakefile listed. Other changes may need to be done here if similar mistakes were made in other subdirs. --- .../dtinfo/dtinfo/src/templates/dtinfo_env.mk | 21 ++++++- cde/programs/dtinfo/mmdb/HardCopy/Makefile.am | 30 ++++++---- cde/programs/dtinfo/mmdb/Makefile.am | 24 ++++---- .../dtinfo/mmdb/StyleSheet/Makefile.am | 56 ++++++++---------- cde/programs/dtinfo/mmdb/api/Makefile.am | 26 ++++++--- cde/programs/dtinfo/mmdb/btree/Makefile.am | 16 ++++-- .../dtinfo/mmdb/btree_berkeley/Makefile.am | 57 ++++++++++--------- .../dtinfo/mmdb/compression/Makefile.am | 26 +++++---- cde/programs/dtinfo/mmdb/diskhash/Makefile.am | 18 ++++-- cde/programs/dtinfo/mmdb/dstr/Makefile.am | 30 +++++----- cde/programs/dtinfo/mmdb/dti_cc/Makefile.am | 25 ++++---- cde/programs/dtinfo/mmdb/dti_excs/Makefile.am | 29 ++++------ cde/programs/dtinfo/mmdb/dynhash/Makefile.am | 18 ++++-- cde/programs/dtinfo/mmdb/hmphf/Makefile.am | 24 +++++--- cde/programs/dtinfo/mmdb/index/Makefile.am | 27 +++++---- cde/programs/dtinfo/mmdb/mgrs/Makefile.am | 21 ++++--- cde/programs/dtinfo/mmdb/misc/Makefile.am | 16 ++++-- cde/programs/dtinfo/mmdb/object/Makefile.am | 37 ++++++------ cde/programs/dtinfo/mmdb/oliasdb/Makefile.am | 47 +++++++-------- cde/programs/dtinfo/mmdb/schema/Makefile.am | 29 +++++----- cde/programs/dtinfo/mmdb/storage/Makefile.am | 33 ++++++----- cde/programs/dtinfo/mmdb/utility/Makefile.am | 41 +++++-------- 22 files changed, 350 insertions(+), 301 deletions(-) diff --git a/cde/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk b/cde/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk index 9a2b9751c..874a15ff4 100644 --- a/cde/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk +++ b/cde/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk @@ -1,9 +1,21 @@ # Some common env variables needed by the various modules # common defines -DTINFO_DEFINES = -DWideCharSupport -DUseWideChars -DInternationalize \ --DJapaneseLocal -DUseMotifXpm -DUseTooltalk -DUseSessionMgmt \ --DDTSEARCH -DCDE_NEXT -DEXPAND_TEMPLATES +DTINFO_DEFINES = -DDtinfoClient -DUseWideChars -DInternationalize \ +-DUseMotifXpm -DUseTooltalk -DUseSessionMgmt -DDTSEARCH -DCDE_NEXT \ +-DEXPAND_TEMPLATES + +if LINUX +DTINFO_DEFINES += -DNATIVE_EXCEPTIONS +endif + +if BSD +DTINFO_DEFINES += -DNATIVE_EXCEPTIONS +endif + +if SOLARIS +DTINFO_DEFINES += -DHAS_TERMINATE -DNATIVE_EXCEPTIONS +endif # where stuff is OLIAS = $(top_srcdir)/programs/dtinfo @@ -19,6 +31,9 @@ WWL_INCLUDES = -I$(WWL)/include WWL_LIBS=$(STATIC) -L$(WWL)/src -lWWL EXCEPTIONS_INCLUDES = -I$(EXCEPTIONS) MMDB_INCLUDES = -I$(MMDB) +#MMDB_LIBS=$(STATIC) -L$(OLIAS)/mmdb -lMMDB +MMDB_LIBS=$(OLIAS)/mmdb/libMMDB.la +#MMDB_LIBS= $(OLIAS)/DtMmdb/libDtMmdb.la UAS_INCLUDES = -I$(UAS)/Base COMMON_CLASS_INCLUDES = -I$(MMDB)/dti_cc -I$(MMDB) COMMON_CLASS_LIBDIR = $(STATIC) -L$(MMDB)/dti_cc diff --git a/cde/programs/dtinfo/mmdb/HardCopy/Makefile.am b/cde/programs/dtinfo/mmdb/HardCopy/Makefile.am index b7b07aa5a..911d6daa6 100644 --- a/cde/programs/dtinfo/mmdb/HardCopy/Makefile.am +++ b/cde/programs/dtinfo/mmdb/HardCopy/Makefile.am @@ -1,21 +1,27 @@ MAINTAINERCLEANFILES = Makefile.in -noinst_LIBRARIES = libHardCopy.a +include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk -AUTOMAKE_OPTIONS = no-dependencies - -libHardCopy_a_CXXFLAGS = -DCDE_NEXT -DEXPAND_TEMPLATES -I../../DtMmdb \ - -I../../DtMmdb/HardCopy -I../../DtMmdb/dti_excs - -libHardCopy_a_SOURCES = ../../DtMmdb/HardCopy/FPset.C \ - ../../DtMmdb/HardCopy/HardCopyFP.C \ - ../../DtMmdb/HardCopy/autoNumber.C \ - ../../DtMmdb/HardCopy/autoNumberFP.C +BASE = ../../DtMmdb/HardCopy +BUILT_SOURCES = FPset.C HardCopyFP.C autoNumber.C autoNumberFP.C if LINUX -libHardCopy_a_SOURCES += ../../DtMmdb/HardCopy/TemplatesAutoNumber.C +BUILT_SOURCES += TemplatesAutoNumber.C endif if BSD -libHardCopy_a_SOURCES += ../../DtMmdb/HardCopy/TemplatesAutoNumber.C +BUILT_SOURCES += TemplatesAutoNumber.C endif + +$(BUILT_SOURCES): + $(LN_S) $(BASE)/$@ $@ + +CLEANFILES = $(BUILT_SOURCES) + +noinst_LTLIBRARIES = libHardCopy.la + +libHardCopy_la_CXXFLAGS = $(DTINFO_DEFINES) \ + -I../../DtMmdb -I../../DtMmdb/HardCopy -I../../DtMmdb/dti_excs \ + -I$(BASE) + +libHardCopy_la_SOURCES = $(BUILT_SOURCES) diff --git a/cde/programs/dtinfo/mmdb/Makefile.am b/cde/programs/dtinfo/mmdb/Makefile.am index 246e4ae15..5f598ed83 100644 --- a/cde/programs/dtinfo/mmdb/Makefile.am +++ b/cde/programs/dtinfo/mmdb/Makefile.am @@ -12,15 +12,19 @@ SUBDIRS = \ utility HardCopy \ dti_cc StyleSheet -noinst_LIBRARIES = libmmdb.a +noinst_LTLIBRARIES = libMMDB.la -libmmdb_a_SOURCES = +libMMDB_la_SOURCES = +# fake things so libtool creates this as a C++ library +nodist_EXTRA_libMMDB_la_SOURCES = dummy.cxx -libmmdb_a_LIBADD = api/libapi.a btree/libbtree.a \ - btree_berkeley/libbtree_berkeley.a \ - compression/libcompression.a \ - diskhash/libdiskhash.a dstr/libdstr.a \ - dti_excs/libdti_excs.a dynhash/libdynhash.a \ - hmphf/libhmphf.a index/libindex.a mgrs/libmgrs.a \ - misc/libmisc.a object/libobject.a oliasdb/liboliasdb.a \ - schema/libschema.a storage/libstorage.a utility/libutility.a +libMMDB_la_LIBADD = api/libapi.la btree/libbtree.la \ + btree_berkeley/libbtree_berkeley.la \ + compression/libcompression.la \ + diskhash/libdiskhash.la dstr/libdstr.la \ + dti_excs/libdti_excs.la dynhash/libdynhash.la \ + hmphf/libhmphf.la index/libindex.la \ + mgrs/libmgrs.la misc/libmisc.la \ + object/libobject.la oliasdb/liboliasdb.la \ + schema/libschema.la storage/libstorage.la \ + utility/libutility.la diff --git a/cde/programs/dtinfo/mmdb/StyleSheet/Makefile.am b/cde/programs/dtinfo/mmdb/StyleSheet/Makefile.am index f3433c9f5..afc7c293c 100644 --- a/cde/programs/dtinfo/mmdb/StyleSheet/Makefile.am +++ b/cde/programs/dtinfo/mmdb/StyleSheet/Makefile.am @@ -1,42 +1,36 @@ MAINTAINERCLEANFILES = Makefile.in -noinst_LIBRARIES = libStyleSheet.a +include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk -AUTOMAKE_OPTIONS = no-dependencies +BASE = ../../DtMmdb/StyleSheet +BUILT_SOURCES = Attribute.C AttributeList.C BitVector.C DocParser.C \ + Element.C Expression.C Feature.C FeatureDefDictionary.C \ + FeatureSet.C FeatureValue.C PathQualifier.C PathTable.C \ + Resolver.C ResolverStack.C SSPath.C StyleSheet.C \ + StyleSheetExceptions.C SymTab.C VariableTable.C defParser.C \ + defToken.C style.C tokenStyle.C RendererHCV.C -libStyleSheet_a_CXXFLAGS = -DEXPAND_TEMPLATES -DCDE_NEXT -I../../DtMmdb \ - -I../../DtMmdb/StyleSheet -I../../DtMmdb/dti_excs \ - -I../../DtMmdb/dti_cc +SPECFILES = hardcopy.feature.spec online.feature.spec -libStyleSheet_a_SOURCES = ../../DtMmdb/StyleSheet/Attribute.C \ - ../../DtMmdb/StyleSheet/AttributeList.C \ - ../../DtMmdb/StyleSheet/BitVector.C \ - ../../DtMmdb/StyleSheet/DocParser.C \ - ../../DtMmdb/StyleSheet/Element.C \ - ../../DtMmdb/StyleSheet/Expression.C \ - ../../DtMmdb/StyleSheet/Feature.C \ - ../../DtMmdb/StyleSheet/FeatureDefDictionary.C \ - ../../DtMmdb/StyleSheet/FeatureSet.C \ - ../../DtMmdb/StyleSheet/FeatureValue.C \ - ../../DtMmdb/StyleSheet/PathQualifier.C \ - ../../DtMmdb/StyleSheet/PathTable.C \ - ../../DtMmdb/StyleSheet/Resolver.C \ - ../../DtMmdb/StyleSheet/ResolverStack.C \ - ../../DtMmdb/StyleSheet/SSPath.C \ - ../../DtMmdb/StyleSheet/StyleSheet.C \ - ../../DtMmdb/StyleSheet/StyleSheetExceptions.C \ - ../../DtMmdb/StyleSheet/SymTab.C \ - ../../DtMmdb/StyleSheet/VariableTable.C \ - ../../DtMmdb/StyleSheet/defParser.C \ - ../../DtMmdb/StyleSheet/defToken.C \ - ../../DtMmdb/StyleSheet/style.C \ - ../../DtMmdb/StyleSheet/tokenStyle.C \ - ../../DtMmdb/StyleSheet/RendererHCV.C +BUILT_SOURCES += $(SPECFILES) if LINUX -libStyleSheet_a_SOURCES += ../../DtMmdb/StyleSheet/SSTemplates.C +BUILT_SOURCES += SSTemplates.C endif if BSD -libStyleSheet_a_SOURCES += ../../DtMmdb/StyleSheet/SSTemplates.C +BUILT_SOURCES += SSTemplates.C endif + +$(BUILT_SOURCES): + $(LN_S) $(BASE)/$@ $@ + +CLEANFILES = $(BUILT_SOURCES) + +noinst_LTLIBRARIES = libStyleSheet.la + +libStyleSheet_la_CXXFLAGS = $(DTINFO_DEFINES) -I../../DtMmdb \ + -I../../DtMmdb/StyleSheet -I../../DtMmdb/dti_excs \ + -I../../DtMmdb/dti_cc -I$(BASE) + +libStyleSheet_la_SOURCES = $(BUILT_SOURCES) diff --git a/cde/programs/dtinfo/mmdb/api/Makefile.am b/cde/programs/dtinfo/mmdb/api/Makefile.am index a4dc75b14..df1038953 100644 --- a/cde/programs/dtinfo/mmdb/api/Makefile.am +++ b/cde/programs/dtinfo/mmdb/api/Makefile.am @@ -1,14 +1,22 @@ MAINTAINERCLEANFILES = Makefile.in -noinst_LIBRARIES = libapi.a +include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk + +BASE = ../../DtMmdb/api +BUILT_SOURCES = base.C info_base.C info_lib.C smart_ptr.C \ + transaction.C utility.C + +$(BUILT_SOURCES): + $(LN_S) $(BASE)/$@ $@ + +CLEANFILES = $(BUILT_SOURCES) + +noinst_LTLIBRARIES = libapi.la + +libapi_la_CXXFLAGS = $(DTINFO_DEFINES) -I../../DtMmdb -I../../DtMmdb/misc \ + -I../../DtMmdb/dti_excs -I$(BASE) $(DTINFO_DEFINES) + +libapi_la_SOURCES = $(BUILT_SOURCES) -AUTOMAKE_OPTIONS = no-dependencies -libapi_a_CXXFLAGS = -I../../DtMmdb -I../../DtMmdb/misc -I../../DtMmdb/dti_excs -libapi_a_SOURCES = ../../DtMmdb/api/base.C \ - ../../DtMmdb/api/info_base.C \ - ../../DtMmdb/api/info_lib.C \ - ../../DtMmdb/api/smart_ptr.C \ - ../../DtMmdb/api/transaction.C \ - ../../DtMmdb/api/utility.C diff --git a/cde/programs/dtinfo/mmdb/btree/Makefile.am b/cde/programs/dtinfo/mmdb/btree/Makefile.am index c048e719e..790881c9a 100644 --- a/cde/programs/dtinfo/mmdb/btree/Makefile.am +++ b/cde/programs/dtinfo/mmdb/btree/Makefile.am @@ -1,9 +1,17 @@ MAINTAINERCLEANFILES = Makefile.in -noinst_LIBRARIES = libbtree.a +include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk -AUTOMAKE_OPTIONS = no-dependencies +BASE = ../../DtMmdb/btree +BUILT_SOURCES = mmdb_btree.C -libbtree_a_CXXFLAGS = -I../../DtMmdb -I../../DtMmdb/dti_excs +$(BUILT_SOURCES): + $(LN_S) $(BASE)/$@ $@ -libbtree_a_SOURCES = ../../DtMmdb/btree/mmdb_btree.C +CLEANFILES = $(BUILT_SOURCES) + +noinst_LTLIBRARIES = libbtree.la + +libbtree_la_CXXFLAGS = $(DTINFO_DEFINES) -I../../DtMmdb -I../../DtMmdb/dti_excs -I$(BASE) + +libbtree_la_SOURCES = $(BUILT_SOURCES) diff --git a/cde/programs/dtinfo/mmdb/btree_berkeley/Makefile.am b/cde/programs/dtinfo/mmdb/btree_berkeley/Makefile.am index d71d1fd21..51ff9b5d5 100644 --- a/cde/programs/dtinfo/mmdb/btree_berkeley/Makefile.am +++ b/cde/programs/dtinfo/mmdb/btree_berkeley/Makefile.am @@ -1,34 +1,35 @@ MAINTAINERCLEANFILES = Makefile.in -noinst_LIBRARIES = libbtree_berkeley.a +include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk -AUTOMAKE_OPTIONS = no-dependencies +BASE = ../../DtMmdb/btree_berkeley +BUILT_SOURCES = bt_close.c bt_conv.c bt_debug.c bt_delete.c bt_get.c \ + bt_open.c bt_overflow.c bt_page.c \ + bt_put.c bt_search.c bt_seq.c \ + bt_split.c bt_stack.c bt_utils.c \ + \ + mktemp.c realloc.c snprintf.c \ + \ + mpool.c \ + \ + db.c -libbtree_berkeley_a_CFLAGS = -DMEMMOVE -I../../DtMmdb \ - -I../../DtMmdb/btree_berkeley - -libbtree_berkeley_a_SOURCES = ../../DtMmdb/btree_berkeley/bt_close.c \ - ../../DtMmdb/btree_berkeley/bt_conv.c \ - ../../DtMmdb/btree_berkeley/bt_debug.c \ - ../../DtMmdb/btree_berkeley/bt_delete.c \ - ../../DtMmdb/btree_berkeley/bt_get.c \ - ../../DtMmdb/btree_berkeley/bt_open.c \ - ../../DtMmdb/btree_berkeley/bt_overflow.c \ - ../../DtMmdb/btree_berkeley/bt_page.c \ - ../../DtMmdb/btree_berkeley/bt_put.c \ - ../../DtMmdb/btree_berkeley/bt_search.c \ - ../../DtMmdb/btree_berkeley/bt_seq.c \ - ../../DtMmdb/btree_berkeley/bt_split.c \ - ../../DtMmdb/btree_berkeley/bt_stack.c \ - ../../DtMmdb/btree_berkeley/bt_utils.c \ - ../../DtMmdb/btree_berkeley/mktemp.c \ - ../../DtMmdb/btree_berkeley/realloc.c \ - ../../DtMmdb/btree_berkeley/snprintf.c \ - ../../DtMmdb/btree_berkeley/mpool.c \ - ../../DtMmdb/btree_berkeley/db.c - -if AIX -else -libbtree_berkeley_a_SOURCES += ../../DtMmdb/btree_berkeley/memmove.c +if LINUX +BUILT_SOURCES += memmove.c endif +if BSD +BUILT_SOURCES += memmove.c +endif + +$(BUILT_SOURCES): + $(LN_S) $(BASE)/$@ $@ + +CLEANFILES = $(BUILT_SOURCES) + +noinst_LTLIBRARIES = libbtree_berkeley.la + +libbtree_berkeley_la_CFLAGS = $(DTINFO_DEFINES) -DMEMMOVE -I../../DtMmdb \ + -I../../DtMmdb/btree_berkeley -I$(BASE) + +libbtree_berkeley_la_SOURCES = $(BUILT_SOURCES) diff --git a/cde/programs/dtinfo/mmdb/compression/Makefile.am b/cde/programs/dtinfo/mmdb/compression/Makefile.am index 288cd0aa4..5eaf51c52 100644 --- a/cde/programs/dtinfo/mmdb/compression/Makefile.am +++ b/cde/programs/dtinfo/mmdb/compression/Makefile.am @@ -1,16 +1,20 @@ MAINTAINERCLEANFILES = Makefile.in -noinst_LIBRARIES = libcompression.a +include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk -AUTOMAKE_OPTIONS = no-dependencies +BASE = ../../DtMmdb/compression +BUILT_SOURCES = abs_agent.C zip.C huffman.C trie.C code.C lzss.C -libcompression_a_CXXFLAGS = -I../../DtMmdb -I../../DtMmdb/dti_excs +PARSER_FILES = sgml.C ps.C +BUILT_SOURCES += $(PARSER_FILES) -libcompression_a_SOURCES = ../../DtMmdb/compression/abs_agent.C \ - ../../DtMmdb/compression/zip.C \ - ../../DtMmdb/compression/huffman.C \ - ../../DtMmdb/compression/trie.C \ - ../../DtMmdb/compression/code.C \ - ../../DtMmdb/compression/lzss.C \ - ../../DtMmdb/compression/sgml.C \ - ../../DtMmdb/compression/ps.C +$(BUILT_SOURCES): + $(LN_S) $(BASE)/$@ $@ + +CLEANFILES = $(BUILT_SOURCES) + +noinst_LTLIBRARIES = libcompression.la + +libcompression_la_CXXFLAGS = $(DTINFO_DEFINES) -I../../DtMmdb -I../../DtMmdb/dti_excs -I$(BASE) + +libcompression_la_SOURCES = $(BUILT_SOURCES) diff --git a/cde/programs/dtinfo/mmdb/diskhash/Makefile.am b/cde/programs/dtinfo/mmdb/diskhash/Makefile.am index 797cda193..a674ddcd8 100644 --- a/cde/programs/dtinfo/mmdb/diskhash/Makefile.am +++ b/cde/programs/dtinfo/mmdb/diskhash/Makefile.am @@ -1,11 +1,17 @@ MAINTAINERCLEANFILES = Makefile.in -noinst_LIBRARIES = libdiskhash.a +include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk -AUTOMAKE_OPTIONS = no-dependencies +BASE = ../../DtMmdb/diskhash +BUILT_SOURCES = disk_bucket.C bucket_array.C disk_hash.C -libdiskhash_a_CXXFLAGS = -I../../DtMmdb -I../../DtMmdb/dti_excs +$(BUILT_SOURCES): + $(LN_S) $(BASE)/$@ $@ -libdiskhash_a_SOURCES = ../../DtMmdb/diskhash/disk_bucket.C \ - ../../DtMmdb/diskhash/bucket_array.C \ - ../../DtMmdb/diskhash/disk_hash.C +CLEANFILES = $(BUILT_SOURCES) + +noinst_LTLIBRARIES = libdiskhash.la + +libdiskhash_la_CXXFLAGS = $(DTINFO_DEFINES) -I../../DtMmdb -I../../DtMmdb/dti_excs -I$(BASE) + +libdiskhash_la_SOURCES = $(BUILT_SOURCES) diff --git a/cde/programs/dtinfo/mmdb/dstr/Makefile.am b/cde/programs/dtinfo/mmdb/dstr/Makefile.am index 758865f92..096f569c7 100644 --- a/cde/programs/dtinfo/mmdb/dstr/Makefile.am +++ b/cde/programs/dtinfo/mmdb/dstr/Makefile.am @@ -1,21 +1,19 @@ MAINTAINERCLEANFILES = Makefile.in -noinst_LIBRARIES = libdstr.a +include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk -AUTOMAKE_OPTIONS = no-dependencies +BASE = ../../DtMmdb/dstr +BUILT_SOURCES = set.C bset.C slist.C dlist_cell.C dlist.C heap.C \ + void_ptr_array.C void_ptr_stack.C memory_pool.C dstr_test.C \ + index_agent.C token_stack.C slist_char_ptr_cell.C -libdstr_a_CXXFLAGS = -I../../DtMmdb -I../../DtMmdb/dti_excs +$(BUILT_SOURCES): + $(LN_S) $(BASE)/$@ $@ -libdstr_a_SOURCES = ../../DtMmdb/dstr/set.C \ - ../../DtMmdb/dstr/bset.C \ - ../../DtMmdb/dstr/slist.C \ - ../../DtMmdb/dstr/dlist_cell.C \ - ../../DtMmdb/dstr/dlist.C \ - ../../DtMmdb/dstr/heap.C \ - ../../DtMmdb/dstr/void_ptr_array.C \ - ../../DtMmdb/dstr/void_ptr_stack.C \ - ../../DtMmdb/dstr/memory_pool.C \ - ../../DtMmdb/dstr/dstr_test.C \ - ../../DtMmdb/dstr/index_agent.C \ - ../../DtMmdb/dstr/token_stack.C \ - ../../DtMmdb/dstr/slist_char_ptr_cell.C +CLEANFILES = $(BUILT_SOURCES) + +noinst_LTLIBRARIES = libdstr.la + +libdstr_la_CXXFLAGS = $(DTINFO_DEFINES) -I../../DtMmdb -I../../DtMmdb/dti_excs -I$(BASE) + +libdstr_la_SOURCES = $(BUILT_SOURCES) diff --git a/cde/programs/dtinfo/mmdb/dti_cc/Makefile.am b/cde/programs/dtinfo/mmdb/dti_cc/Makefile.am index 8178ec2a2..1066c994d 100644 --- a/cde/programs/dtinfo/mmdb/dti_cc/Makefile.am +++ b/cde/programs/dtinfo/mmdb/dti_cc/Makefile.am @@ -1,15 +1,20 @@ MAINTAINERCLEANFILES = Makefile.in -noinst_LIBRARIES = libdti_cc.a +include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk -AUTOMAKE_OPTIONS = no-dependencies +BASE = ../../DtMmdb/dti_cc +BUILT_SOURCES = CC_Listbase.C cc_exceptions.C CC_String.C \ + CC_Tokenizer.C CC_Stack.C CC_Slist.C -libdti_cc_a_CXXFLAGS = -DEXPAND_TEMPLATES -I../../DtMmdb -I../../DtMmdb/dti_cc \ - -I../../DtMmdb/dti_excs +$(BUILT_SOURCES): + $(LN_S) $(BASE)/$@ $@ -libdti_cc_a_SOURCES = ../../DtMmdb/dti_cc/CC_Listbase.C \ - ../../DtMmdb/dti_cc/cc_exceptions.C \ - ../../DtMmdb/dti_cc/CC_String.C \ - ../../DtMmdb/dti_cc/CC_Tokenizer.C \ - ../../DtMmdb/dti_cc/CC_Stack.C \ - ../../DtMmdb/dti_cc/CC_Slist.C +CLEANFILES = $(BUILT_SOURCES) + + +noinst_LTLIBRARIES = libdti_cc.la + +libdti_cc_la_CXXFLAGS = $(DTINFO_DEFINES) -I../../DtMmdb \ + -I../../DtMmdb/dti_cc -I../../DtMmdb/dti_excs -I$(BASE) + +libdti_cc_la_SOURCES = $(BUILT_SOURCES) diff --git a/cde/programs/dtinfo/mmdb/dti_excs/Makefile.am b/cde/programs/dtinfo/mmdb/dti_excs/Makefile.am index f9f660b14..8bcceba76 100644 --- a/cde/programs/dtinfo/mmdb/dti_excs/Makefile.am +++ b/cde/programs/dtinfo/mmdb/dti_excs/Makefile.am @@ -1,26 +1,19 @@ MAINTAINERCLEANFILES = Makefile.in -noinst_LIBRARIES = libdti_excs.a +include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk -AUTOMAKE_OPTIONS = no-dependencies +BASE = ../../DtMmdb/dti_excs +BUILT_SOURCES = Jump_Environment.C Exceptions.C Exception.C \ + Destructable.C terminate.C -libdti_excs_a_CXXFLAGS = -DCC_VERSION=30 -DCHECK_INITIALIZED \ - -I../../DtMmdb/dti_excs +$(BUILT_SOURCES): + $(LN_S) $(BASE)/$@ $@ -if SOLARIS -libdti_excs_a_CXXFLAGS += -DHAS_TERMINATE -endif +CLEANFILES = $(BUILT_SOURCES) -if LINUX -libdti_excs_a_CXXFLAGS += -DNATIVE_EXCEPTIONS -endif +noinst_LTLIBRARIES = libdti_excs.la -if BSD -libdti_excs_a_CXXFLAGS += -DNATIVE_EXCEPTIONS -endif +libdti_excs_la_CXXFLAGS = $(DTINFO_DEFINES) -DCC_VERSION=30 -DCHECK_INITIALIZED \ + -I../../DtMmdb/dti_excs -I$(BASE) -libdti_excs_a_SOURCES = ../../DtMmdb/dti_excs/Jump_Environment.C \ - ../../DtMmdb/dti_excs/Exceptions.C \ - ../../DtMmdb/dti_excs/Exception.C \ - ../../DtMmdb/dti_excs/Destructable.C \ - ../../DtMmdb/dti_excs/terminate.C +libdti_excs_la_SOURCES = $(BUILT_SOURCES) diff --git a/cde/programs/dtinfo/mmdb/dynhash/Makefile.am b/cde/programs/dtinfo/mmdb/dynhash/Makefile.am index d55495c8c..29aec7b32 100644 --- a/cde/programs/dtinfo/mmdb/dynhash/Makefile.am +++ b/cde/programs/dtinfo/mmdb/dynhash/Makefile.am @@ -1,11 +1,17 @@ MAINTAINERCLEANFILES = Makefile.in -noinst_LIBRARIES = libdynhash.a +include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk -AUTOMAKE_OPTIONS = no-dependencies +BASE = ../../DtMmdb/dynhash +BUILT_SOURCES = data_t.C imp_bucket.C imp_die.C -libdynhash_a_CXXFLAGS = -I../../DtMmdb -I../../DtMmdb/dti_excs +$(BUILT_SOURCES): + $(LN_S) $(BASE)/$@ $@ -libdynhash_a_SOURCES = ../../DtMmdb/dynhash/data_t.C \ - ../../DtMmdb/dynhash/imp_bucket.C \ - ../../DtMmdb/dynhash/imp_die.C +CLEANFILES = $(BUILT_SOURCES) + +noinst_LTLIBRARIES = libdynhash.la + +libdynhash_la_CXXFLAGS = $(DTINFO_DEFINES) -I../../DtMmdb -I../../DtMmdb/dti_excs -I$(BASE) + +libdynhash_la_SOURCES = $(BUILT_SOURCES) diff --git a/cde/programs/dtinfo/mmdb/hmphf/Makefile.am b/cde/programs/dtinfo/mmdb/hmphf/Makefile.am index cd4faecd0..167e894d5 100644 --- a/cde/programs/dtinfo/mmdb/hmphf/Makefile.am +++ b/cde/programs/dtinfo/mmdb/hmphf/Makefile.am @@ -1,14 +1,20 @@ MAINTAINERCLEANFILES = Makefile.in -noinst_LIBRARIES = libhmphf.a +include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk -AUTOMAKE_OPTIONS = no-dependencies +BASE = ../../DtMmdb/hmphf +BUILT_SOURCES = buckets.C mphf_funcs.C mphf_hash_table.C params.C \ + pattern.C sorter.C -libhmphf_a_CXXFLAGS = -DPORTABLE_DB -I../../DtMmdb -I../../DtMmdb/dti_excs +$(BUILT_SOURCES): + $(LN_S) $(BASE)/$@ $@ + +CLEANFILES = $(BUILT_SOURCES) + +noinst_LTLIBRARIES = libhmphf.la + +libhmphf_la_CXXFLAGS = $(DTINFO_DEFINES) -DPORTABLE_DB -I../../DtMmdb \ +-I../../DtMmdb/dti_excs -I$(BASE) + +libhmphf_la_SOURCES = $(BUILT_SOURCES) -libhmphf_a_SOURCES = ../../DtMmdb/hmphf/buckets.C \ - ../../DtMmdb/hmphf/mphf_funcs.C \ - ../../DtMmdb/hmphf/mphf_hash_table.C \ - ../../DtMmdb/hmphf/params.C \ - ../../DtMmdb/hmphf/pattern.C \ - ../../DtMmdb/hmphf/sorter.C diff --git a/cde/programs/dtinfo/mmdb/index/Makefile.am b/cde/programs/dtinfo/mmdb/index/Makefile.am index 47c51fa4e..71eaf20d8 100644 --- a/cde/programs/dtinfo/mmdb/index/Makefile.am +++ b/cde/programs/dtinfo/mmdb/index/Makefile.am @@ -1,17 +1,20 @@ MAINTAINERCLEANFILES = Makefile.in -noinst_LIBRARIES = libindex.a +include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk -AUTOMAKE_OPTIONS = no-dependencies +BASE = ../../DtMmdb/index +BUILT_SOURCES = btree_index.C dyn_disk_index.C dyn_index.C \ + dyn_memory_index.C fast_mphf.C hash.C index.C \ + inv_lists.C mphf_index.C -libindex_a_CXXFLAGS = -DPORTABLE_DB -I../../DtMmdb -I../../DtMmdb/dti_excs +$(BUILT_SOURCES): + $(LN_S) $(BASE)/$@ $@ -libindex_a_SOURCES = ../../DtMmdb/index/btree_index.C \ - ../../DtMmdb/index/dyn_disk_index.C \ - ../../DtMmdb/index/dyn_index.C \ - ../../DtMmdb/index/dyn_memory_index.C \ - ../../DtMmdb/index/fast_mphf.C \ - ../../DtMmdb/index/hash.C \ - ../../DtMmdb/index/index.C \ - ../../DtMmdb/index/inv_lists.C \ - ../../DtMmdb/index/mphf_index.C +CLEANFILES = $(BUILT_SOURCES) + +noinst_LTLIBRARIES = libindex.la + +libindex_la_CXXFLAGS = $(DTINFO_DEFINES) -DPORTABLE_DB -I../../DtMmdb -I../../DtMmdb/dti_excs \ + -I$(BASE) + +libindex_la_SOURCES = $(BUILT_SOURCES) diff --git a/cde/programs/dtinfo/mmdb/mgrs/Makefile.am b/cde/programs/dtinfo/mmdb/mgrs/Makefile.am index 6360913f6..167699b34 100644 --- a/cde/programs/dtinfo/mmdb/mgrs/Makefile.am +++ b/cde/programs/dtinfo/mmdb/mgrs/Makefile.am @@ -1,13 +1,18 @@ MAINTAINERCLEANFILES = Makefile.in -noinst_LIBRARIES = libmgrs.a +include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk -AUTOMAKE_OPTIONS = no-dependencies +BASE = ../../DtMmdb/mgrs +BUILT_SOURCES = managers.C misc.C query_mgr.C template_mgr.C -libmgrs_a_CXXFLAGS = -DCOMPACTED_DISK_REP -DPORTABLE_DB -I../../DtMmdb \ - -I../../DtMmdb/dti_excs +$(BUILT_SOURCES): + $(LN_S) $(BASE)/$@ $@ -libmgrs_a_SOURCES = ../../DtMmdb/mgrs/managers.C \ - ../../DtMmdb/mgrs/misc.C \ - ../../DtMmdb/mgrs/query_mgr.C \ - ../../DtMmdb/mgrs/template_mgr.C +CLEANFILES = $(BUILT_SOURCES) + +noinst_LTLIBRARIES = libmgrs.la + +libmgrs_la_CXXFLAGS = $(DTINFO_DEFINES) -DCOMPACTED_DISK_REP -DPORTABLE_DB -I../../DtMmdb \ + -I../../DtMmdb/dti_excs -I$(BASE) + +libmgrs_la_SOURCES = $(BUILT_SOURCES) diff --git a/cde/programs/dtinfo/mmdb/misc/Makefile.am b/cde/programs/dtinfo/mmdb/misc/Makefile.am index b2f6c72cb..65507dfda 100644 --- a/cde/programs/dtinfo/mmdb/misc/Makefile.am +++ b/cde/programs/dtinfo/mmdb/misc/Makefile.am @@ -1,9 +1,17 @@ MAINTAINERCLEANFILES= Makefile.in -noinst_LIBRARIES = libmisc.a +include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk -AUTOMAKE_OPTIONS = no-dependencies +BASE = ../../DtMmdb/misc +BUILT_SOURCES = unique_id.c -libmisc_a_CFLAGS = -DPORTABLE_DB +$(BUILT_SOURCES): + $(LN_S) $(BASE)/$@ $@ -libmisc_a_SOURCES = ../../DtMmdb/misc/unique_id.c +CLEANFILES = $(BUILT_SOURCES) + +noinst_LTLIBRARIES = libmisc.la + +libmisc_la_CFLAGS = $(DTINFO_DEFINES) -DPORTABLE_DB -I$(BASE) + +libmisc_la_SOURCES = $(BUILT_SOURCES) diff --git a/cde/programs/dtinfo/mmdb/object/Makefile.am b/cde/programs/dtinfo/mmdb/object/Makefile.am index c617baab3..478d137df 100644 --- a/cde/programs/dtinfo/mmdb/object/Makefile.am +++ b/cde/programs/dtinfo/mmdb/object/Makefile.am @@ -1,25 +1,22 @@ MAINTAINERCLEANFILES = Makefile.in -noinst_LIBRARIES = libobject.a +include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk -AUTOMAKE_OPTIONS = no-dependencies +BASE = ../../DtMmdb/object +BUILT_SOURCES = composite.C compressed_pstring.C cset.C dl_list.C \ + dl_list_cell.C handler.C integer.C \ + long_pstring.C oid.C oid_list.C oid_t.C \ + primitive.C pstring.C random_gen.C root.C \ + short_list.C tuple.C -libobject_a_CXXFLAGS = -DPORTABLE_DB -I../../DtMmdb -I../../DtMmdb/dti_excs +$(BUILT_SOURCES): + $(LN_S) $(BASE)/$@ $@ -libobject_a_SOURCES = ../../DtMmdb/object/composite.C \ - ../../DtMmdb/object/compressed_pstring.C \ - ../../DtMmdb/object/cset.C \ - ../../DtMmdb/object/dl_list.C \ - ../../DtMmdb/object/dl_list_cell.C \ - ../../DtMmdb/object/handler.C \ - ../../DtMmdb/object/integer.C \ - ../../DtMmdb/object/long_pstring.C \ - ../../DtMmdb/object/oid.C \ - ../../DtMmdb/object/oid_list.C \ - ../../DtMmdb/object/oid_t.C \ - ../../DtMmdb/object/primitive.C \ - ../../DtMmdb/object/pstring.C \ - ../../DtMmdb/object/random_gen.C \ - ../../DtMmdb/object/root.C \ - ../../DtMmdb/object/short_list.C \ - ../../DtMmdb/object/tuple.C +CLEANFILES = $(BUILT_SOURCES) + +noinst_LTLIBRARIES = libobject.la + +libobject_la_CXXFLAGS = $(DTINFO_DEFINES) -DPORTABLE_DB -I../../DtMmdb -I../../DtMmdb/dti_excs \ + -I$(BASE) + +libobject_la_SOURCES = $(BUILT_SOURCES) diff --git a/cde/programs/dtinfo/mmdb/oliasdb/Makefile.am b/cde/programs/dtinfo/mmdb/oliasdb/Makefile.am index d2998b72f..aa38c7566 100644 --- a/cde/programs/dtinfo/mmdb/oliasdb/Makefile.am +++ b/cde/programs/dtinfo/mmdb/oliasdb/Makefile.am @@ -1,33 +1,26 @@ MAINTAINERCLEANFILES = Makefile.in -noinst_LIBRARIES = liboliasdb.a +include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk -AUTOMAKE_OPTIONS = no-dependencies +BASE = ../../DtMmdb/oliasdb +BUILT_SOURCES = asciiIn_filters.C collectionIterator.C dlp_hd.C \ + dlp_test.C doc_hd.C doc_test.C graphic_hd.C \ + graphic_test.C loc_test.C locator_hd.C mark.C \ + mark_base.C mark_test.C mmdb.C node_hd.C \ + node_test.C olias_funcs.C olias_test.C \ + stylesheet_hd.C stylesheet_test.C toc_hd.C \ + toc_test.C user_base.C -liboliasdb_a_CXXFLAGS = -DNO_DB_LOCK -DCDE_NEXT -I../../DtMmdb \ +$(BUILT_SOURCES): + $(LN_S) $(BASE)/$@ $@ + +CLEANFILES = $(BUILT_SOURCES) + +noinst_LTLIBRARIES = liboliasdb.la + +liboliasdb_la_CXXFLAGS = $(DTINFO_DEFINES) -DNO_DB_LOCK -DCDE_NEXT -I../../DtMmdb \ -I../../DtMmdb/misc -I../../DtMmdb/dti_excs \ - -I../../DtMmdb/dti_cc -I../.. -I../../DtMmdb/oliasdb + -I../../DtMmdb/dti_cc -I../.. -I../../DtMmdb/oliasdb \ + -I$(BASE) -liboliasdb_a_SOURCES = ../../DtMmdb/oliasdb/asciiIn_filters.C \ - ../../DtMmdb/oliasdb/collectionIterator.C \ - ../../DtMmdb/oliasdb/dlp_hd.C \ - ../../DtMmdb/oliasdb/dlp_test.C \ - ../../DtMmdb/oliasdb/doc_hd.C \ - ../../DtMmdb/oliasdb/doc_test.C \ - ../../DtMmdb/oliasdb/graphic_hd.C \ - ../../DtMmdb/oliasdb/graphic_test.C \ - ../../DtMmdb/oliasdb/loc_test.C \ - ../../DtMmdb/oliasdb/locator_hd.C \ - ../../DtMmdb/oliasdb/mark.C \ - ../../DtMmdb/oliasdb/mark_base.C \ - ../../DtMmdb/oliasdb/mark_test.C \ - ../../DtMmdb/oliasdb/mmdb.C \ - ../../DtMmdb/oliasdb/node_hd.C \ - ../../DtMmdb/oliasdb/node_test.C \ - ../../DtMmdb/oliasdb/olias_funcs.C \ - ../../DtMmdb/oliasdb/olias_test.C \ - ../../DtMmdb/oliasdb/stylesheet_hd.C \ - ../../DtMmdb/oliasdb/stylesheet_test.C \ - ../../DtMmdb/oliasdb/toc_hd.C \ - ../../DtMmdb/oliasdb/toc_test.C \ - ../../DtMmdb/oliasdb/user_base.C +liboliasdb_la_SOURCES = $(BUILT_SOURCES) diff --git a/cde/programs/dtinfo/mmdb/schema/Makefile.am b/cde/programs/dtinfo/mmdb/schema/Makefile.am index 767243410..1ee649c19 100644 --- a/cde/programs/dtinfo/mmdb/schema/Makefile.am +++ b/cde/programs/dtinfo/mmdb/schema/Makefile.am @@ -1,19 +1,20 @@ MAINTAINERCLEANFILES = Makefile.in -noinst_LIBRARIES = libschema.a +include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk -AUTOMAKE_OPTIONS = no-dependencies +BASE = ../../DtMmdb/schema +BUILT_SOURCES = desc.C store_desc.C object_dict.C \ + stored_object_desc.C index_desc.C inv_desc.C \ + agent_desc.C container_desc.C sheet.C token.C -libschema_a_CXXFLAGS = -DPORTABLE_DB -I../../DtMmdb -I../../DtMmdb/dti_excs \ - -I../../DtMmdb/misc +$(BUILT_SOURCES): + $(LN_S) $(BASE)/$@ $@ -libschema_a_SOURCES = ../../DtMmdb/schema/desc.C \ - ../../DtMmdb/schema/store_desc.C \ - ../../DtMmdb/schema/object_dict.C \ - ../../DtMmdb/schema/stored_object_desc.C \ - ../../DtMmdb/schema/index_desc.C \ - ../../DtMmdb/schema/inv_desc.C \ - ../../DtMmdb/schema/agent_desc.C \ - ../../DtMmdb/schema/container_desc.C \ - ../../DtMmdb/schema/sheet.C \ - ../../DtMmdb/schema/token.C +CLEANFILES = $(BUILT_SOURCES) + +noinst_LTLIBRARIES = libschema.la + +libschema_la_CXXFLAGS = $(DTINFO_DEFINES) -DPORTABLE_DB -I../../DtMmdb -I../../DtMmdb/dti_excs \ + -I../../DtMmdb/misc -I$(BASE) + +libschema_la_SOURCES = $(BUILT_SOURCES) diff --git a/cde/programs/dtinfo/mmdb/storage/Makefile.am b/cde/programs/dtinfo/mmdb/storage/Makefile.am index efad10c14..75698bf66 100644 --- a/cde/programs/dtinfo/mmdb/storage/Makefile.am +++ b/cde/programs/dtinfo/mmdb/storage/Makefile.am @@ -1,22 +1,21 @@ MAINTAINERCLEANFILES = Makefile.in -noinst_LIBRARIES = libstorage.a +include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk -AUTOMAKE_OPTIONS = no-dependencies +BASE = ../../DtMmdb/storage +BUILT_SOURCES = abs_storage.C chunks_index.C heap_comp_funcs.C lru.C \ + page.C page_cache.C page_rep.C page_storage.C \ + rep_cell.C rep_policy.C store_test.C \ + unixf_storage.C version.C vm_storage.C -libstorage_a_CXXFLAGS = -DPORTABLE_DB -I../../DtMmdb -I../../DtMmdb/dti_excs +$(BUILT_SOURCES): + $(LN_S) $(BASE)/$@ $@ -libstorage_a_SOURCES = ../../DtMmdb/storage/abs_storage.C \ - ../../DtMmdb/storage/chunks_index.C \ - ../../DtMmdb/storage/heap_comp_funcs.C \ - ../../DtMmdb/storage/lru.C \ - ../../DtMmdb/storage/page.C \ - ../../DtMmdb/storage/page_cache.C \ - ../../DtMmdb/storage/page_rep.C \ - ../../DtMmdb/storage/page_storage.C \ - ../../DtMmdb/storage/rep_cell.C \ - ../../DtMmdb/storage/rep_policy.C \ - ../../DtMmdb/storage/store_test.C \ - ../../DtMmdb/storage/unixf_storage.C \ - ../../DtMmdb/storage/version.C \ - ../../DtMmdb/storage/vm_storage.C +CLEANFILES = $(BUILT_SOURCES) + +noinst_LTLIBRARIES = libstorage.la + +libstorage_la_CXXFLAGS = $(DTINFO_DEFINES) -DPORTABLE_DB \ +-I../../DtMmdb -I../../DtMmdb/dti_excs -I$(BASE) + +libstorage_la_SOURCES = $(BUILT_SOURCES) diff --git a/cde/programs/dtinfo/mmdb/utility/Makefile.am b/cde/programs/dtinfo/mmdb/utility/Makefile.am index 2adbbf545..88eeb6ac0 100644 --- a/cde/programs/dtinfo/mmdb/utility/Makefile.am +++ b/cde/programs/dtinfo/mmdb/utility/Makefile.am @@ -1,31 +1,20 @@ MAINTAINERCLEANFILES = Makefile.in -noinst_LIBRARIES = libutility.a +include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk -AUTOMAKE_OPTIONS = no-dependencies +BASE = ../../DtMmdb/utility +BUILT_SOURCES = atoi_fast.C atoi_larson.C atoi_pearson.C \ + atomic_lock.C buffer.C filter.C funcs.C mmdb_exception.C \ + ostring.C pm_random.C randomize.C rw_lock.C xtime.C -libutility_a_CXXFLAGS = -DPORTABLE_DB -I../../DtMmdb -I../../DtMmdb/dti_excs \ - -I../../DtMmdb/misc +$(BUILT_SOURCES): + $(LN_S) $(BASE)/$@ $@ -libutility_a_SOURCES = ../../DtMmdb/utility/funcs.C \ - ../../DtMmdb/utility/ostring.C \ - ../../DtMmdb/utility/pm_random.C \ - ../../DtMmdb/utility/atoi_pearson.C \ - ../../DtMmdb/utility/xtime.C \ - ../../DtMmdb/utility/buffer.C \ - ../../DtMmdb/utility/atoi_larson.C \ - ../../DtMmdb/utility/atomic_lock.C \ - ../../DtMmdb/utility/rw_lock.C \ - ../../DtMmdb/utility/atoi_fast.C \ - ../../DtMmdb/utility/filter.C \ - ../../DtMmdb/utility/mmdb_exception.C \ - ../../DtMmdb/utility/randomize.C \ - ../../DtMmdb/utility/streambuf.C \ - ../../DtMmdb/utility/charbuf.C \ - ../../DtMmdb/utility/filebuf.C \ - ../../DtMmdb/utility/string.C \ - ../../DtMmdb/utility/stringstream.C \ - ../../DtMmdb/utility/iostream.C \ - ../../DtMmdb/utility/fstream.C \ - ../../DtMmdb/utility/stream.C \ - ../../DtMmdb/utility/ios.C +CLEANFILES = $(BUILT_SOURCES) + +noinst_LTLIBRARIES = libutility.la + +libutility_la_CXXFLAGS = $(DTINFO_DEFINES) -DPORTABLE_DB \ + -I../../DtMmdb -I../../DtMmdb/dti_excs -I../../DtMmdb/misc -I$(BASE) + +libutility_la_SOURCES = $(BUILT_SOURCES) From 10c77328fa04260febeabb43fa6b3391db564674 Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Sat, 4 Dec 2021 19:03:16 -0700 Subject: [PATCH 04/25] dtinfo/DtMmdb: Fix up another build issue --- cde/programs/dtinfo/DtMmdb/Makefile.am | 7 ++++--- cde/programs/dtinfo/DtMmdb/api/info_lib.C | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cde/programs/dtinfo/DtMmdb/Makefile.am b/cde/programs/dtinfo/DtMmdb/Makefile.am index 67926f4fd..b1f37673c 100644 --- a/cde/programs/dtinfo/DtMmdb/Makefile.am +++ b/cde/programs/dtinfo/DtMmdb/Makefile.am @@ -14,11 +14,12 @@ SUBDIRS = \ lib_LTLIBRARIES = libDtMmdb.la libDtMmdb_la_SOURCES = - -libDtMmdb_la_LIBADD = api/libapi.la btree/libbtree.la +# fake things so libtool creates this as a C++ library +nodist_EXTRA_libDtMmdb_la_SOURCES = dummy.cxx +libDtMmdb_la_LIBADD = api/libapi.la btree/libbtree.la \ btree_berkeley/libbtree_berkeley.la \ compression/libcompression.la diskhash/libdiskhash.la \ - dstr/libdstr.la libdti_excs/libdti_excs.la \ + dstr/libdstr.la dti_excs/libdti_excs.la \ dynhash/libdynhash.la hmphf/libhmphf.la \ index/libindex.la mgrs/libmgrs.la misc/libmisc.la \ object/libobject.la oliasdb/liboliasdb.la \ diff --git a/cde/programs/dtinfo/DtMmdb/api/info_lib.C b/cde/programs/dtinfo/DtMmdb/api/info_lib.C index 8d7ee4b50..dff7e706c 100644 --- a/cde/programs/dtinfo/DtMmdb/api/info_lib.C +++ b/cde/programs/dtinfo/DtMmdb/api/info_lib.C @@ -55,7 +55,7 @@ #include "oliasdb/graphic_hd.h" #ifdef DtinfoClient -#include +#include
#endif /* From 12c82495fd8473839b94e884f2837007e99ff09d Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Sat, 4 Dec 2021 19:04:02 -0700 Subject: [PATCH 05/25] configure: fix a typo in LIBSEARCH and LIBMMDB --- cde/configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cde/configure.ac b/cde/configure.ac index b6ae31608..b6ef4bbc8 100644 --- a/cde/configure.ac +++ b/cde/configure.ac @@ -183,10 +183,10 @@ AC_SUBST(LIBXIN, '$(top_builddir)/lib/DtXinerama/libDtXinerama.la') AC_SUBST(LIBWIDGET, '$(top_builddir)/lib/DtWidget/libDtWidget.la') AC_SUBST(LIBTERM, '$(top_builddir)/lib/DtTerm/libDtTerm.la') AC_SUBST(LIBSVC, '$(top_builddir)/lib/DtSvc/libDtSvc.la') -AC_SUBST(LIBSEARCH, '$(top_builddir)/lib/DtSearch/lbiDtSearch.la') +AC_SUBST(LIBSEARCH, '$(top_builddir)/lib/DtSearch/libDtSearch.la') AC_SUBST(LIBPRINT, '$(top_builddir)/lib/DtPrint/libDtPrint.la') AC_SUBST(LIBMRM, '$(top_builddir)/lib/DtMrm/libDtMrm.la') -AC_SUBST(LIBMMDB, '$(top_builddir)/lib/DtMmdb/libDtMmdb.la') +AC_SUBST(LIBMMDB, '$(top_builddir)/programs/dtinfo/libDtMmdb.la') AC_SUBST(LIBHELP, '$(top_builddir)/lib/DtHelp/libDtHelp.la') AC_SUBST(LIBCSA, '$(top_builddir)/lib/csa/libcsa.la') From 7540b13e2b1defe389f902af9004026ead70494e Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Sat, 4 Dec 2021 20:12:11 -0700 Subject: [PATCH 06/25] dtinfo/dtinfo/src: more changes to the way the libs are made --- .../dtinfo/dtinfo/src/Agents/Makefile.am | 9 ++++++--- .../dtinfo/dtinfo/src/Basic/Makefile.am | 8 +++++--- .../dtinfo/dtinfo/src/Graphics/Makefile.am | 8 +++++--- cde/programs/dtinfo/dtinfo/src/Makefile.am | 19 ++++++++++++++++--- .../dtinfo/dtinfo/src/Managers/Makefile.am | 9 ++++++--- .../dtinfo/dtinfo/src/Marks/Makefile.am | 9 ++++++--- .../dtinfo/dtinfo/src/OliasSearch/Makefile.am | 8 +++++--- .../dtinfo/src/OnlineRender/Makefile.am | 10 +++++++--- .../dtinfo/dtinfo/src/Other/Makefile.am | 9 ++++++--- .../dtinfo/dtinfo/src/Preferences/Makefile.am | 8 +++++--- .../dtinfo/dtinfo/src/Query/Makefile.am | 9 ++++++--- .../dtinfo/dtinfo/src/Support/Makefile.am | 8 +++++--- .../dtinfo/dtinfo/src/UAS/Base/Makefile.am | 9 ++++++--- .../dtinfo/dtinfo/src/UAS/DtSR/Makefile.am | 9 ++++++--- .../dtinfo/dtinfo/src/UAS/MMDB/Makefile.am | 10 +++++++--- .../dtinfo/dtinfo/src/UAS/Makefile.am | 14 ++++++++------ .../dtinfo/dtinfo/src/Widgets/Makefile.am | 10 +++++++--- .../dtinfo/dtinfo/src/cgm/Makefile.am | 12 ++++++++---- .../dtinfo/dtinfo/src/templates/dtinfo_env.mk | 2 -- 19 files changed, 120 insertions(+), 60 deletions(-) diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Agents/Makefile.am index 481ab3433..57361f311 100644 --- a/cde/programs/dtinfo/dtinfo/src/Agents/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/Agents/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -noinst_LTLIBRARIES = libAgents.la +noinst_LIBRARIES = libAgents.a # get our env include ../templates/dtinfo_env.mk @@ -8,8 +8,11 @@ include ../templates/dtinfo_env.mk # class info include Classlist.mk -libAgents_la_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) -libAgents_la_SOURCES = ../Prelude.h $(Agents_SRCS) +libAgents_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) +libAgents_a_SOURCES = ../Prelude.h $(Agents_SRCS) + +RANLIB = echo +libAgents_a_AR = $(LD) -r -o BUILT_SOURCES = Agents.msg CLEANFILES = $(BUILT_SOURCES) diff --git a/cde/programs/dtinfo/dtinfo/src/Basic/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Basic/Makefile.am index 838e76858..5774b4592 100644 --- a/cde/programs/dtinfo/dtinfo/src/Basic/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/Basic/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -noinst_LTLIBRARIES = libBasic.la +noinst_LIBRARIES = libBasic.a # get our env include ../templates/dtinfo_env.mk @@ -8,7 +8,9 @@ include ../templates/dtinfo_env.mk # class info include Classlist.mk -libBasic_la_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) +libBasic_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) -libBasic_la_SOURCES = ../Prelude.h $(Basic_SRCS) +libBasic_a_SOURCES = ../Prelude.h $(Basic_SRCS) +RANLIB = echo +libBasic_a_AR = $(LD) -r -o diff --git a/cde/programs/dtinfo/dtinfo/src/Graphics/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Graphics/Makefile.am index 958c194b4..ea5125c97 100644 --- a/cde/programs/dtinfo/dtinfo/src/Graphics/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/Graphics/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -noinst_LTLIBRARIES = libGraphics.la +noinst_LIBRARIES = libGraphics.a # get our env include ../templates/dtinfo_env.mk @@ -8,7 +8,9 @@ include ../templates/dtinfo_env.mk # class info include Classlist.mk -libGraphics_la_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) +libGraphics_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) -libGraphics_la_SOURCES = ../Prelude.h $(Graphics_SRCS) +libGraphics_a_SOURCES = ../Prelude.h $(Graphics_SRCS) +RANLIB = echo +libGraphics_a_AR = $(LD) -r -o diff --git a/cde/programs/dtinfo/dtinfo/src/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Makefile.am index b7fb10d27..8cd61415a 100644 --- a/cde/programs/dtinfo/dtinfo/src/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/Makefile.am @@ -53,10 +53,23 @@ dtinfo.msg.updated: CLEANFILES += dtinfo.msg.updated dtinfo.cpp +## dtinfo proper +OLIASNORMALLIBS= Agents/libAgents.a Other/libOther.a \ + Basic/libBasic.a Preferences/libPreferences.a \ + UAS/libUAS.a Query/libQuery.a Graphics/libGraphics.a \ + Managers/libManagers.a Support/libSupport.a \ + Marks/libMarks.a OnlineRender/libOnlineRender.a \ + OliasSearch/libOliasSearch.a Widgets/libWidgets.a \ + cgm/libcgm.a + +#DTSEARCHLIBS = -L$(DTSEARCH_LIBDIR) -lDtSearch + + + #bin_PROGRAMS = dtinfo -#dtinfo_CPPFLAGS = -DEXPAND_TEMPLATES -I.. +#dtinfo_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) -#dtinfo_LDADD = lib +#dtinfo_LDADD = $(OLIASNORMALLIBS) $(LIBSEARCH) $(MMDB_LIBS) $(WWL_LIBS) $(DTCLIENTLIBS) -lXmu $(XTOOLLIB) -#dtinfo_SOURCES = main.C main_c_api.c +# dtinfo_SOURCES = main.C Support/InputNotifier.C diff --git a/cde/programs/dtinfo/dtinfo/src/Managers/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Managers/Makefile.am index 467f1907e..675c4a0d9 100644 --- a/cde/programs/dtinfo/dtinfo/src/Managers/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/Managers/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -noinst_LTLIBRARIES = libManagers.la +noinst_LIBRARIES = libManagers.a # get our env include ../templates/dtinfo_env.mk @@ -8,8 +8,11 @@ include ../templates/dtinfo_env.mk # class info include Classlist.mk -libManagers_la_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) -libManagers_la_SOURCES = ../Prelude.h $(Managers_SRCS) +libManagers_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) +libManagers_a_SOURCES = ../Prelude.h $(Managers_SRCS) + +RANLIB = echo +libManagers_a_AR = $(LD) -r -o BUILT_SOURCES = Managers.msg CLEANFILES = $(BUILT_SOURCES) diff --git a/cde/programs/dtinfo/dtinfo/src/Marks/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Marks/Makefile.am index fa1fa0af1..c2f69a9c8 100644 --- a/cde/programs/dtinfo/dtinfo/src/Marks/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/Marks/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -noinst_LTLIBRARIES = libMarks.la +noinst_LIBRARIES = libMarks.a # get our env include ../templates/dtinfo_env.mk @@ -8,7 +8,10 @@ include ../templates/dtinfo_env.mk # class info include Classlist.mk -libMarks_la_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) +libMarks_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) -libMarks_la_SOURCES = ../Prelude.h $(Marks_SRCS) +libMarks_a_SOURCES = ../Prelude.h $(Marks_SRCS) + +RANLIB = echo +libMarks_a_AR = $(LD) -r -o diff --git a/cde/programs/dtinfo/dtinfo/src/OliasSearch/Makefile.am b/cde/programs/dtinfo/dtinfo/src/OliasSearch/Makefile.am index 5328f1b18..aa018de0b 100644 --- a/cde/programs/dtinfo/dtinfo/src/OliasSearch/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/OliasSearch/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -noinst_LTLIBRARIES = libOliasSearch.la +noinst_LIBRARIES = libOliasSearch.a # get our env include ../templates/dtinfo_env.mk @@ -8,7 +8,9 @@ include ../templates/dtinfo_env.mk # class info include Classlist.mk -libOliasSearch_la_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) +libOliasSearch_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) -libOliasSearch_la_SOURCES = ../Prelude.h $(OliasSearch_SRCS) +libOliasSearch_a_SOURCES = ../Prelude.h $(OliasSearch_SRCS) +RANLIB = echo +libOliasSearch_a_AR = $(LD) -r -o diff --git a/cde/programs/dtinfo/dtinfo/src/OnlineRender/Makefile.am b/cde/programs/dtinfo/dtinfo/src/OnlineRender/Makefile.am index c88c4ae4d..a72c8ac68 100644 --- a/cde/programs/dtinfo/dtinfo/src/OnlineRender/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/OnlineRender/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -noinst_LTLIBRARIES = libOnlineRender.la +noinst_LIBRARIES = libOnlineRender.a # get our env include ../templates/dtinfo_env.mk @@ -8,8 +8,12 @@ include ../templates/dtinfo_env.mk # class info include Classlist.mk -libOnlineRender_la_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) -libOnlineRender_la_SOURCES = ../Prelude.h $(OnlineRender_SRCS) +libOnlineRender_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) +libOnlineRender_a_SOURCES = ../Prelude.h CanvasRenderer.C \ + FeatureSupport.C FontCache.C SegClientData.C + +RANLIB = echo +libOnlineRender_a_AR = $(LD) -r -o BUILT_SOURCES = OnlineRender.msg CLEANFILES = $(BUILT_SOURCES) diff --git a/cde/programs/dtinfo/dtinfo/src/Other/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Other/Makefile.am index 58498c804..32027f440 100644 --- a/cde/programs/dtinfo/dtinfo/src/Other/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/Other/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -noinst_LTLIBRARIES = libOther.la +noinst_LIBRARIES = libOther.a # get our env include ../templates/dtinfo_env.mk @@ -8,8 +8,11 @@ include ../templates/dtinfo_env.mk # class info include Classlist.mk -libOther_la_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) -libOther_la_SOURCES = ../Prelude.h $(Other_SRCS) +libOther_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) +libOther_a_SOURCES = ../Prelude.h $(Other_SRCS) + +RANLIB = echo +libOther_a_AR = $(LD) -r -o BUILT_SOURCES = Other.msg CLEANFILES = $(BUILT_SOURCES) diff --git a/cde/programs/dtinfo/dtinfo/src/Preferences/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Preferences/Makefile.am index 7b3ade344..00e20fff1 100644 --- a/cde/programs/dtinfo/dtinfo/src/Preferences/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/Preferences/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -noinst_LTLIBRARIES = libPreferences.la +noinst_LIBRARIES = libPreferences.a # get our env include ../templates/dtinfo_env.mk @@ -8,7 +8,9 @@ include ../templates/dtinfo_env.mk # class info include Classlist.mk -libPreferences_la_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) +libPreferences_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) -libPreferences_la_SOURCES = ../Prelude.h $(Preferences_SRCS) +libPreferences_a_SOURCES = ../Prelude.h $(Preferences_SRCS) +RANLIB = echo +libPreferences_a_AR = $(LD) -r -o diff --git a/cde/programs/dtinfo/dtinfo/src/Query/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Query/Makefile.am index 1a5c473ef..98ef3aa71 100644 --- a/cde/programs/dtinfo/dtinfo/src/Query/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/Query/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -noinst_LTLIBRARIES = libQuery.la +noinst_LIBRARIES = libQuery.a # get our env include ../templates/dtinfo_env.mk @@ -8,8 +8,11 @@ include ../templates/dtinfo_env.mk # class info include Classlist.mk -libQuery_la_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) -libQuery_la_SOURCES = ../Prelude.h $(Query_SRCS) +libQuery_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) +libQuery_a_SOURCES = ../Prelude.h $(Query_SRCS) + +RANLIB = echo +libQuery_a_AR = $(LD) -r -o BUILT_SOURCES = Query.msg CLEANFILES = $(BUILT_SOURCES) diff --git a/cde/programs/dtinfo/dtinfo/src/Support/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Support/Makefile.am index 8e4a49736..8c49cb001 100644 --- a/cde/programs/dtinfo/dtinfo/src/Support/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/Support/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -noinst_LTLIBRARIES = libSupport.la +noinst_LIBRARIES = libSupport.a # get our env include ../templates/dtinfo_env.mk @@ -8,7 +8,9 @@ include ../templates/dtinfo_env.mk # class info include Classlist.mk -libSupport_la_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) +libSupport_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) -libSupport_la_SOURCES = ../Prelude.h $(Support_SRCS) +libSupport_a_SOURCES = ../Prelude.h $(Support_SRCS) +RANLIB = echo +libSupport_a_AR = $(LD) -r -o diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/Base/Makefile.am b/cde/programs/dtinfo/dtinfo/src/UAS/Base/Makefile.am index b9b7a3248..c72eedd65 100644 --- a/cde/programs/dtinfo/dtinfo/src/UAS/Base/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/UAS/Base/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -noinst_LTLIBRARIES = libBase.la +noinst_LIBRARIES = libBase.a # get our env include ../../templates/dtinfo_env.mk @@ -8,9 +8,12 @@ include ../../templates/dtinfo_env.mk # class info include Classlist.mk -libBase_la_CXXFLAGS = -I.. -I ../.. -I../Support $(DTINFO_DEFINES) \ +libBase_a_CXXFLAGS = -I.. -I ../.. -I../Support $(DTINFO_DEFINES) \ $(DTINFO_INCLUDES) -libBase_la_SOURCES = $(Base_SRCS) +libBase_a_SOURCES = $(Base_SRCS) + +RANLIB = echo +libBase_a_AR = $(LD) -r -o BUILT_SOURCES = Base.msg CLEANFILES = $(BUILT_SOURCES) diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/Makefile.am b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/Makefile.am index 98f5a9971..ef995c5a3 100644 --- a/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -noinst_LTLIBRARIES = libDtSR.la +noinst_LIBRARIES = libDtSR.a # get our env include ../../templates/dtinfo_env.mk @@ -8,9 +8,12 @@ include ../../templates/dtinfo_env.mk # class info include Classlist.mk -libDtSR_la_CXXFLAGS = -I../Base -I./Util_Classes -I../.. \ +libDtSR_a_CXXFLAGS = -I../Base -I./Util_Classes -I../.. \ $(DTINFO_DEFINES) $(DTINFO_INCLUDES) -libDtSR_la_SOURCES = $(DtSR_SRCS) +libDtSR_a_SOURCES = $(DtSR_SRCS) + +RANLIB = echo +libDtSR_a_AR = $(LD) -r -o BUILT_SOURCES = DtSR.msg CLEANFILES = $(BUILT_SOURCES) diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/MMDB/Makefile.am b/cde/programs/dtinfo/dtinfo/src/UAS/MMDB/Makefile.am index 170665df4..eb59d7e98 100644 --- a/cde/programs/dtinfo/dtinfo/src/UAS/MMDB/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/UAS/MMDB/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -noinst_LTLIBRARIES = libMMDB.la +noinst_LIBRARIES = libMMDB.a # get our env include ../../templates/dtinfo_env.mk @@ -8,9 +8,13 @@ include ../../templates/dtinfo_env.mk # class info include Classlist.mk -libMMDB_la_CXXFLAGS = -I../Base -I../.. $(DTINFO_DEFINES) \ +libMMDB_a_CXXFLAGS = -I../Base -I../.. $(DTINFO_DEFINES) \ $(DTINFO_INCLUDES) -libMMDB_la_SOURCES = $(MMDB_SRCS) +libMMDB_a_SOURCES = $(MMDB_SRCS) + +RANLIB = echo +libMMDB_a_AR = $(LD) -r -o + BUILT_SOURCES = MMDB.msg CLEANFILES = $(BUILT_SOURCES) diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/Makefile.am b/cde/programs/dtinfo/dtinfo/src/UAS/Makefile.am index 083273f13..b372b4f49 100644 --- a/cde/programs/dtinfo/dtinfo/src/UAS/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/UAS/Makefile.am @@ -2,7 +2,7 @@ MAINTAINERCLEANFILES = Makefile.in SUBDIRS = Base MMDB DtSR -noinst_LTLIBRARIES = libUAS.la +noinst_LIBRARIES = libUAS.a # get our env include ../templates/dtinfo_env.mk @@ -10,11 +10,13 @@ include ../templates/dtinfo_env.mk # class info include Classlist.mk -libUAS_la_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) -libUAS_la_SOURCES = -# this should make sure this is linked with a C++ compiler -nodist_EXTRA_libUAS_la_SOURCES = dummy.cxx -libUAS_la_LIBADD = Base/libBase.la MMDB/libMMDB.la DtSR/libDtSR.la +libUAS_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) +libUAS_a_SOURCES = + +libUAS_a_LIBADD = Base/libBase.a MMDB/libMMDB.a DtSR/libDtSR.a + +RANLIB = echo +libUAS_a_AR = $(LD) -r -o noinst_DATA = UAS.msg diff --git a/cde/programs/dtinfo/dtinfo/src/Widgets/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Widgets/Makefile.am index 738e254e8..dbe7c6765 100644 --- a/cde/programs/dtinfo/dtinfo/src/Widgets/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/Widgets/Makefile.am @@ -1,11 +1,15 @@ MAINTAINERCLEANFILES = Makefile.in -noinst_LTLIBRARIES = libWidgets.la +noinst_LIBRARIES = libWidgets.a # get our env include ../templates/dtinfo_env.mk -libWidgets_la_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) +libWidgets_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) -libWidgets_la_SOURCES = Pixmap.c Tree.c Panner.c Simple.c Porthole.c \ +libWidgets_a_SOURCES = Pixmap.c Tree.c Panner.c Simple.c Porthole.c \ XawInitFake.c TabButton.c Restraint.c WXmOpButton.C + +RANLIB = echo +libWidgets_a_AR = $(LD) -r -o + diff --git a/cde/programs/dtinfo/dtinfo/src/cgm/Makefile.am b/cde/programs/dtinfo/dtinfo/src/cgm/Makefile.am index fdda10eec..c0d192d39 100644 --- a/cde/programs/dtinfo/dtinfo/src/cgm/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/cgm/Makefile.am @@ -1,18 +1,22 @@ MAINTAINERCLEANFILES = Makefile.in -noinst_LTLIBRARIES = libcgm.la +noinst_LIBRARIES = libcgm.a # get our env include ../templates/dtinfo_env.mk # class info -libcgm_la_CFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) \ +libcgm_a_CFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) \ -I$(top_srcdir)/include/DtI -libcgm_la_SOURCES = cgmcmds.c cgmcommon.c cgmio.c cgmtext.c getcgm.c +libcgm_a_SOURCES = cgmcmds.c cgmcommon.c cgmio.c cgmtext.c getcgm.c +RANLIB = echo +libcgm_a_AR = $(LD) -r -o noinst_PROGRAMS = testcgm testcgm_CPPFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) \ -I$(top_srcdir)/include/DtI testcgm_SOURCES = testcgm.c -testcgm_LDADD = libcgm.la $(DTCLIENTLIBS) $(XTOOLLIB) +testcgm_LDADD = libcgm.a $(DTCLIENTLIBS) $(XTOOLLIB) + + diff --git a/cde/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk b/cde/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk index 874a15ff4..62c59cb54 100644 --- a/cde/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk +++ b/cde/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk @@ -31,9 +31,7 @@ WWL_INCLUDES = -I$(WWL)/include WWL_LIBS=$(STATIC) -L$(WWL)/src -lWWL EXCEPTIONS_INCLUDES = -I$(EXCEPTIONS) MMDB_INCLUDES = -I$(MMDB) -#MMDB_LIBS=$(STATIC) -L$(OLIAS)/mmdb -lMMDB MMDB_LIBS=$(OLIAS)/mmdb/libMMDB.la -#MMDB_LIBS= $(OLIAS)/DtMmdb/libDtMmdb.la UAS_INCLUDES = -I$(UAS)/Base COMMON_CLASS_INCLUDES = -I$(MMDB)/dti_cc -I$(MMDB) COMMON_CLASS_LIBDIR = $(STATIC) -L$(MMDB)/dti_cc From b9dbea9d3a6394c0171165ee7d2744ae800eadff Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Sun, 5 Dec 2021 11:36:35 -0700 Subject: [PATCH 07/25] dtinfo/dtinfo: get it to build After fixing up some problems with the dtinfo/mmdb library, dtinfo now links. --- cde/programs/dtinfo/dtinfo/src/Makefile.am | 15 +++++-------- .../dtinfo/dtinfo/src/templates/dtinfo_env.mk | 2 +- cde/programs/dtinfo/mmdb/Makefile.am | 22 ++++++++++--------- 3 files changed, 19 insertions(+), 20 deletions(-) diff --git a/cde/programs/dtinfo/dtinfo/src/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Makefile.am index 8cd61415a..e34421454 100644 --- a/cde/programs/dtinfo/dtinfo/src/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/Makefile.am @@ -37,7 +37,7 @@ Prelude.h: Dtinfo: Dtinfo.res $(RESFILES) $(CPP_PROGRAM) -traditional -nostdinc -C Dtinfo.res | $(TREERES) > $@ -# dtinfo class dfiles and hfiles building +# dtinfo class dfile and hfile building for the modules include templates/dtinfo-dfiles-hfiles.mk # gather up the messages and generate the file. MSGS comes from the @@ -62,14 +62,11 @@ OLIASNORMALLIBS= Agents/libAgents.a Other/libOther.a \ OliasSearch/libOliasSearch.a Widgets/libWidgets.a \ cgm/libcgm.a -#DTSEARCHLIBS = -L$(DTSEARCH_LIBDIR) -lDtSearch +bin_PROGRAMS = dtinfo +dtinfo_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) +dtinfo_LDADD = $(OLIASNORMALLIBS) $(LIBSEARCH) $(MMDB_LIBS) $(WWL_LIBS) \ + $(DTCLIENTLIBS) -lXmu $(XTOOLLIB) -#bin_PROGRAMS = dtinfo - -#dtinfo_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) - -#dtinfo_LDADD = $(OLIASNORMALLIBS) $(LIBSEARCH) $(MMDB_LIBS) $(WWL_LIBS) $(DTCLIENTLIBS) -lXmu $(XTOOLLIB) - -# dtinfo_SOURCES = main.C Support/InputNotifier.C +dtinfo_SOURCES = main.C Support/InputNotifier.C diff --git a/cde/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk b/cde/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk index 62c59cb54..675fd9ccd 100644 --- a/cde/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk +++ b/cde/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk @@ -40,5 +40,5 @@ TREERES = $(TOOLS)/misc/treeres MSGSETS = $(TOOLS)/misc/msgsets DTINFO_INCLUDES = -I.. $(UAS_INCLUDES) $(EXCEPTIONS_INCLUDES) \ - $(WWL_INCLUDES) $(TREE_INCLUDES) $(STYLE_SHEET_INCLUDES) \ + $(WWL_INCLUDES) $(STYLE_SHEET_INCLUDES) \ $(COMMON_CLASS_INCLUDES) diff --git a/cde/programs/dtinfo/mmdb/Makefile.am b/cde/programs/dtinfo/mmdb/Makefile.am index 5f598ed83..36e27e680 100644 --- a/cde/programs/dtinfo/mmdb/Makefile.am +++ b/cde/programs/dtinfo/mmdb/Makefile.am @@ -18,13 +18,15 @@ libMMDB_la_SOURCES = # fake things so libtool creates this as a C++ library nodist_EXTRA_libMMDB_la_SOURCES = dummy.cxx -libMMDB_la_LIBADD = api/libapi.la btree/libbtree.la \ - btree_berkeley/libbtree_berkeley.la \ - compression/libcompression.la \ - diskhash/libdiskhash.la dstr/libdstr.la \ - dti_excs/libdti_excs.la dynhash/libdynhash.la \ - hmphf/libhmphf.la index/libindex.la \ - mgrs/libmgrs.la misc/libmisc.la \ - object/libobject.la oliasdb/liboliasdb.la \ - schema/libschema.la storage/libstorage.la \ - utility/libutility.la +libMMDB_la_LIBADD = api/libapi.la btree_berkeley/libbtree_berkeley.la \ + btree/libbtree.la \ + compression/libcompression.la \ + diskhash/libdiskhash.la dstr/libdstr.la \ + dti_cc/libdti_cc.la dti_excs/libdti_excs.la \ + dynhash/libdynhash.la HardCopy/libHardCopy.la \ + hmphf/libhmphf.la index/libindex.la \ + mgrs/libmgrs.la misc/libmisc.la \ + object/libobject.la oliasdb/liboliasdb.la \ + schema/libschema.la storage/libstorage.la \ + StyleSheet/libStyleSheet.la \ + utility/libutility.la From 89cdc161d02d8e01ab722ddbf8aa0c44f903ca62 Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Sun, 5 Dec 2021 19:15:05 -0700 Subject: [PATCH 08/25] dtinfo: move the dtinfo_env.mk makefile include to programs/dtinfo/ --- .../dtinfo/dtinfo/src/Agents/Makefile.am | 2 +- .../dtinfo/dtinfo/src/Basic/Makefile.am | 2 +- .../dtinfo/dtinfo/src/Graphics/Makefile.am | 2 +- cde/programs/dtinfo/dtinfo/src/Makefile.am | 2 +- .../dtinfo/dtinfo/src/Managers/Makefile.am | 2 +- .../dtinfo/dtinfo/src/Marks/Makefile.am | 2 +- .../dtinfo/dtinfo/src/Messages/Makefile.am | 2 +- .../dtinfo/dtinfo/src/OliasSearch/Makefile.am | 2 +- .../dtinfo/src/OnlineRender/Makefile.am | 2 +- .../dtinfo/dtinfo/src/Other/Makefile.am | 2 +- .../dtinfo/dtinfo/src/Preferences/Makefile.am | 2 +- .../dtinfo/dtinfo/src/Query/Makefile.am | 2 +- .../dtinfo/dtinfo/src/Support/Makefile.am | 2 +- .../dtinfo/dtinfo/src/UAS/Base/Makefile.am | 2 +- .../dtinfo/dtinfo/src/UAS/DtSR/Makefile.am | 2 +- .../dtinfo/dtinfo/src/UAS/MMDB/Makefile.am | 2 +- .../dtinfo/dtinfo/src/UAS/Makefile.am | 2 +- .../dtinfo/dtinfo/src/Widgets/Makefile.am | 2 +- .../dtinfo/dtinfo/src/cgm/Makefile.am | 2 +- .../{dtinfo/src/templates => }/dtinfo_env.mk | 28 +++++++++++-------- cde/programs/dtinfo/mmdb/HardCopy/Makefile.am | 2 +- .../dtinfo/mmdb/StyleSheet/Makefile.am | 2 +- cde/programs/dtinfo/mmdb/api/Makefile.am | 2 +- cde/programs/dtinfo/mmdb/btree/Makefile.am | 2 +- .../dtinfo/mmdb/btree_berkeley/Makefile.am | 2 +- .../dtinfo/mmdb/compression/Makefile.am | 2 +- cde/programs/dtinfo/mmdb/diskhash/Makefile.am | 2 +- cde/programs/dtinfo/mmdb/dstr/Makefile.am | 2 +- cde/programs/dtinfo/mmdb/dti_cc/Makefile.am | 2 +- cde/programs/dtinfo/mmdb/dti_excs/Makefile.am | 2 +- cde/programs/dtinfo/mmdb/dynhash/Makefile.am | 2 +- cde/programs/dtinfo/mmdb/hmphf/Makefile.am | 2 +- cde/programs/dtinfo/mmdb/index/Makefile.am | 2 +- cde/programs/dtinfo/mmdb/mgrs/Makefile.am | 2 +- cde/programs/dtinfo/mmdb/misc/Makefile.am | 2 +- cde/programs/dtinfo/mmdb/object/Makefile.am | 2 +- cde/programs/dtinfo/mmdb/oliasdb/Makefile.am | 2 +- cde/programs/dtinfo/mmdb/schema/Makefile.am | 2 +- cde/programs/dtinfo/mmdb/storage/Makefile.am | 2 +- cde/programs/dtinfo/mmdb/utility/Makefile.am | 2 +- 40 files changed, 55 insertions(+), 51 deletions(-) rename cde/programs/dtinfo/{dtinfo/src/templates => }/dtinfo_env.mk (51%) diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Agents/Makefile.am index 57361f311..ca8bcc3c8 100644 --- a/cde/programs/dtinfo/dtinfo/src/Agents/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/Agents/Makefile.am @@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in noinst_LIBRARIES = libAgents.a # get our env -include ../templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk # class info include Classlist.mk diff --git a/cde/programs/dtinfo/dtinfo/src/Basic/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Basic/Makefile.am index 5774b4592..26d9aa99d 100644 --- a/cde/programs/dtinfo/dtinfo/src/Basic/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/Basic/Makefile.am @@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in noinst_LIBRARIES = libBasic.a # get our env -include ../templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk # class info include Classlist.mk diff --git a/cde/programs/dtinfo/dtinfo/src/Graphics/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Graphics/Makefile.am index ea5125c97..560466b9f 100644 --- a/cde/programs/dtinfo/dtinfo/src/Graphics/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/Graphics/Makefile.am @@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in noinst_LIBRARIES = libGraphics.a # get our env -include ../templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk # class info include Classlist.mk diff --git a/cde/programs/dtinfo/dtinfo/src/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Makefile.am index e34421454..5481fa7a6 100644 --- a/cde/programs/dtinfo/dtinfo/src/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/Makefile.am @@ -1,7 +1,7 @@ MAINTAINERCLEANFILES = Makefile.in # get our env variables -include templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk # get the toplevel Classlist include Classlist.mk diff --git a/cde/programs/dtinfo/dtinfo/src/Managers/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Managers/Makefile.am index 675c4a0d9..d4b6b80b3 100644 --- a/cde/programs/dtinfo/dtinfo/src/Managers/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/Managers/Makefile.am @@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in noinst_LIBRARIES = libManagers.a # get our env -include ../templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk # class info include Classlist.mk diff --git a/cde/programs/dtinfo/dtinfo/src/Marks/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Marks/Makefile.am index c2f69a9c8..f80425b9e 100644 --- a/cde/programs/dtinfo/dtinfo/src/Marks/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/Marks/Makefile.am @@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in noinst_LIBRARIES = libMarks.a # get our env -include ../templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk # class info include Classlist.mk diff --git a/cde/programs/dtinfo/dtinfo/src/Messages/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Messages/Makefile.am index d7a22fecb..136d5fc94 100644 --- a/cde/programs/dtinfo/dtinfo/src/Messages/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/Messages/Makefile.am @@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in noinst_DATA = Messages.msg # get our env -include ../templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk # class info include Classlist.mk diff --git a/cde/programs/dtinfo/dtinfo/src/OliasSearch/Makefile.am b/cde/programs/dtinfo/dtinfo/src/OliasSearch/Makefile.am index aa018de0b..b85ffbaf8 100644 --- a/cde/programs/dtinfo/dtinfo/src/OliasSearch/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/OliasSearch/Makefile.am @@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in noinst_LIBRARIES = libOliasSearch.a # get our env -include ../templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk # class info include Classlist.mk diff --git a/cde/programs/dtinfo/dtinfo/src/OnlineRender/Makefile.am b/cde/programs/dtinfo/dtinfo/src/OnlineRender/Makefile.am index a72c8ac68..5c586a388 100644 --- a/cde/programs/dtinfo/dtinfo/src/OnlineRender/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/OnlineRender/Makefile.am @@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in noinst_LIBRARIES = libOnlineRender.a # get our env -include ../templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk # class info include Classlist.mk diff --git a/cde/programs/dtinfo/dtinfo/src/Other/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Other/Makefile.am index 32027f440..53233960e 100644 --- a/cde/programs/dtinfo/dtinfo/src/Other/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/Other/Makefile.am @@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in noinst_LIBRARIES = libOther.a # get our env -include ../templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk # class info include Classlist.mk diff --git a/cde/programs/dtinfo/dtinfo/src/Preferences/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Preferences/Makefile.am index 00e20fff1..1e88e5aa3 100644 --- a/cde/programs/dtinfo/dtinfo/src/Preferences/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/Preferences/Makefile.am @@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in noinst_LIBRARIES = libPreferences.a # get our env -include ../templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk # class info include Classlist.mk diff --git a/cde/programs/dtinfo/dtinfo/src/Query/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Query/Makefile.am index 98ef3aa71..36612b908 100644 --- a/cde/programs/dtinfo/dtinfo/src/Query/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/Query/Makefile.am @@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in noinst_LIBRARIES = libQuery.a # get our env -include ../templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk # class info include Classlist.mk diff --git a/cde/programs/dtinfo/dtinfo/src/Support/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Support/Makefile.am index 8c49cb001..43dcfbad2 100644 --- a/cde/programs/dtinfo/dtinfo/src/Support/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/Support/Makefile.am @@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in noinst_LIBRARIES = libSupport.a # get our env -include ../templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk # class info include Classlist.mk diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/Base/Makefile.am b/cde/programs/dtinfo/dtinfo/src/UAS/Base/Makefile.am index c72eedd65..bb68e2f16 100644 --- a/cde/programs/dtinfo/dtinfo/src/UAS/Base/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/UAS/Base/Makefile.am @@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in noinst_LIBRARIES = libBase.a # get our env -include ../../templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk # class info include Classlist.mk diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/Makefile.am b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/Makefile.am index ef995c5a3..a30087220 100644 --- a/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/Makefile.am @@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in noinst_LIBRARIES = libDtSR.a # get our env -include ../../templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk # class info include Classlist.mk diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/MMDB/Makefile.am b/cde/programs/dtinfo/dtinfo/src/UAS/MMDB/Makefile.am index eb59d7e98..289197a4f 100644 --- a/cde/programs/dtinfo/dtinfo/src/UAS/MMDB/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/UAS/MMDB/Makefile.am @@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in noinst_LIBRARIES = libMMDB.a # get our env -include ../../templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk # class info include Classlist.mk diff --git a/cde/programs/dtinfo/dtinfo/src/UAS/Makefile.am b/cde/programs/dtinfo/dtinfo/src/UAS/Makefile.am index b372b4f49..1e418d195 100644 --- a/cde/programs/dtinfo/dtinfo/src/UAS/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/UAS/Makefile.am @@ -5,7 +5,7 @@ SUBDIRS = Base MMDB DtSR noinst_LIBRARIES = libUAS.a # get our env -include ../templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk # class info include Classlist.mk diff --git a/cde/programs/dtinfo/dtinfo/src/Widgets/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Widgets/Makefile.am index dbe7c6765..9029a942a 100644 --- a/cde/programs/dtinfo/dtinfo/src/Widgets/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/Widgets/Makefile.am @@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in noinst_LIBRARIES = libWidgets.a # get our env -include ../templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk libWidgets_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) diff --git a/cde/programs/dtinfo/dtinfo/src/cgm/Makefile.am b/cde/programs/dtinfo/dtinfo/src/cgm/Makefile.am index c0d192d39..008f66280 100644 --- a/cde/programs/dtinfo/dtinfo/src/cgm/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/cgm/Makefile.am @@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in noinst_LIBRARIES = libcgm.a # get our env -include ../templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk # class info libcgm_a_CFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) \ diff --git a/cde/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk b/cde/programs/dtinfo/dtinfo_env.mk similarity index 51% rename from cde/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk rename to cde/programs/dtinfo/dtinfo_env.mk index 675fd9ccd..a58e6ecbf 100644 --- a/cde/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk +++ b/cde/programs/dtinfo/dtinfo_env.mk @@ -1,4 +1,5 @@ -# Some common env variables needed by the various modules +# Some common env variables needed by the various modules. This file +# is included by various Makefile.am files in the dtinfo hierarchy. # common defines DTINFO_DEFINES = -DDtinfoClient -DUseWideChars -DInternationalize \ @@ -17,25 +18,28 @@ if SOLARIS DTINFO_DEFINES += -DHAS_TERMINATE -DNATIVE_EXCEPTIONS endif -# where stuff is -OLIAS = $(top_srcdir)/programs/dtinfo -CONTROL=$(OLIAS)/control -LIBRARY = $(OLIAS)/library +# where stuff is... This may need to be fixed further if we want to be +# able to support shadow builds someday +OLIAS = $(top_builddir)/programs/dtinfo +OLIASSRC = $(top_srcdir)/programs/dtinfo WWL = $(OLIAS)/dtinfo/wwl +WWLSRC = $(OLIASSRC)/dtinfo/wwl MMDB = $(OLIAS)/DtMmdb +MMDBSRC = $(OLIASSRC)/DtMmdb EXCEPTIONS = $(MMDB)/dti_excs +EXCEPTIONSSRC = $(MMDBSRC)/dti_excs TOOLS = $(OLIAS)/tools UAS = $(OLIAS)/dtinfo/src/UAS +UASSRC = $(OLIASSRC)/dtinfo/src/UAS -WWL_INCLUDES = -I$(WWL)/include +WWL_INCLUDES = -I$(WWLSRC)/include WWL_LIBS=$(STATIC) -L$(WWL)/src -lWWL -EXCEPTIONS_INCLUDES = -I$(EXCEPTIONS) -MMDB_INCLUDES = -I$(MMDB) +EXCEPTIONS_INCLUDES = -I$(EXCEPTIONSSRC) +MMDB_INCLUDES = -I$(MMDBSRC) MMDB_LIBS=$(OLIAS)/mmdb/libMMDB.la -UAS_INCLUDES = -I$(UAS)/Base -COMMON_CLASS_INCLUDES = -I$(MMDB)/dti_cc -I$(MMDB) -COMMON_CLASS_LIBDIR = $(STATIC) -L$(MMDB)/dti_cc -STYLE_SHEET_INCLUDES = -I$(MMDB)/StyleSheet +UAS_INCLUDES = -I$(UASSRC)/Base +COMMON_CLASS_INCLUDES = -I$(MMDBSRC)/dti_cc -I$(MMDBSRC) +STYLE_SHEET_INCLUDES = -I$(MMDBSRC)/StyleSheet TREERES = $(TOOLS)/misc/treeres MSGSETS = $(TOOLS)/misc/msgsets diff --git a/cde/programs/dtinfo/mmdb/HardCopy/Makefile.am b/cde/programs/dtinfo/mmdb/HardCopy/Makefile.am index 911d6daa6..17ae72de1 100644 --- a/cde/programs/dtinfo/mmdb/HardCopy/Makefile.am +++ b/cde/programs/dtinfo/mmdb/HardCopy/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk BASE = ../../DtMmdb/HardCopy BUILT_SOURCES = FPset.C HardCopyFP.C autoNumber.C autoNumberFP.C diff --git a/cde/programs/dtinfo/mmdb/StyleSheet/Makefile.am b/cde/programs/dtinfo/mmdb/StyleSheet/Makefile.am index afc7c293c..c06324777 100644 --- a/cde/programs/dtinfo/mmdb/StyleSheet/Makefile.am +++ b/cde/programs/dtinfo/mmdb/StyleSheet/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk BASE = ../../DtMmdb/StyleSheet BUILT_SOURCES = Attribute.C AttributeList.C BitVector.C DocParser.C \ diff --git a/cde/programs/dtinfo/mmdb/api/Makefile.am b/cde/programs/dtinfo/mmdb/api/Makefile.am index df1038953..74378b1d7 100644 --- a/cde/programs/dtinfo/mmdb/api/Makefile.am +++ b/cde/programs/dtinfo/mmdb/api/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk BASE = ../../DtMmdb/api BUILT_SOURCES = base.C info_base.C info_lib.C smart_ptr.C \ diff --git a/cde/programs/dtinfo/mmdb/btree/Makefile.am b/cde/programs/dtinfo/mmdb/btree/Makefile.am index 790881c9a..388951e66 100644 --- a/cde/programs/dtinfo/mmdb/btree/Makefile.am +++ b/cde/programs/dtinfo/mmdb/btree/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk BASE = ../../DtMmdb/btree BUILT_SOURCES = mmdb_btree.C diff --git a/cde/programs/dtinfo/mmdb/btree_berkeley/Makefile.am b/cde/programs/dtinfo/mmdb/btree_berkeley/Makefile.am index 51ff9b5d5..9c58c883f 100644 --- a/cde/programs/dtinfo/mmdb/btree_berkeley/Makefile.am +++ b/cde/programs/dtinfo/mmdb/btree_berkeley/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk BASE = ../../DtMmdb/btree_berkeley BUILT_SOURCES = bt_close.c bt_conv.c bt_debug.c bt_delete.c bt_get.c \ diff --git a/cde/programs/dtinfo/mmdb/compression/Makefile.am b/cde/programs/dtinfo/mmdb/compression/Makefile.am index 5eaf51c52..94b2ebb19 100644 --- a/cde/programs/dtinfo/mmdb/compression/Makefile.am +++ b/cde/programs/dtinfo/mmdb/compression/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk BASE = ../../DtMmdb/compression BUILT_SOURCES = abs_agent.C zip.C huffman.C trie.C code.C lzss.C diff --git a/cde/programs/dtinfo/mmdb/diskhash/Makefile.am b/cde/programs/dtinfo/mmdb/diskhash/Makefile.am index a674ddcd8..7bf4ac36b 100644 --- a/cde/programs/dtinfo/mmdb/diskhash/Makefile.am +++ b/cde/programs/dtinfo/mmdb/diskhash/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk BASE = ../../DtMmdb/diskhash BUILT_SOURCES = disk_bucket.C bucket_array.C disk_hash.C diff --git a/cde/programs/dtinfo/mmdb/dstr/Makefile.am b/cde/programs/dtinfo/mmdb/dstr/Makefile.am index 096f569c7..bab8c0aed 100644 --- a/cde/programs/dtinfo/mmdb/dstr/Makefile.am +++ b/cde/programs/dtinfo/mmdb/dstr/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk BASE = ../../DtMmdb/dstr BUILT_SOURCES = set.C bset.C slist.C dlist_cell.C dlist.C heap.C \ diff --git a/cde/programs/dtinfo/mmdb/dti_cc/Makefile.am b/cde/programs/dtinfo/mmdb/dti_cc/Makefile.am index 1066c994d..e857b56d3 100644 --- a/cde/programs/dtinfo/mmdb/dti_cc/Makefile.am +++ b/cde/programs/dtinfo/mmdb/dti_cc/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk BASE = ../../DtMmdb/dti_cc BUILT_SOURCES = CC_Listbase.C cc_exceptions.C CC_String.C \ diff --git a/cde/programs/dtinfo/mmdb/dti_excs/Makefile.am b/cde/programs/dtinfo/mmdb/dti_excs/Makefile.am index 8bcceba76..f0146f2a1 100644 --- a/cde/programs/dtinfo/mmdb/dti_excs/Makefile.am +++ b/cde/programs/dtinfo/mmdb/dti_excs/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk BASE = ../../DtMmdb/dti_excs BUILT_SOURCES = Jump_Environment.C Exceptions.C Exception.C \ diff --git a/cde/programs/dtinfo/mmdb/dynhash/Makefile.am b/cde/programs/dtinfo/mmdb/dynhash/Makefile.am index 29aec7b32..4857d139c 100644 --- a/cde/programs/dtinfo/mmdb/dynhash/Makefile.am +++ b/cde/programs/dtinfo/mmdb/dynhash/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk BASE = ../../DtMmdb/dynhash BUILT_SOURCES = data_t.C imp_bucket.C imp_die.C diff --git a/cde/programs/dtinfo/mmdb/hmphf/Makefile.am b/cde/programs/dtinfo/mmdb/hmphf/Makefile.am index 167e894d5..39ce6ba5f 100644 --- a/cde/programs/dtinfo/mmdb/hmphf/Makefile.am +++ b/cde/programs/dtinfo/mmdb/hmphf/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk BASE = ../../DtMmdb/hmphf BUILT_SOURCES = buckets.C mphf_funcs.C mphf_hash_table.C params.C \ diff --git a/cde/programs/dtinfo/mmdb/index/Makefile.am b/cde/programs/dtinfo/mmdb/index/Makefile.am index 71eaf20d8..fcf498d9c 100644 --- a/cde/programs/dtinfo/mmdb/index/Makefile.am +++ b/cde/programs/dtinfo/mmdb/index/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk BASE = ../../DtMmdb/index BUILT_SOURCES = btree_index.C dyn_disk_index.C dyn_index.C \ diff --git a/cde/programs/dtinfo/mmdb/mgrs/Makefile.am b/cde/programs/dtinfo/mmdb/mgrs/Makefile.am index 167699b34..85921d1a0 100644 --- a/cde/programs/dtinfo/mmdb/mgrs/Makefile.am +++ b/cde/programs/dtinfo/mmdb/mgrs/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk BASE = ../../DtMmdb/mgrs BUILT_SOURCES = managers.C misc.C query_mgr.C template_mgr.C diff --git a/cde/programs/dtinfo/mmdb/misc/Makefile.am b/cde/programs/dtinfo/mmdb/misc/Makefile.am index 65507dfda..15de30858 100644 --- a/cde/programs/dtinfo/mmdb/misc/Makefile.am +++ b/cde/programs/dtinfo/mmdb/misc/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES= Makefile.in -include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk BASE = ../../DtMmdb/misc BUILT_SOURCES = unique_id.c diff --git a/cde/programs/dtinfo/mmdb/object/Makefile.am b/cde/programs/dtinfo/mmdb/object/Makefile.am index 478d137df..cb0b8671f 100644 --- a/cde/programs/dtinfo/mmdb/object/Makefile.am +++ b/cde/programs/dtinfo/mmdb/object/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk BASE = ../../DtMmdb/object BUILT_SOURCES = composite.C compressed_pstring.C cset.C dl_list.C \ diff --git a/cde/programs/dtinfo/mmdb/oliasdb/Makefile.am b/cde/programs/dtinfo/mmdb/oliasdb/Makefile.am index aa38c7566..e3b394ec8 100644 --- a/cde/programs/dtinfo/mmdb/oliasdb/Makefile.am +++ b/cde/programs/dtinfo/mmdb/oliasdb/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk BASE = ../../DtMmdb/oliasdb BUILT_SOURCES = asciiIn_filters.C collectionIterator.C dlp_hd.C \ diff --git a/cde/programs/dtinfo/mmdb/schema/Makefile.am b/cde/programs/dtinfo/mmdb/schema/Makefile.am index 1ee649c19..468e73a01 100644 --- a/cde/programs/dtinfo/mmdb/schema/Makefile.am +++ b/cde/programs/dtinfo/mmdb/schema/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk BASE = ../../DtMmdb/schema BUILT_SOURCES = desc.C store_desc.C object_dict.C \ diff --git a/cde/programs/dtinfo/mmdb/storage/Makefile.am b/cde/programs/dtinfo/mmdb/storage/Makefile.am index 75698bf66..bed6a5885 100644 --- a/cde/programs/dtinfo/mmdb/storage/Makefile.am +++ b/cde/programs/dtinfo/mmdb/storage/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk BASE = ../../DtMmdb/storage BUILT_SOURCES = abs_storage.C chunks_index.C heap_comp_funcs.C lru.C \ diff --git a/cde/programs/dtinfo/mmdb/utility/Makefile.am b/cde/programs/dtinfo/mmdb/utility/Makefile.am index 88eeb6ac0..3252f55d0 100644 --- a/cde/programs/dtinfo/mmdb/utility/Makefile.am +++ b/cde/programs/dtinfo/mmdb/utility/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -include $(top_srcdir)/programs/dtinfo/dtinfo/src/templates/dtinfo_env.mk +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk BASE = ../../DtMmdb/utility BUILT_SOURCES = atoi_fast.C atoi_larson.C atoi_pearson.C \ From b6c938fb47afc1bcf925669c819efbddd13d7159 Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Sun, 5 Dec 2021 19:47:25 -0700 Subject: [PATCH 09/25] dtinfo: move the dtinfo_dfiles_hfiles.mk makefile include into dtinfo/src/ --- cde/programs/dtinfo/dtinfo/src/Makefile.am | 2 +- .../dtinfo-dfiles-hfiles.mk => dtinfo_dfiles_hfiles.mk} | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) rename cde/programs/dtinfo/dtinfo/src/{templates/dtinfo-dfiles-hfiles.mk => dtinfo_dfiles_hfiles.mk} (96%) diff --git a/cde/programs/dtinfo/dtinfo/src/Makefile.am b/cde/programs/dtinfo/dtinfo/src/Makefile.am index 5481fa7a6..603b40391 100644 --- a/cde/programs/dtinfo/dtinfo/src/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/Makefile.am @@ -38,7 +38,7 @@ Dtinfo: Dtinfo.res $(RESFILES) $(CPP_PROGRAM) -traditional -nostdinc -C Dtinfo.res | $(TREERES) > $@ # dtinfo class dfile and hfile building for the modules -include templates/dtinfo-dfiles-hfiles.mk +include $(top_srcdir)/programs/dtinfo/dtinfo/src/dtinfo_dfiles_hfiles.mk # gather up the messages and generate the file. MSGS comes from the # dtinfo/src/Classlist.mk file. diff --git a/cde/programs/dtinfo/dtinfo/src/templates/dtinfo-dfiles-hfiles.mk b/cde/programs/dtinfo/dtinfo/src/dtinfo_dfiles_hfiles.mk similarity index 96% rename from cde/programs/dtinfo/dtinfo/src/templates/dtinfo-dfiles-hfiles.mk rename to cde/programs/dtinfo/dtinfo/src/dtinfo_dfiles_hfiles.mk index 6f2da0ed7..94406e048 100644 --- a/cde/programs/dtinfo/dtinfo/src/templates/dtinfo-dfiles-hfiles.mk +++ b/cde/programs/dtinfo/dtinfo/src/dtinfo_dfiles_hfiles.mk @@ -1,5 +1,6 @@ -## Build the dfiles and hfiles components for each of the class modules. -## Moved into this file to keep Makefile.am in dtinfo/src readable +## Build the dfiles and hfiles components for each of the class +## modules. Moved into this file to keep Makefile.am in dtinfo/src +## somewhat morereadable # Support include Support/Classlist.mk From 93a3d73ef7df917bb10eb38ce63be1477d3b1fde Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Mon, 6 Dec 2021 11:59:00 -0700 Subject: [PATCH 10/25] dtinfo: install required stuff, also in localized/ --- cde/programs/dtinfo/DtMmdb/Makefile.am | 5 +++++ .../dtinfo/clients/dtinfo_start/Makefile.am | 2 +- .../dtinfo/dtinfo/install/lib/Makefile.am | 2 +- .../localized/templates/app-defaults.am | 4 ++-- cde/programs/localized/templates/msg.C.am | 20 +++++++++---------- cde/programs/localized/util/merge.c | 2 +- 6 files changed, 19 insertions(+), 16 deletions(-) diff --git a/cde/programs/dtinfo/DtMmdb/Makefile.am b/cde/programs/dtinfo/DtMmdb/Makefile.am index b1f37673c..0951c53aa 100644 --- a/cde/programs/dtinfo/DtMmdb/Makefile.am +++ b/cde/programs/dtinfo/DtMmdb/Makefile.am @@ -27,3 +27,8 @@ libDtMmdb_la_LIBADD = api/libapi.la btree/libbtree.la \ utility/libutility.la libDtMmdb_la_LDFLAGS = -version-info 2:1:0 + +infolibdir = $(CDE_INSTALLATION_TOP)/infolib/etc +infolib_DATA = oliasdb/mmdb.infolib.spec \ + StyleSheet/hardcopy.feature.spec \ + StyleSheet/online.feature.spec diff --git a/cde/programs/dtinfo/clients/dtinfo_start/Makefile.am b/cde/programs/dtinfo/clients/dtinfo_start/Makefile.am index f8c8cdd3f..b19afee3e 100644 --- a/cde/programs/dtinfo/clients/dtinfo_start/Makefile.am +++ b/cde/programs/dtinfo/clients/dtinfo_start/Makefile.am @@ -4,7 +4,7 @@ noinst_PROGRAMS = dtinfo_start BUILT_SOURCES = dtinfo_start.opnums -dtinfo_start_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB) -lXm +dtinfo_start_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB) dtinfo_start.opnums: $(top_builddir)/programs/tttypes/dtinfo_start.opnums $(RM) dtinfo_start.opnums diff --git a/cde/programs/dtinfo/dtinfo/install/lib/Makefile.am b/cde/programs/dtinfo/dtinfo/install/lib/Makefile.am index b1a92efb0..bde9efe87 100644 --- a/cde/programs/dtinfo/dtinfo/install/lib/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/install/lib/Makefile.am @@ -4,5 +4,5 @@ etcdir = $(CDE_CONFIGURATION_TOP) SUBDIRS = bitmaps fonts -infolibdir = $(CDE_INSTALLATION_TOP)/infolib +infolibdir = $(CDE_INSTALLATION_TOP)/infolib/etc infolib_DATA = mmdb.mark.spec diff --git a/cde/programs/localized/templates/app-defaults.am b/cde/programs/localized/templates/app-defaults.am index 67c5c5a58..4bae23aee 100644 --- a/cde/programs/localized/templates/app-defaults.am +++ b/cde/programs/localized/templates/app-defaults.am @@ -1,10 +1,10 @@ # process the app-defaults files... -#NOTYET - Dtinfo + BUILT_SOURCES = Dthelpview Dtimsstart Dtlogin Dthello Dtsession \ Dtscreen Dtwm Dtfile Dtstyle Dtpad Dticon Dtcreate Dtcalc \ - Dtcm Dtterm Dtmail Dtbuilder Dtudcfonted Dt + Dtcm Dtterm Dtmail Dtbuilder Dtudcfonted Dt Dtinfo CLEANFILES = $(BUILT_SOURCES) diff --git a/cde/programs/localized/templates/msg.C.am b/cde/programs/localized/templates/msg.C.am index f6d7f8b55..5929b3302 100644 --- a/cde/programs/localized/templates/msg.C.am +++ b/cde/programs/localized/templates/msg.C.am @@ -1,19 +1,17 @@ # process the message files... -# NOTYET dtinfo.cat dtinfo_start.cat - # BROKEN (always has been): fmt_tbl.cat -BUILT_SOURCES = Xm.cat Mrm.cat Uil.cat DtHelp.cat \ - DtMail.cat DtPrint.cat DtWidget.cat MotifApp.cat \ - SUNW_TOOLTALK.cat dt.cat dtact.cat dtbuilder.cat dtcalc.cat \ - dtcm.cat dtcodegen.cat dtconfig.cat dtcopy.cat dtcreate.cat \ - dtfile.cat dthello.cat dthelpgen.cat dthelpprint.cat dticon.cat \ - dtimsstart.cat dtksh.cat \ - dtlogin.cat dtlp.cat dtmailopts.cat dtpad.cat dtpdm.cat \ - dtpdmd.cat dtprintinfo.cat dtscreen.cat dtsearch.cat \ +BUILT_SOURCES = Xm.cat Mrm.cat Uil.cat DtHelp.cat DtMail.cat \ + DtPrint.cat DtWidget.cat MotifApp.cat SUNW_TOOLTALK.cat dt.cat \ + dtact.cat dtbuilder.cat dtcalc.cat dtcm.cat dtcodegen.cat \ + dtconfig.cat dtcopy.cat dtcreate.cat dtfile.cat dthello.cat \ + dthelpgen.cat dthelpprint.cat dticon.cat dtimsstart.cat \ + dtksh.cat dtlogin.cat dtlp.cat dtmailopts.cat dtpad.cat \ + dtpdm.cat dtpdmd.cat dtprintinfo.cat dtscreen.cat dtsearch.cat \ dtsession.cat dtstyle.cat dtterm.cat dttypes.cat dtwm.cat \ - dtudcexch.cat dtudcfonted.cat libdtcm.cat libDtMail.cat + dtudcexch.cat dtudcfonted.cat libdtcm.cat libDtMail.cat \ + dtinfo.cat dtinfo_start.cat CLEANFILES = $(BUILT_SOURCES) diff --git a/cde/programs/localized/util/merge.c b/cde/programs/localized/util/merge.c index e019dab37..000843d09 100644 --- a/cde/programs/localized/util/merge.c +++ b/cde/programs/localized/util/merge.c @@ -259,7 +259,7 @@ void cat_open (void) if(dfile != NULL) { - sprintf(line,"gencat %s %s", dFilename, dfile); + snprintf(line, PATH_MAX, "gencat %s %s", dFilename, dfile); if ( system(line) != 0 ) { fatal("default .tmsg file would not gencat\n",0,9); From e437a02e0b226b0ac25874fa9a55efa7d279fe6b Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Mon, 6 Dec 2021 17:14:31 -0700 Subject: [PATCH 11/25] dtinfo/dtinfogen: make it build Now, as to whether it all actually works, I guess we will see. --- cde/configure.ac | 10 ++ cde/programs/dtinfo/Makefile.am | 4 +- cde/programs/dtinfo/dtinfo_env.mk | 1 + .../infolib/C.ISO-8859-1/SGML/Makefile.am | 3 +- .../dtinfo/dtinfogen/infolib/Makefile.am | 15 +- .../dtinfo/dtinfogen/infolib/etc/Makefile.am | 130 ++++++++++++++++++ .../dtinfogen/infolib/etc/dtinfogen_worker.c | 2 +- .../dtinfo/dtinfogen/install/Makefile.am | 14 ++ .../dtinfo/dtinfogen/install/valBase.C | 3 +- .../dtinfogen/mmdb/StyleSheet/Makefile.am | 12 ++ .../dtinfo/dtinfogen/mmdb/src/Makefile.am | 25 ++++ 11 files changed, 206 insertions(+), 13 deletions(-) create mode 100644 cde/programs/dtinfo/dtinfogen/infolib/etc/Makefile.am create mode 100644 cde/programs/dtinfo/dtinfogen/install/Makefile.am create mode 100644 cde/programs/dtinfo/dtinfogen/mmdb/StyleSheet/Makefile.am create mode 100644 cde/programs/dtinfo/dtinfogen/mmdb/src/Makefile.am diff --git a/cde/configure.ac b/cde/configure.ac index b6ef4bbc8..9d4d610c4 100644 --- a/cde/configure.ac +++ b/cde/configure.ac @@ -753,6 +753,16 @@ programs/dtinfo/dtinfo/install/lib/Makefile programs/dtinfo/dtinfo/install/lib/bitmaps/Makefile programs/dtinfo/dtinfo/install/lib/fonts/Makefile +programs/dtinfo/dtinfogen/Makefile +programs/dtinfo/dtinfogen/mmdb/Makefile +programs/dtinfo/dtinfogen/mmdb/src/Makefile +programs/dtinfo/dtinfogen/mmdb/StyleSheet/Makefile +programs/dtinfo/dtinfogen/infolib/Makefile +programs/dtinfo/dtinfogen/infolib/etc/Makefile +programs/dtinfo/dtinfogen/infolib/C.ISO-8859-1/Makefile +programs/dtinfo/dtinfogen/infolib/C.ISO-8859-1/SGML/Makefile +programs/dtinfo/dtinfogen/install/Makefile + programs/types/Makefile programs/tttypes/Makefile diff --git a/cde/programs/dtinfo/Makefile.am b/cde/programs/dtinfo/Makefile.am index 629e6d7ce..67d326b9c 100644 --- a/cde/programs/dtinfo/Makefile.am +++ b/cde/programs/dtinfo/Makefile.am @@ -1,5 +1,3 @@ MAINTAINERCLEANFILES = Makefile.in -SUBDIRS = tools DtMmdb mmdb clients dtinfo - -#NOTYET dtinfo dtinfogen +SUBDIRS = tools DtMmdb mmdb clients dtinfo dtinfogen diff --git a/cde/programs/dtinfo/dtinfo_env.mk b/cde/programs/dtinfo/dtinfo_env.mk index a58e6ecbf..5a4ea0bc3 100644 --- a/cde/programs/dtinfo/dtinfo_env.mk +++ b/cde/programs/dtinfo/dtinfo_env.mk @@ -37,6 +37,7 @@ WWL_LIBS=$(STATIC) -L$(WWL)/src -lWWL EXCEPTIONS_INCLUDES = -I$(EXCEPTIONSSRC) MMDB_INCLUDES = -I$(MMDBSRC) MMDB_LIBS=$(OLIAS)/mmdb/libMMDB.la +MMDB_LIBS_C_API = -L$(MMDB) -lDtMmdb UAS_INCLUDES = -I$(UASSRC)/Base COMMON_CLASS_INCLUDES = -I$(MMDBSRC)/dti_cc -I$(MMDBSRC) STYLE_SHEET_INCLUDES = -I$(MMDBSRC)/StyleSheet diff --git a/cde/programs/dtinfo/dtinfogen/infolib/C.ISO-8859-1/SGML/Makefile.am b/cde/programs/dtinfo/dtinfogen/infolib/C.ISO-8859-1/SGML/Makefile.am index 4cd0fbe06..445738efd 100644 --- a/cde/programs/dtinfo/dtinfogen/infolib/C.ISO-8859-1/SGML/Makefile.am +++ b/cde/programs/dtinfo/dtinfogen/infolib/C.ISO-8859-1/SGML/Makefile.am @@ -1,5 +1,3 @@ -sgmldir = ${prefix}/infolib/C/SGML - MAINTAINERCLEANFILES = Makefile.in DECL_FILES= \ @@ -44,4 +42,5 @@ MISC_FILES= \ ALL_FILES = $(DECL_FILES) $(DTD_FILES) $(ENTITY_FILES) $(MISC_FILES) +sgmldir = $(CDE_INSTALLATION_TOP)/infolib/C/SGML sgml_DATA = $(ALL_FILES) diff --git a/cde/programs/dtinfo/dtinfogen/infolib/Makefile.am b/cde/programs/dtinfo/dtinfogen/infolib/Makefile.am index 3ce08b2e6..b0201fa06 100644 --- a/cde/programs/dtinfo/dtinfogen/infolib/Makefile.am +++ b/cde/programs/dtinfo/dtinfogen/infolib/Makefile.am @@ -1,10 +1,13 @@ MAINTAINERCLEANFILES = Makefile.in -SUBDIRS = etc C.ISO-8859-1 ja_JP.EUC-JP +SUBDIRS = etc C.ISO-8859-1 -C:: C.ISO-8859-1 - $(RM) $@ - $(LN) $? $@ +# Not supported, but we'll keep it here in case someday... +# SUBDIRS += ja_JP.EUC-JP + +BUILT_SOURCES = C +CLEANFILES = $(BUILT_SOURCES) + +C: + $(LN_S) C.ISO-8859-1 $@ -clean:: - $(RM) C diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/Makefile.am b/cde/programs/dtinfo/dtinfogen/infolib/etc/Makefile.am new file mode 100644 index 000000000..c716a405c --- /dev/null +++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/Makefile.am @@ -0,0 +1,130 @@ +MAINTAINERCLEANFILES = Makefile.in + +# get our env variables +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk + +# symlinks used by dtinfogen when run from the build tree +BUILT_SOURCES = hardcopy.feature.spec online.feature.spec \ + mmdb.infolib.spec dtsr C.ISO-8859-1 C + + +PROGRAMSRC = $(top_builddir)/programs + +dtsr: + $(LN_S) $(top_builddir)/programs/dtsr $@ + +hardcopy.feature.spec: + $(LN_S) $(MMDB)/StyleSheet/$@ $@ + +online.feature.spec: + $(LN_S) $(MMDB)/StyleSheet/$@ $@ + +mmdb.infolib.spec: + $(LN_S) $(MMDB)/oliasdb/$@ $@ + +C.ISO-8859-1: + $(LN_S) $(PROGRAMSRC)/localized/C $@ + +C: + $(LN_S) C.ISO-8859-1 $@ + +if GERMAN +BUILT_SOURCES += de_DE.UTF-8 +de_DE.UTF-8: + $(LN_S) $(PROGRAMSRC)/localized/de_DE.UTF-8 $@ +endif + +if SPANISH +BUILT_SOURCES += es_ES.UTF-8 +es_ES.UTF-8: + $(LN_S) $(PROGRAMSRC)/localized/es_ES.UTF-8 $@ +endif + +if FRENCH +BUILT_SOURCES += fr_FR.UTF-8 +fr_FR.UTF-8: + $(LN_S) $(PROGRAMSRC)/localized/fr_FR.UTF-8 $@ +endif + +if ITALIAN +BUILT_SOURCES += it_IT.UTF-8 +it_IT.UTF-8: + $(LN_S) $(PROGRAMSRC)/localized/it_IT.UTF-8 $@ +endif + +# NOT CURRENTLY +# BUILT_SOURCES += ja_JP.EUC-JP +#ja_JP.EUC-JP: +# $(LN_S) $(PROGRAMSRC)/localized/ja_JP.EUC-JP $@ + +CLEANFILES = $(BUILT_SOURCES) + +# always using DtSearch, so this is the search engine we use +SEARCH_SRCS = AusText.C AusTextStorage.C + +# at no time have we ever regenerated the lexer files. Someday we +# might need/want to, so keep that in mind. From Imakefile: +# +#LexTarget (gr_type,graphics_task) +#LexTarget (ReplaceIdIdref,nodedata) +#LexTarget (ContentType,ol_data) +#LexTarget (RemoteId,remote) +#YaccTarget(OL_DataExpr,ol_data) + +NORMAL_SRCS = AttributeData.C AttributeList.C AttributeRec.C \ + BookCaseDB.C BookTasks.C BTCollectable.C ConcatTask.C \ + Content.C OL_DataExpr.C ContentType.C DataBase.C DataTask.C \ + DataRepository.C Dispatch.C EntityList.C Expression.C \ + ExprList.C FirstOf.C FlexBuffer.C GenericId.C gr_type.C \ + GraphicsTask.C Handler.C LcfTask.C NodeData.C NodeTask.C \ + OL-Data.C OLAF.C ReplaceIdIdref.C SGMLDefn.C SGMLName.C \ + SearchEng.C SearchPath.C SearchStorage.C StringList.C \ + StyleTask.C StyleTaskDB.C StyleValidate.C TOCTask.C Task.C \ + Token.C lex.C $(SEARCH_SRCS) + +noinst_LTLIBRARIES = libOLAFParse.la +libOLAFParse_la_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) +libOLAFParse_la_SOURCES = $(NORMAL_SRCS) + +if LINUX +TEMPLATE_SRC = TKTemplate.C +endif + +if BSD +TEMPLATE_SRC = TKTemplate.C +endif + +bin_SCRIPTS = dtinfogen + +# helpers + +infolibdir = $(CDE_INSTALLATION_TOP)/infolib/etc +infolib_PROGRAMS = NodeParser NCFGen MixedGen StyleUpdate dtinfogen_worker + +NodeParser_CXXFLAGS = $(EXCEPTIONS_INCLUDES) $(DTINFO_DEFINES) \ + $(DTINFO_INCLUDES) +NodeParser_LDADD = libOLAFParse.la $(MMDB_LIBS) +NodeParser_SOURCES = NodeParser.C $(TEMPLATE_SRC) + +NCFGen_CXXFLAGS = $(EXCEPTIONS_INCLUDES) $(DTINFO_DEFINES) \ + $(DTINFO_INCLUDES) +NCFGen_LDADD = libOLAFParse.la $(MMDB_LIBS) $(DTCLIENTLIBS) $(XTOOLLIB) +NCFGen_SOURCES = NCFGen.C $(TEMPLATE_SRC) + +MixedGen_CXXFLAGS = $(EXCEPTIONS_INCLUDES) $(DTINFO_DEFINES) \ + $(DTINFO_INCLUDES) +MixedGen_LDADD = libOLAFParse.la $(MMDB_LIBS) $(DTCLIENTLIBS) $(XTOOLLIB) +MixedGen_SOURCES = MixedGen.C RemoteId.C $(TEMPLATE_SRC) + +StyleUpdate_CXXFLAGS = $(EXCEPTIONS_INCLUDES) $(DTINFO_DEFINES) \ + $(DTINFO_INCLUDES) +StyleUpdate_LDADD = libOLAFParse.la $(MMDB_LIBS) $(DTCLIENTLIBS) $(XTOOLLIB) +StyleUpdate_SOURCES = StyleUpdate.C $(TEMPLATE_SRC) + +dtinfogen_worker_CFLAGS = $(EXCEPTIONS_INCLUDES) $(DTINFO_DEFINES) \ + $(DTINFO_INCLUDES) +dtinfogen_worker_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB) +dtinfogen_worker_SOURCES = dtinfogen_worker.c + + + diff --git a/cde/programs/dtinfo/dtinfogen/infolib/etc/dtinfogen_worker.c b/cde/programs/dtinfo/dtinfogen/infolib/etc/dtinfogen_worker.c index f32186477..4c0741013 100644 --- a/cde/programs/dtinfo/dtinfogen/infolib/etc/dtinfogen_worker.c +++ b/cde/programs/dtinfo/dtinfogen/infolib/etc/dtinfogen_worker.c @@ -48,7 +48,7 @@ #include #include
-#include +#include
#define LANG_COMMON "C" /* default os language */ #define CLANG_COMMON "C.ISO-8859-1" /* default canonical language */ diff --git a/cde/programs/dtinfo/dtinfogen/install/Makefile.am b/cde/programs/dtinfo/dtinfogen/install/Makefile.am new file mode 100644 index 000000000..c4f5f2b32 --- /dev/null +++ b/cde/programs/dtinfo/dtinfogen/install/Makefile.am @@ -0,0 +1,14 @@ +MAINTAINERCLEANFILES = Makefile.in + +# get our env variables +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk + +infolibdir = $(CDE_INSTALLATION_TOP)/infolib/etc +infolib_PROGRAMS = valBase + +valBase_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) +valBase_LDADD = $(MMDB_LIBS) $(DTCLIENTLIBS) $(XTOOLLIB) +valBase_SOURCES = valBase.C + +infolib_SCRIPTS = DeInstallBase ChangeCaseTitle Librarian + diff --git a/cde/programs/dtinfo/dtinfogen/install/valBase.C b/cde/programs/dtinfo/dtinfogen/install/valBase.C index 4e97e6316..410b277b9 100644 --- a/cde/programs/dtinfo/dtinfogen/install/valBase.C +++ b/cde/programs/dtinfo/dtinfogen/install/valBase.C @@ -57,8 +57,9 @@ using namespace std; #include "oliasdb/mmdb.h" #include "oliasdb/asciiIn_filters.h" +// JET - don't need this - it (exit()) is defined in stdlib.h // DDK header file -#include "olGlobal.h" +// #include "olGlobal.h" // Debuggging macro int dbgLevel; diff --git a/cde/programs/dtinfo/dtinfogen/mmdb/StyleSheet/Makefile.am b/cde/programs/dtinfo/dtinfogen/mmdb/StyleSheet/Makefile.am new file mode 100644 index 000000000..e2aa7570c --- /dev/null +++ b/cde/programs/dtinfo/dtinfogen/mmdb/StyleSheet/Makefile.am @@ -0,0 +1,12 @@ +MAINTAINERCLEANFILES = Makefile.in + +# get our env variables +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk + +infolibdir = $(CDE_INSTALLATION_TOP)/infolib/etc +infolib_PROGRAMS = validator + +validator_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) +validator_LDADD = $(MMDB_LIBS) $(DTCLIENTLIBS) $(XTOOLLIB) +validator_SOURCES = validator.C + diff --git a/cde/programs/dtinfo/dtinfogen/mmdb/src/Makefile.am b/cde/programs/dtinfo/dtinfogen/mmdb/src/Makefile.am new file mode 100644 index 000000000..58bb74f27 --- /dev/null +++ b/cde/programs/dtinfo/dtinfogen/mmdb/src/Makefile.am @@ -0,0 +1,25 @@ +MAINTAINERCLEANFILES = Makefile.in + +# get our env variables +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk + +infolibdir = $(CDE_INSTALLATION_TOP)/infolib/etc +infolib_PROGRAMS = dbdrv + +dbdrv_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) +dbdrv_LDADD = $(MMDB_LIBS) $(DTCLIENTLIBS) $(XTOOLLIB) +dbdrv_SOURCES = main.C + +noinst_PROGRAMS = restore dbdrv_c_api + +restore_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) +restore_LDADD = $(MMDB_LIBS) $(DTCLIENTLIBS) $(XTOOLLIB) +restore_SOURCES = restore.C + +dbdrv_c_api_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) +dbdrv_c_api_LDADD = $(MMDB_LIBS_C_API) $(WWL_LIBS) \ + $(DTCLIENTLIBS) $(XTOOLLIB) +dbdrv_c_api_SOURCES = main_c_api.c + + + From e26c8fb9a4051db6ebbcc9bd5db59a8f0f2d167b Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Wed, 8 Dec 2021 16:58:05 -0700 Subject: [PATCH 12/25] doc/C/guides: build the TOCs --- cde/configure.ac | 1 + cde/doc/C/Makefile.am | 3 +- cde/doc/C/guides/Makefile.am | 27 ++ cde/doc/C/guides/builderGuide/Title.am | 3 + cde/doc/C/guides/docbookGuide/Title.am | 3 + cde/doc/C/guides/dtkshGuide/Title.am | 3 + cde/doc/C/guides/glossary/Title.am | 3 + cde/doc/C/guides/helpGuide/Title.am | 3 + cde/doc/C/guides/i18nGuide/Title.am | 3 + cde/doc/C/guides/infoAPg/Title.am | 3 + cde/doc/C/guides/infoUGd/Title.am | 3 + cde/doc/C/guides/man/Title.am | 3 + cde/doc/C/guides/progGuide/Title.am | 3 + cde/doc/C/guides/progOview/Title.am | 3 + cde/doc/C/guides/sysAdminGuide/Title.am | 3 + cde/doc/C/guides/ttGuide/Title.am | 3 + cde/doc/C/guides/usersGuide/Title.am | 3 + cde/doc/common/guides/builderGuide.am | 72 +++++ cde/doc/common/guides/docbookGuide.am | 16 ++ cde/doc/common/guides/dtkshGuide.am | 30 ++ cde/doc/common/guides/glossary.am | 16 ++ cde/doc/common/guides/guides_env.am | 29 ++ cde/doc/common/guides/helpGuide.am | 55 ++++ cde/doc/common/guides/i18nGuide.am | 29 ++ cde/doc/common/guides/infoAPGuide.am | 29 ++ cde/doc/common/guides/infoUGuide.am | 42 +++ cde/doc/common/guides/man.am | 364 ++++++++++++++++++++++++ cde/doc/common/guides/progGuide.am | 32 +++ cde/doc/common/guides/progOview.am | 27 ++ cde/doc/common/guides/sysAdminGuide.am | 67 +++++ cde/doc/common/guides/ttGuide.am | 19 ++ cde/doc/common/guides/usersGuide.am | 122 ++++++++ 32 files changed, 1020 insertions(+), 2 deletions(-) create mode 100644 cde/doc/C/guides/Makefile.am create mode 100644 cde/doc/C/guides/builderGuide/Title.am create mode 100644 cde/doc/C/guides/docbookGuide/Title.am create mode 100644 cde/doc/C/guides/dtkshGuide/Title.am create mode 100644 cde/doc/C/guides/glossary/Title.am create mode 100644 cde/doc/C/guides/helpGuide/Title.am create mode 100644 cde/doc/C/guides/i18nGuide/Title.am create mode 100644 cde/doc/C/guides/infoAPg/Title.am create mode 100644 cde/doc/C/guides/infoUGd/Title.am create mode 100644 cde/doc/C/guides/man/Title.am create mode 100644 cde/doc/C/guides/progGuide/Title.am create mode 100644 cde/doc/C/guides/progOview/Title.am create mode 100644 cde/doc/C/guides/sysAdminGuide/Title.am create mode 100644 cde/doc/C/guides/ttGuide/Title.am create mode 100644 cde/doc/C/guides/usersGuide/Title.am create mode 100644 cde/doc/common/guides/builderGuide.am create mode 100644 cde/doc/common/guides/docbookGuide.am create mode 100644 cde/doc/common/guides/dtkshGuide.am create mode 100644 cde/doc/common/guides/glossary.am create mode 100644 cde/doc/common/guides/guides_env.am create mode 100644 cde/doc/common/guides/helpGuide.am create mode 100644 cde/doc/common/guides/i18nGuide.am create mode 100644 cde/doc/common/guides/infoAPGuide.am create mode 100644 cde/doc/common/guides/infoUGuide.am create mode 100644 cde/doc/common/guides/man.am create mode 100644 cde/doc/common/guides/progGuide.am create mode 100644 cde/doc/common/guides/progOview.am create mode 100644 cde/doc/common/guides/sysAdminGuide.am create mode 100644 cde/doc/common/guides/ttGuide.am create mode 100644 cde/doc/common/guides/usersGuide.am diff --git a/cde/configure.ac b/cde/configure.ac index 9d4d610c4..fb30f1a3a 100644 --- a/cde/configure.ac +++ b/cde/configure.ac @@ -831,6 +831,7 @@ doc/util/dbtoman/instant/Makefile doc/C/Makefile doc/C/help/Makefile doc/C/man/Makefile +doc/C/guides/Makefile doc/de_DE.ISO8859-1/Makefile doc/de_DE.ISO8859-1/help/Makefile diff --git a/cde/doc/C/Makefile.am b/cde/doc/C/Makefile.am index ac359b2cd..ef4c09585 100644 --- a/cde/doc/C/Makefile.am +++ b/cde/doc/C/Makefile.am @@ -1,5 +1,4 @@ MAINTAINERCLEANFILES = Makefile.in -SUBDIRS = help man -# NOTYET = guides +SUBDIRS = help man guides diff --git a/cde/doc/C/guides/Makefile.am b/cde/doc/C/guides/Makefile.am new file mode 100644 index 000000000..7cf5b6ccb --- /dev/null +++ b/cde/doc/C/guides/Makefile.am @@ -0,0 +1,27 @@ +MAINTAINERCLEANFILES = Makefile.in + +INFOLIBDESC = "CDE and Motif Information Library" + +# get some important variables +include $(top_srcdir)/doc/common/guides/guides_env.am + +# prime the pump +BUILT_SOURCES = +CLEANFILES = + +# this sets the LANG and HELP_LANG variables +include $(top_srcdir)/programs/localized/templates/C.am + +# build guides +include $(top_srcdir)/doc/common/guides/usersGuide.am +include $(top_srcdir)/doc/common/guides/infoUGuide.am +include $(top_srcdir)/doc/common/guides/infoAPGuide.am +include $(top_srcdir)/doc/common/guides/sysAdminGuide.am +include $(top_srcdir)/doc/common/guides/progGuide.am +include $(top_srcdir)/doc/common/guides/man.am +include $(top_srcdir)/doc/common/guides/builderGuide.am +include $(top_srcdir)/doc/common/guides/dtkshGuide.am +include $(top_srcdir)/doc/common/guides/glossary.am +include $(top_srcdir)/doc/common/guides/progOview.am +include $(top_srcdir)/doc/common/guides/ttGuide.am + diff --git a/cde/doc/C/guides/builderGuide/Title.am b/cde/doc/C/guides/builderGuide/Title.am new file mode 100644 index 000000000..aeb03b47a --- /dev/null +++ b/cde/doc/C/guides/builderGuide/Title.am @@ -0,0 +1,3 @@ +# $XConsortium: Title.tmpl /main/2 1996/06/19 16:02:53 drk $ +# TOC title, only what's between quotes should be modified. +BUILDERGUIDE_TITLE = "Application Builder User's Guide" diff --git a/cde/doc/C/guides/docbookGuide/Title.am b/cde/doc/C/guides/docbookGuide/Title.am new file mode 100644 index 000000000..399575113 --- /dev/null +++ b/cde/doc/C/guides/docbookGuide/Title.am @@ -0,0 +1,3 @@ +# $XConsortium: Title.tmpl /main/2 1996/06/19 16:03:03 drk $ +# TOC title, only what's between quotes should be modified. +DOCBOOKGUIDE_TITLE = "Guide to the DocBook DTD" diff --git a/cde/doc/C/guides/dtkshGuide/Title.am b/cde/doc/C/guides/dtkshGuide/Title.am new file mode 100644 index 000000000..dd7f08053 --- /dev/null +++ b/cde/doc/C/guides/dtkshGuide/Title.am @@ -0,0 +1,3 @@ +# $XConsortium: Title.tmpl /main/2 1996/06/19 16:03:17 drk $ +# TOC title, only what's between quotes should be modified. +DTKSHGUIDE_TITLE = "Desktop KornShell User's Guide" diff --git a/cde/doc/C/guides/glossary/Title.am b/cde/doc/C/guides/glossary/Title.am new file mode 100644 index 000000000..2aae9e13c --- /dev/null +++ b/cde/doc/C/guides/glossary/Title.am @@ -0,0 +1,3 @@ +# $XConsortium: Title.tmpl /main/2 1996/06/19 16:03:29 drk $ +# TOC title, only what's between quotes should be modified. +GLOSSARY_TITLE = "Product Glossary" diff --git a/cde/doc/C/guides/helpGuide/Title.am b/cde/doc/C/guides/helpGuide/Title.am new file mode 100644 index 000000000..84d727992 --- /dev/null +++ b/cde/doc/C/guides/helpGuide/Title.am @@ -0,0 +1,3 @@ +# $XConsortium: Title.tmpl /main/2 1996/06/19 16:03:46 drk $ +# TOC title, only what's between quotes should be modified. +HELPGUIDE_TITLE = "Help System Author's and Programmer's Guide" diff --git a/cde/doc/C/guides/i18nGuide/Title.am b/cde/doc/C/guides/i18nGuide/Title.am new file mode 100644 index 000000000..24913078b --- /dev/null +++ b/cde/doc/C/guides/i18nGuide/Title.am @@ -0,0 +1,3 @@ +# $XConsortium: Title.tmpl /main/2 1996/06/19 16:03:55 drk $ +# TOC title, only what's between quotes should be modified. +I18NGUIDE_TITLE = "Internationalization Programmer's Guide" diff --git a/cde/doc/C/guides/infoAPg/Title.am b/cde/doc/C/guides/infoAPg/Title.am new file mode 100644 index 000000000..e28dbc5e2 --- /dev/null +++ b/cde/doc/C/guides/infoAPg/Title.am @@ -0,0 +1,3 @@ +# $XConsortium: Title.tmpl /main/1 1996/09/22 13:54:15 rws $ +# TOC title, only what's between quotes should be modified. +INFOAPGUIDE_TITLE = "Information System Author's and Programmer's Guide" diff --git a/cde/doc/C/guides/infoUGd/Title.am b/cde/doc/C/guides/infoUGd/Title.am new file mode 100644 index 000000000..5ecb023c4 --- /dev/null +++ b/cde/doc/C/guides/infoUGd/Title.am @@ -0,0 +1,3 @@ +# $XConsortium: Title.tmpl /main/1 1996/08/03 11:34:45 rws $ +# TOC title, only what's between quotes should be modified. +INFOUGUIDE_TITLE = "Information Manager User's Guide" diff --git a/cde/doc/C/guides/man/Title.am b/cde/doc/C/guides/man/Title.am new file mode 100644 index 000000000..2ad7e5a3c --- /dev/null +++ b/cde/doc/C/guides/man/Title.am @@ -0,0 +1,3 @@ +# $XConsortium: Title.tmpl /main/1 1996/07/21 20:42:11 rws $ +# TOC title, only what's between quotes should be modified. +MAN_TITLE = "Programmer's Reference" diff --git a/cde/doc/C/guides/progGuide/Title.am b/cde/doc/C/guides/progGuide/Title.am new file mode 100644 index 000000000..db4301e19 --- /dev/null +++ b/cde/doc/C/guides/progGuide/Title.am @@ -0,0 +1,3 @@ +# $XConsortium: Title.tmpl /main/2 1996/06/19 16:04:02 drk $ +# TOC title, only what's between quotes should be modified. +PROGGUIDE_TITLE = "Programmer's Guide" diff --git a/cde/doc/C/guides/progOview/Title.am b/cde/doc/C/guides/progOview/Title.am new file mode 100644 index 000000000..02d55aa3b --- /dev/null +++ b/cde/doc/C/guides/progOview/Title.am @@ -0,0 +1,3 @@ +# $XConsortium: Title.tmpl /main/2 1996/06/19 16:04:23 drk $ +# TOC title, only what's between quotes should be modified. +PROGOVIEW_TITLE = "Programmer's Overview" diff --git a/cde/doc/C/guides/sysAdminGuide/Title.am b/cde/doc/C/guides/sysAdminGuide/Title.am new file mode 100644 index 000000000..6ef98c844 --- /dev/null +++ b/cde/doc/C/guides/sysAdminGuide/Title.am @@ -0,0 +1,3 @@ +# $XConsortium: Title.tmpl /main/2 1996/06/19 16:04:46 drk $ +# TOC title, only what's between quotes should be modified. +SYSADMINGUIDE_TITLE = "Advanced User's and System Administrator's Guide" diff --git a/cde/doc/C/guides/ttGuide/Title.am b/cde/doc/C/guides/ttGuide/Title.am new file mode 100644 index 000000000..077c436ee --- /dev/null +++ b/cde/doc/C/guides/ttGuide/Title.am @@ -0,0 +1,3 @@ +# $XConsortium: Title.tmpl /main/2 1996/06/19 16:05:00 drk $ +# TOC title, only what's between quotes should be modified. +TTGUIDE_TITLE = "ToolTalk Messaging Guide" diff --git a/cde/doc/C/guides/usersGuide/Title.am b/cde/doc/C/guides/usersGuide/Title.am new file mode 100644 index 000000000..7ff6699aa --- /dev/null +++ b/cde/doc/C/guides/usersGuide/Title.am @@ -0,0 +1,3 @@ +# $XConsortium: Title.tmpl /main/2 1996/06/19 16:05:11 drk $ +# TOC title, only what's between quotes should be modified. +USERSGUIDE_TITLE = "User's Guide" diff --git a/cde/doc/common/guides/builderGuide.am b/cde/doc/common/guides/builderGuide.am new file mode 100644 index 000000000..2d20d5b5a --- /dev/null +++ b/cde/doc/common/guides/builderGuide.am @@ -0,0 +1,72 @@ +# build a guide + +BUILDERGUIDE_SRCS = \ + builderGuide/BEntity.sgm builderGuide/ch05.sgm \ + builderGuide/appa.sgm builderGuide/ch06.sgm \ + builderGuide/appb.sgm builderGuide/ch07.sgm \ + builderGuide/book.sgm builderGuide/ch08.sgm \ + builderGuide/ch01.sgm builderGuide/ch09.sgm \ + builderGuide/ch02.sgm \ + builderGuide/ch03.sgm builderGuide/preface.sgm \ + builderGuide/ch04.sgm + +BUILDERGUIDE_GRS = \ + builderGuide/graphics/AlignMen.tif \ + builderGuide/graphics/AppFrmEd.tif \ + builderGuide/graphics/AttIcS5.tif \ + builderGuide/graphics/AttIcSi1.tif \ + builderGuide/graphics/AttIcSi2.tif \ + builderGuide/graphics/AttIcSi3.tif \ + builderGuide/graphics/AttIcSi4.tif \ + builderGuide/graphics/AttIcSi6.tif \ + builderGuide/graphics/AttIcTp1.tif \ + builderGuide/graphics/AttIcTp2.tif \ + builderGuide/graphics/AttIcTp3.tif \ + builderGuide/graphics/AttIcTp4.tif \ + builderGuide/graphics/AttIcTp5.tif \ + builderGuide/graphics/AttIcTp6.tif \ + builderGuide/graphics/AttIcTp7.tif \ + builderGuide/graphics/AttachEd.tif \ + builderGuide/graphics/BrowsMW.tif \ + builderGuide/graphics/CGEnvOpt.tif \ + builderGuide/graphics/CGOption.tif \ + builderGuide/graphics/CodeGen.tif \ + builderGuide/graphics/ColChoos.tif \ + builderGuide/graphics/ConnEd.tif \ + builderGuide/graphics/CtrlPIcO.tif \ + builderGuide/graphics/CustDIcO.tif \ + builderGuide/graphics/DistMenu.tif \ + builderGuide/graphics/DnDEdit.tif \ + builderGuide/graphics/DrawAIcO.tif \ + builderGuide/graphics/DtIcon.tif \ + builderGuide/graphics/FSDIcO.tif \ + builderGuide/graphics/HelpEdit.tif \ + builderGuide/graphics/ItemsSub.tif \ + builderGuide/graphics/MWwCP.tif \ + builderGuide/graphics/MWwSpanP.tif \ + builderGuide/graphics/MainWIcO.tif \ + builderGuide/graphics/MainWin.tif \ + builderGuide/graphics/MenuChoi.tif \ + builderGuide/graphics/MsgEdit.tif \ + builderGuide/graphics/NameMod.tif \ + builderGuide/graphics/NameProj.tif \ + builderGuide/graphics/PanedWin.tif \ + builderGuide/graphics/PrjOModA.tif \ + builderGuide/graphics/ProjOrg.tif \ + builderGuide/graphics/PrpEdSep.tif \ + builderGuide/graphics/TermPIcO.tif \ + builderGuide/graphics/TextPIcO.tif + +$(INFOLIB)/$(BOOKCASE)/dtsearch/dtsearch.ocf: $(BUILDERGUIDE_GRS) + +BUILDERGUIDE_ID = cde.builderGuide.toc +include builderGuide/Title.am + +BUILDERGUIDE_TOC = builderGuide/TOC.sgm +$(INFOLIB)/$(BOOKCASE)/dtsearch/dtsearch.ocf: $(BUILDERGUIDE_TOC) + +$(BUILDERGUIDE_TOC): $(BUILDERGUIDE_SRCS) + $(DGENV) $(DTINFOGEN) tocgen -T $(DTINFOGENTMPDIR) $(DTINFOGENOPTIONS) -f $(BUILDERGUIDE_TOC) -id $(BUILDERGUIDE_ID) -title $(BUILDERGUIDE_TITLE) builderGuide/book.sgm + +BUILT_SOURCES += $(BUILDERGUIDE_TOC) +CLEANFILES += $(BUILDERGUIDE_TOC) diff --git a/cde/doc/common/guides/docbookGuide.am b/cde/doc/common/guides/docbookGuide.am new file mode 100644 index 000000000..5e21c55a8 --- /dev/null +++ b/cde/doc/common/guides/docbookGuide.am @@ -0,0 +1,16 @@ +# build a guide + +DOCBOOKGUIDE_SRCS = \ + docbookGuide/book.sgm + +DOCBOOKGUIDE_ID = cde.docbookGuide.toc +include docbookGuide/Title.am + +DOCBOOKGUIDE_TOC = docbookGuide/TOC.sgm +$(INFOLIB)/$(BOOKCASE)/dtsearch/dtsearch.ocf: $(DOCBOOKGUIDE_TOC) + +$(DOCBOOKGUIDE_TOC): $(DOCBOOKGUIDE_SRCS) + $(DGENV) $(DTINFOGEN) tocgen -T $(DTINFOGENTMPDIR) $(DTINFOGENOPTIONS) -f $(DOCBOOKGUIDE_TOC) -id $(DOCBOOKGUIDE_ID) -title $(DOCBOOKGUIDE_TITLE) docbookGuide/book.sgm + +BUILT_SOURCES += $(DOCBOOKGUIDE_TOC) +CLEANFILES += $(DOCBOOKGUIDE_TOC) diff --git a/cde/doc/common/guides/dtkshGuide.am b/cde/doc/common/guides/dtkshGuide.am new file mode 100644 index 000000000..9bac9a7a7 --- /dev/null +++ b/cde/doc/common/guides/dtkshGuide.am @@ -0,0 +1,30 @@ +# build a guide + +DTKSHGUIDE_SRCS = \ + dtkshGuide/BEntity.sgm dtkshGuide/ch02.sgm \ + dtkshGuide/appa.sgm dtkshGuide/ch03.sgm \ + dtkshGuide/appb.sgm dtkshGuide/ch04.sgm \ + dtkshGuide/appc.sgm \ + dtkshGuide/book.sgm dtkshGuide/preface.sgm \ + dtkshGuide/ch01.sgm + +DTKSHGUIDE_GRS = \ + dtkshGuide/graphics/area1.tif dtkshGuide/graphics/finderr.tif \ + dtkshGuide/graphics/area2.tif dtkshGuide/graphics/findterm.tif \ + dtkshGuide/graphics/area3.tif dtkshGuide/graphics/findwin.tif \ + dtkshGuide/graphics/area4.tif dtkshGuide/graphics/labfindw.tif \ + dtkshGuide/graphics/dttest1.tif + +$(INFOLIB)/$(BOOKCASE)/dtsearch/dtsearch.ocf: $(DTKSHGUIDE_GRS) + +DTKSHGUIDE_ID = cde.dtkshGuide.toc +include dtkshGuide/Title.am + +DTKSHGUIDE_TOC = dtkshGuide/TOC.sgm +$(INFOLIB)/$(BOOKCASE)/dtsearch/dtsearch.ocf: $(DTKSHGUIDE_TOC) + +$(DTKSHGUIDE_TOC): $(DTKSHGUIDE_SRCS) + $(DGENV) $(DTINFOGEN) tocgen -T $(DTINFOGENTMPDIR) $(DTINFOGENOPTIONS) -f $(DTKSHGUIDE_TOC) -id $(DTKSHGUIDE_ID) -title $(DTKSHGUIDE_TITLE) dtkshGuide/book.sgm + +BUILT_SOURCES += $(DTKSHGUIDE_TOC) +CLEANFILES += $(DTKSHGUIDE_TOC) diff --git a/cde/doc/common/guides/glossary.am b/cde/doc/common/guides/glossary.am new file mode 100644 index 000000000..8e6b74735 --- /dev/null +++ b/cde/doc/common/guides/glossary.am @@ -0,0 +1,16 @@ +# build a guide + +GLOSSARY_SRCS = \ + glossary/book.sgm glossary/glossary.sgm + +GLOSSARY_ID = cde.glossary.toc +include glossary/Title.am + +GLOSSARY_TOC = glossary/TOC.sgm +$(INFOLIB)/$(BOOKCASE)/dtsearch/dtsearch.ocf: $(GLOSSARY_TOC) + +$(GLOSSARY_TOC): $(GLOSSARY_SRCS) + $(DGENV) $(DTINFOGEN) tocgen -T $(DTINFOGENTMPDIR) $(DTINFOGENOPTIONS) -f $(GLOSSARY_TOC) -id $(GLOSSARY_ID) -title $(GLOSSARY_TITLE) glossary/book.sgm + +BUILT_SOURCES += $(GLOSSARY_TOC) +CLEANFILES += $(GLOSSARY_TOC) diff --git a/cde/doc/common/guides/guides_env.am b/cde/doc/common/guides/guides_env.am new file mode 100644 index 000000000..f3ed77f69 --- /dev/null +++ b/cde/doc/common/guides/guides_env.am @@ -0,0 +1,29 @@ +# make include file: env variables needed for the guides + +INFOLIB = ../cde.dti +BOOKCASE = CDEDOC + +INFOLIBNAME = -n cde +# INFOLIBDESC = -d InfoLibDesc +SSENTS = -m common/catalog +DGENV = LANG=$(LANG) SGML_SEARCH_PATH=".:.." +DTINFOGENOPTIONS = $(INFOLIBNAME) -d $(INFOLIBDESC) + +# Note the triple-dollar sign - this escapes $$ (pid) for the tmp dir +DTINFOGENTMPDIR = /tmp/guides.$$$ + +DTHELPSRC = $(top_srcdir)/lib/DtHelp +DTLCXENVSETUP = DTLCXSEARCHPATH=$(DTHELPSRC) +DTINFOGENSRC = $(top_srcdir)/programs/dtinfo/dtinfogen +SGMLDIR = $(top_builddir)/programs/nsgmls +DTSRDIR = $(top_builddir)/programs/dtsr + +DTINFOGEN = $(DTLCXENVSETUP) DTINFO_HOME=$(DTINFOGENSRC) \ + DTINFO_BIN=$(DTINFOGENSRC)/install:$(DTINFOGENSRC)/mmdb/StyleSheet:$(DTINFOGENSRC)/mmdb/src:$(SGMLDIR):$(DTSRDIR) \ + $(DTINFOGENSRC)/infolib/etc/dtinfogen + +SGMLDIR = $(top_srcdir)/programs/dtinfo/dtinfogen/infolib/C/SGML +SGMLDEPS = $(SGMLDIR)/docbook.dtd $(SGMLDIR)/iso-box.gml \ + $(SGMLDIR)/iso-dia.gml $(SGMLDIR)/iso-grk3.gml $(SGMLDIR)/iso-lat1.gml \ + $(SGMLDIR)/iso-lat2.gml $(SGMLDIR)/iso-num.gml $(SGMLDIR)/iso-pub.gml \ + $(SGMLDIR)/iso-tech.gml diff --git a/cde/doc/common/guides/helpGuide.am b/cde/doc/common/guides/helpGuide.am new file mode 100644 index 000000000..86279daba --- /dev/null +++ b/cde/doc/common/guides/helpGuide.am @@ -0,0 +1,55 @@ +# build a guide + +HELPGUIDE_SRCS = \ + helpGuide/BEntity.sgm helpGuide/ch10.sgm \ + helpGuide/book.sgm helpGuide/ch11.sgm \ + helpGuide/ch01.sgm helpGuide/ch12.sgm \ + helpGuide/ch02.sgm helpGuide/ch13.sgm \ + helpGuide/ch03.sgm helpGuide/glossary.sgm \ + helpGuide/ch04.sgm helpGuide/part1.sgm \ + helpGuide/ch05.sgm helpGuide/part2.sgm \ + helpGuide/ch06.sgm helpGuide/part3.sgm \ + helpGuide/ch07.sgm helpGuide/part4.sgm \ + helpGuide/ch08.sgm helpGuide/preface.sgm \ + helpGuide/ch09.sgm + +HELPGUIDE_GRS = \ + helpGuide/graphics/Approot.tif helpGuide/graphics/ExTHyper.tif \ + helpGuide/graphics/BldInst.tif helpGuide/graphics/ExVex.tif \ + helpGuide/graphics/BuildDir.tif helpGuide/graphics/ExWrapGr.tif \ + helpGuide/graphics/CharEntU.tif helpGuide/graphics/ExXref.tif \ + helpGuide/graphics/CharEntV.tif helpGuide/graphics/FMCompil.tif \ + helpGuide/graphics/ExAnnot.tif helpGuide/graphics/FMhelpfs.tif \ + helpGuide/graphics/ExBuList.tif helpGuide/graphics/FPanel.tif \ + helpGuide/graphics/ExCautio.tif helpGuide/graphics/FmtTable.tif \ + helpGuide/graphics/ExComput.tif helpGuide/graphics/GHelpLB.tif \ + helpGuide/graphics/ExEx.tif helpGuide/graphics/GenHelp.tif \ + helpGuide/graphics/ExHTopic.tif helpGuide/graphics/GrEntity.tif \ + helpGuide/graphics/ExInliGr.tif helpGuide/graphics/HelpMenu.tif \ + helpGuide/graphics/ExKeycap.tif helpGuide/graphics/HelpMgr.tif \ + helpGuide/graphics/ExLaLstH.tif helpGuide/graphics/HelpOrg.tif \ + helpGuide/graphics/ExLaNowr.tif helpGuide/graphics/HelpVol.tif \ + helpGuide/graphics/ExLalst1.tif helpGuide/graphics/HyperFmt.tif \ + helpGuide/graphics/ExLalstW.tif helpGuide/graphics/Icons.tif \ + helpGuide/graphics/ExListHd.tif helpGuide/graphics/IndexNum.tif \ + helpGuide/graphics/ExLists.tif helpGuide/graphics/IndxSrch.tif \ + helpGuide/graphics/ExNoteHd.tif helpGuide/graphics/PrintDlg.tif \ + helpGuide/graphics/ExNuList.tif helpGuide/graphics/Process.tif \ + helpGuide/graphics/ExOthrHd.tif helpGuide/graphics/QuickHlp.tif \ + helpGuide/graphics/ExPHead.tif helpGuide/graphics/Topics.tif \ + helpGuide/graphics/ExProc2.tif helpGuide/graphics/ViewVol.tif \ + helpGuide/graphics/ExProced.tif + +$(INFOLIB)/$(BOOKCASE)/dtsearch/dtsearch.ocf: $(HELPGUIDE_GRS) + +HELPGUIDE_ID = cde.helpGuide.toc +include helpGuide/Title.am + +HELPGUIDE_TOC = helpGuide/TOC.sgm +$(INFOLIB)/$(BOOKCASE)/dtsearch/dtsearch.ocf: $(HELPGUIDE_TOC) + +$(HELPGUIDE_TOC): $(HELPGUIDE_SRCS) + $(DGENV) $(DTINFOGEN) tocgen -T $(DTINFOGENTMPDIR) $(DTINFOGENOPTIONS) -f $(HELPGUIDE_TOC) -id $(HELPGUIDE_ID) -title $(HELPGUIDE_TITLE) helpGuide/book.sgm + +BUILT_SOURCES += $(HELPGUIDE_TOC) +CLEANFILES += $(HELPGUIDE_TOC) diff --git a/cde/doc/common/guides/i18nGuide.am b/cde/doc/common/guides/i18nGuide.am new file mode 100644 index 000000000..faa0afb36 --- /dev/null +++ b/cde/doc/common/guides/i18nGuide.am @@ -0,0 +1,29 @@ +# build a guide + +I18NGUIDE_SRCS = \ + i18nGuide/BEntity.sgm i18nGuide/ch03.sgm \ + i18nGuide/appa.sgm i18nGuide/ch04.sgm \ + i18nGuide/book.sgm \ + i18nGuide/ch01.sgm i18nGuide/preface.sgm \ + i18nGuide/ch02.sgm + +I18NGUIDE_GRS = \ + i18nGuide/graphics/ind1.cgm i18nGuide/graphics/inint5.tif \ + i18nGuide/graphics/inint1.cgm i18nGuide/graphics/inint6.tif \ + i18nGuide/graphics/inint2.cgm i18nGuide/graphics/inmot3.tif \ + i18nGuide/graphics/inint3.tif i18nGuide/graphics/inmot4.tif \ + i18nGuide/graphics/inint4.tif + +$(INFOLIB)/$(BOOKCASE)/dtsearch/dtsearch.ocf: $(I18NGUIDE_GRS) + +I18NGUIDE_ID = cde.i18nGuide.toc +include i18nGuide/Title.am + +I18NGUIDE_TOC = i18nGuide/TOC.sgm +$(INFOLIB)/$(BOOKCASE)/dtsearch/dtsearch.ocf: $(I18NGUIDE_TOC) + +$(I18NGUIDE_TOC): $(I18NGUIDE_SRCS) + $(DGENV) $(DTINFOGEN) tocgen -T $(DTINFOGENTMPDIR) $(DTINFOGENOPTIONS) -f $(I18NGUIDE_TOC) -id $(I18NGUIDE_ID) -title $(I18NGUIDE_TITLE) i18nGuide/book.sgm + +BUILT_SOURCES += $(I18NGUIDE_TOC) +CLEANFILES += $(I18NGUIDE_TOC) diff --git a/cde/doc/common/guides/infoAPGuide.am b/cde/doc/common/guides/infoAPGuide.am new file mode 100644 index 000000000..40a038aa5 --- /dev/null +++ b/cde/doc/common/guides/infoAPGuide.am @@ -0,0 +1,29 @@ +# build a guide + +INFOAPGUIDE_SRCS = \ + infoAPg/BEntity.sgm infoAPg/ch04.sgm infoAPg/ch09.sgm \ + infoAPg/book.sgm infoAPg/ch05.sgm infoAPg/ch10.sgm \ + infoAPg/ch01.sgm infoAPg/ch06.sgm infoAPg/ch11.sgm \ + infoAPg/ch02.sgm infoAPg/ch07.sgm infoAPg/glossary.sgm \ + infoAPg/ch03.sgm infoAPg/ch08.sgm infoAPg/preface.sgm + +INFOAPGUIDE_GRS = \ + infoAPg/graphics/addbkcas.cgm infoAPg/graphics/infostr.cgm \ + infoAPg/graphics/bkcase.cgm infoAPg/graphics/multss.cgm \ + infoAPg/graphics/blddir.cgm infoAPg/graphics/newlib.cgm \ + infoAPg/graphics/docsrc.cgm infoAPg/graphics/repbkcas.cgm \ + infoAPg/graphics/docuhier.cgm infoAPg/graphics/tlkitmod.cgm + +$(INFOLIB)/$(BOOKCASE)/dtsearch/dtsearch.ocf: $(INFOAPGUIDE_GRS) + +INFOAPGUIDE_ID = cde.infoAPGuide.toc +include infoAPg/Title.am + +INFOAPGUIDE_TOC = infoAPg/TOC.sgm +$(INFOLIB)/$(BOOKCASE)/dtsearch/dtsearch.ocf: $(INFOAPGUIDE_TOC) + +$(INFOAPGUIDE_TOC): $(INFOAPGUIDE_SRCS) + $(DGENV) $(DTINFOGEN) tocgen -T $(DTINFOGENTMPDIR) $(DTINFOGENOPTIONS) -f $(INFOAPGUIDE_TOC) -id $(INFOAPGUIDE_ID) -title $(INFOAPGUIDE_TITLE) infoAPg/book.sgm + +BUILT_SOURCES += $(INFOAPGUIDE_TOC) +CLEANFILES += $(INFOAPGUIDE_TOC) diff --git a/cde/doc/common/guides/infoUGuide.am b/cde/doc/common/guides/infoUGuide.am new file mode 100644 index 000000000..addad82bc --- /dev/null +++ b/cde/doc/common/guides/infoUGuide.am @@ -0,0 +1,42 @@ +# build a guide + +INFOUGUIDE_SRCS = \ + infoUGd/BEntity.sgm infoUGd/ch03.sgm infoUGd/ch07.sgm \ + infoUGd/book.sgm infoUGd/ch04.sgm infoUGd/ch08.sgm \ + infoUGd/ch01.sgm infoUGd/ch05.sgm infoUGd/glossary.sgm \ + infoUGd/ch02.sgm infoUGd/ch06.sgm infoUGd/preface.sgm + +INFOUGUIDE_GRS = \ + infoUGd/graphics/bklist.tif infoUGd/graphics/infolib1.cgm \ + infoUGd/graphics/bklist1.tif infoUGd/graphics/infosub.tif \ + infoUGd/graphics/bkmark.tif infoUGd/graphics/mappref.tif \ + infoUGd/graphics/bkmarks.tif infoUGd/graphics/openloca.tif \ + infoUGd/graphics/bkmkedit.tif infoUGd/graphics/prefwin.tif \ + infoUGd/graphics/bknote.tif infoUGd/graphics/printwin.tif \ + infoUGd/graphics/brwsbuts.tif infoUGd/graphics/pushpin.tif \ + infoUGd/graphics/dgrafico.tif infoUGd/graphics/qeditwin.tif \ + infoUGd/graphics/fpico.tif infoUGd/graphics/readwin.tif \ + infoUGd/graphics/gmap.tif infoUGd/graphics/readwin1.tif \ + infoUGd/graphics/graphmap.tif infoUGd/graphics/savescop.tif \ + infoUGd/graphics/scopedit.tif \ + infoUGd/graphics/graphpan.tif infoUGd/graphics/scoplist.tif \ + infoUGd/graphics/graphwin.tif infoUGd/graphics/searchin.tif \ + infoUGd/graphics/helpmenu.tif infoUGd/graphics/sectitle.tif \ + infoUGd/graphics/histlist.tif infoUGd/graphics/serchbut.tif \ + infoUGd/graphics/histpref.tif infoUGd/graphics/serchprf.tif \ + infoUGd/graphics/hsarrows.tif infoUGd/graphics/serchres.tif \ + infoUGd/graphics/ilibico.tif infoUGd/graphics/shistwin.tif + +$(INFOLIB)/$(BOOKCASE)/dtsearch/dtsearch.ocf: $(INFOUGUIDE_GRS) + +INFOUGUIDE_ID = cde.infoUGuide.toc +include infoUGd/Title.am + +INFOUGUIDE_TOC = infoUGd/TOC.sgm +$(INFOLIB)/$(BOOKCASE)/dtsearch/dtsearch.ocf: $(INFOUGUIDE_TOC) + +$(INFOUGUIDE_TOC): $(INFOUGUIDE_SRCS) + $(DGENV) $(DTINFOGEN) tocgen -T $(DTINFOGENTMPDIR) $(DTINFOGENOPTIONS) -f $(INFOUGUIDE_TOC) -id $(INFOUGUIDE_ID) -title $(INFOUGUIDE_TITLE) infoUGd/book.sgm + +BUILT_SOURCES += $(INFOUGUIDE_TOC) +CLEANFILES += $(INFOUGUIDE_TOC) diff --git a/cde/doc/common/guides/man.am b/cde/doc/common/guides/man.am new file mode 100644 index 000000000..0ec2bb62f --- /dev/null +++ b/cde/doc/common/guides/man.am @@ -0,0 +1,364 @@ +# build a guide + +MAN_SRCS1 = \ + man/SEntity.sgm man/book.sgm \ + man/ref1.sgm man/ref5.sgm man/refDtWid.sgm \ + man/ref1m.sgm man/ref6.sgm man/refcsa.sgm \ + man/ref4.sgm man/refDtFcn.sgm man/reftt.sgm \ + common/ManLinks.sgm \ + ../../../doc/C/guides/common/ManLinks.sgm + +MAN_SRCS2 = \ + man/m3_Dt/ActionCa.sgm man/m3_Dt/MmdbBGST.sgm \ + man/m3_Dt/ActionDe.sgm man/m3_Dt/MmdbBGTL.sgm \ + man/m3_Dt/ActionEx.sgm man/m3_Dt/MmdbBGTO.sgm \ + man/m3_Dt/ActionIc.sgm man/m3_Dt/MmdbBkGL.sgm \ + man/m3_Dt/ActionIn.sgm man/m3_Dt/MmdbClIL.sgm \ + man/m3_Dt/ActionLa.sgm man/m3_Dt/MmdbDGNS.sgm \ + man/m3_Dt/ComboAdd.sgm man/m3_Dt/MmdbDGPS.sgm \ + man/m3_Dt/ComboBox.sgm man/m3_Dt/MmdbFrGI.sgm \ + man/m3_Dt/ComboDel.sgm man/m3_Dt/MmdbFrHL.sgm \ + man/m3_Dt/ComboSel.sgm man/m3_Dt/MmdbFrHn.sgm \ + man/m3_Dt/ComboSet.sgm man/m3_Dt/MmdbGBBI.sgm \ + man/m3_Dt/CreCombo.sgm man/m3_Dt/MmdbGBBL.sgm \ + man/m3_Dt/CreEdito.sgm man/m3_Dt/MmdbGBBN.sgm \ + man/m3_Dt/CreHelpD.sgm man/m3_Dt/MmdbGBLs.sgm \ + man/m3_Dt/CreHelpQ.sgm man/m3_Dt/MmdbGrGD.sgm \ + man/m3_Dt/CreMenuB.sgm man/m3_Dt/MmdbGrGI.sgm \ + man/m3_Dt/CreSpinB.sgm man/m3_Dt/MmdbILFI.sgm \ + man/m3_Dt/CreTerm.sgm man/m3_Dt/MmdbILGI.sgm \ + man/m3_Dt/CreatePr.sgm man/m3_Dt/MmdbInit.sgm \ + man/m3_Dt/DbLoad.sgm man/m3_Dt/MmdbLGSL.sgm \ + man/m3_Dt/DbReload.sgm man/m3_Dt/MmdbLGSO.sgm \ + man/m3_Dt/DndCreSI.sgm man/m3_Dt/MmdbOpIL.sgm \ + man/m3_Dt/DndDragS.sgm man/m3_Dt/MmdbQuit.sgm \ + man/m3_Dt/DndDropR.sgm man/m3_Dt/MmdbSGBI.sgm + +MAN_SRCS3 = \ + man/m3_Dt/DndDropU.sgm man/m3_Dt/MmdbSGDS.sgm \ + man/m3_Dt/EdAppFF.sgm man/m3_Dt/MmdbSGLT.sgm \ + man/m3_Dt/EdAppend.sgm man/m3_Dt/MmdbSGSS.sgm \ + man/m3_Dt/EdChange.sgm man/m3_Dt/MmdbSGST.sgm \ + man/m3_Dt/EdCheckF.sgm man/m3_Dt/MmdbSGTL.sgm \ + man/m3_Dt/EdClearS.sgm man/m3_Dt/MmdbSeGD.sgm \ + man/m3_Dt/EdCopyTo.sgm man/m3_Dt/MmdbSeGL.sgm \ + man/m3_Dt/EdCutToC.sgm man/m3_Dt/MmdbSsGD.sgm \ + man/m3_Dt/EdDelete.sgm man/m3_Dt/MmdbSsGN.sgm \ + man/m3_Dt/EdDesele.sgm man/m3_Dt/MmdbTGCI.sgm \ + man/m3_Dt/EdDisabl.sgm man/m3_Dt/MmdbTGNC.sgm \ + man/m3_Dt/EdEnable.sgm man/m3_Dt/MmdbTGPI.sgm \ + man/m3_Dt/EdFind.sgm man/m3_Dt/MrmInit.sgm \ + man/m3_Dt/EdFormat.sgm man/m3_Dt/MsgLogM.sgm \ + man/m3_Dt/EdGetCon.sgm man/m3_Dt/MsgLogO.sgm \ + man/m3_Dt/EdGetIns.sgm man/m3_Dt/MsgLogS.sgm \ + man/m3_Dt/EdGetLas.sgm man/m3_Dt/PrSetupP.sgm \ + man/m3_Dt/EdGetMes.sgm man/m3_Dt/PrintCop.sgm \ + man/m3_Dt/EdGetSiz.sgm man/m3_Dt/PrintFil.sgm \ + man/m3_Dt/EdGoToLi.sgm man/m3_Dt/PrintFre.sgm \ + man/m3_Dt/EdInsFF.sgm man/m3_Dt/PrintRes.sgm \ + man/m3_Dt/EdInsert.sgm man/m3_Dt/PrintSet.sgm \ + man/m3_Dt/EdInvFin.sgm man/m3_Dt/SaverGet.sgm \ + man/m3_Dt/EdInvFor.sgm man/m3_Dt/SessionR.sgm \ + man/m3_Dt/EdInvSpe.sgm man/m3_Dt/SessionS.sgm + +MAN_SRCS4 = \ + man/m3_Dt/EdPasteF.sgm man/m3_Dt/SpinBox.sgm \ + man/m3_Dt/EdReplFF.sgm man/m3_Dt/SpinBoxA.sgm \ + man/m3_Dt/EdReplac.sgm man/m3_Dt/SpinBoxD.sgm \ + man/m3_Dt/EdReset.sgm man/m3_Dt/SpinBoxS.sgm \ + man/m3_Dt/EdSaveCo.sgm man/m3_Dt/SrAPI.sgm \ + man/m3_Dt/EdSelect.sgm man/m3_Dt/SrchExit.sgm \ + man/m3_Dt/EdSetCFF.sgm man/m3_Dt/SrchFree.sgm \ + man/m3_Dt/EdSetCon.sgm man/m3_Dt/SrchGetK.sgm \ + man/m3_Dt/EdSetIns.sgm man/m3_Dt/SrchGetM.sgm \ + man/m3_Dt/EdTraver.sgm man/m3_Dt/SrchHigh.sgm \ + man/m3_Dt/EdUndoEd.sgm man/m3_Dt/SrchInit.sgm \ + man/m3_Dt/Editor.sgm man/m3_Dt/SrchMrge.sgm \ + man/m3_Dt/HelpDial.sgm man/m3_Dt/SrchMsgs.sgm \ + man/m3_Dt/HelpQDGC.sgm man/m3_Dt/SrchQery.sgm \ + man/m3_Dt/HelpQDia.sgm man/m3_Dt/SrchRein.sgm \ + man/m3_Dt/HelpRetu.sgm man/m3_Dt/SrchRetr.sgm \ + man/m3_Dt/HelpSetC.sgm man/m3_Dt/SrchSetM.sgm \ + man/m3_Dt/InfoShow.sgm man/m3_Dt/SrchSort.sgm \ + man/m3_Dt/Initiali.sgm man/m3_Dt/SrchVali.sgm \ + man/m3_Dt/MenuButt.sgm man/m3_Dt/Term.sgm \ + man/m3_Dt/MmdbBCFI.sgm man/m3_Dt/TermDisp.sgm \ + man/m3_Dt/MmdbBCGI.sgm man/m3_Dt/TermInit.sgm \ + man/m3_Dt/MmdbBGLT.sgm man/m3_Dt/TermSubR.sgm \ + man/m3_Dt/MmdbBGSN.sgm man/m3_Dt/TermSubS.sgm + +MAN_SRCS5 = \ + man/m3_DtDts/BufToAtL.sgm man/m3_DtDts/FilToDaT.sgm \ + man/m3_DtDts/BufToAtV.sgm man/m3_DtDts/FindAttr.sgm \ + man/m3_DtDts/BufToDaT.sgm man/m3_DtDts/FreeAtL.sgm \ + man/m3_DtDts/DaTIsAct.sgm man/m3_DtDts/FreeAtV.sgm \ + man/m3_DtDts/DaTNames.sgm man/m3_DtDts/FreeDaT.sgm \ + man/m3_DtDts/DaTToAtL.sgm man/m3_DtDts/FreeDaTN.sgm \ + man/m3_DtDts/DaTToAtV.sgm man/m3_DtDts/IsTrue.sgm \ + man/m3_DtDts/DatToDaT.sgm man/m3_DtDts/LoadDaTs.sgm \ + man/m3_DtDts/FilToAtL.sgm man/m3_DtDts/Release.sgm \ + man/m3_DtDts/FilToAtV.sgm man/m3_DtDts/SetDaT.sgm \ + man/m3_DtWsm/AddCWsCb.sgm man/m3_DtWsm/GetWsInf.sgm \ + man/m3_DtWsm/AddWs.sgm man/m3_DtWsm/GetWsLis.sgm \ + man/m3_DtWsm/AddWsFun.sgm man/m3_DtWsm/GetWsOcc.sgm \ + man/m3_DtWsm/AddWsMCb.sgm man/m3_DtWsm/OccAllWs.sgm \ + man/m3_DtWsm/ChBackDr.sgm man/m3_DtWsm/RemWsCb.sgm \ + man/m3_DtWsm/DelWs.sgm man/m3_DtWsm/RemWsFun.sgm \ + man/m3_DtWsm/FreeWsIn.sgm man/m3_DtWsm/SetCurWs.sgm \ + man/m3_DtWsm/GetCurBW.sgm man/m3_DtWsm/SetWsOcc.sgm \ + man/m3_DtWsm/GetCurWs.sgm man/m3_DtWsm/SetWsTi.sgm + +MAN_SRCS6 = \ + man/m3_csa/add_cale.sgm man/m3_csa/logon.sgm \ + man/m3_csa/add_entr.sgm man/m3_csa/look_up.sgm \ + man/m3_csa/call_cal.sgm man/m3_csa/query_co.sgm \ + man/m3_csa/del_cale.sgm man/m3_csa/read_cal.sgm \ + man/m3_csa/del_entr.sgm man/m3_csa/read_ent.sgm \ + man/m3_csa/free.sgm man/m3_csa/read_nex.sgm \ + man/m3_csa/free_tim.sgm man/m3_csa/register.sgm \ + man/m3_csa/list_caa.sgm man/m3_csa/restore.sgm \ + man/m3_csa/list_cal.sgm man/m3_csa/save.sgm \ + man/m3_csa/list_ena.sgm man/m3_csa/unregist.sgm \ + man/m3_csa/list_ens.sgm man/m3_csa/update_c.sgm \ + man/m3_csa/list_ent.sgm man/m3_csa/update_e.sgm \ + man/m3_csa/logoff.sgm man/m3_csa/x_proces.sgm + +MAN_SRCS7 = \ + man/m3_tt/X_sessio.sgm man/m3_tt/ico_join.sgm \ + man/m3_tt/bco_join.sgm man/m3_tt/ico_quit.sgm \ + man/m3_tt/bco_quit.sgm man/m3_tt/init_ses.sgm \ + man/m3_tt/close.sgm man/m3_tt/int_err.sgm \ + man/m3_tt/con_join.sgm man/m3_tt/is_err.sgm \ + man/m3_tt/con_quit.sgm man/m3_tt/malloc.sgm \ + man/m3_tt/def_fi_s.sgm man/m3_tt/mark.sgm \ + man/m3_tt/def_file.sgm man/m3_tt/netf_fil.sgm \ + man/m3_tt/def_pr_s.sgm man/m3_tt/objid_eq.sgm \ + man/m3_tt/def_proc.sgm man/m3_tt/objid_ob.sgm \ + man/m3_tt/def_pt_s.sgm man/m3_tt/onot_cre.sgm \ + man/m3_tt/def_ptyp.sgm man/m3_tt/open.sgm \ + man/m3_tt/def_se_s.sgm man/m3_tt/oreq_cre.sgm \ + man/m3_tt/def_sess.sgm man/m3_tt/pnot_cre.sgm \ + man/m3_tt/err_int.sgm man/m3_tt/poin_err.sgm \ + man/m3_tt/err_poin.sgm man/m3_tt/pr_sess.sgm \ + man/m3_tt/error.sgm man/m3_tt/preq_cre.sgm \ + man/m3_tt/fd.sgm man/m3_tt/pt_o_c_a.sgm \ + man/m3_tt/feat_ena.sgm man/m3_tt/ptr_err.sgm \ + man/m3_tt/feat_req.sgm man/m3_tt/pty_decl.sgm \ + man/m3_tt/fil_copy.sgm man/m3_tt/pty_exis.sgm \ + man/m3_tt/fil_dest.sgm man/m3_tt/pty_unde.sgm \ + man/m3_tt/fil_join.sgm man/m3_tt/release.sgm \ + man/m3_tt/fil_move.sgm man/m3_tt/status_m.sgm \ + man/m3_tt/fil_netf.sgm man/m3_tt/thr_pr_s.sgm \ + man/m3_tt/fil_ob_q.sgm man/m3_tt/thr_proc.sgm \ + man/m3_tt/fil_quit.sgm man/m3_tt/thr_se_s.sgm \ + man/m3_tt/free.sgm man/m3_tt/thr_sess.sgm \ + man/m3_tt/h_f_netf.sgm man/m3_tt/trace_co.sgm \ + man/m3_tt/h_netf_f.sgm man/m3_tt/xco_join.sgm \ + man/m3_tt/xco_quit.sgm + +MAN_SRCS8 = \ + man/m3_tt_message/abstai_c.sgm man/m3_tt_message/abstain.sgm \ + man/m3_tt_message/accepter.sgm man/m3_tt_message/accept_c.sgm \ + man/m3_tt_message/accept.sgm man/m3_tt_message/han_set.sgm \ + man/m3_tt_message/addr_set.sgm man/m3_tt_message/handler.sgm \ + man/m3_tt_message/address.sgm man/m3_tt_message/iarg_add.sgm \ + man/m3_tt_message/arg_add.sgm man/m3_tt_message/ico_set.sgm \ + man/m3_tt_message/arg_bv_s.sgm man/m3_tt_message/id.sgm \ + man/m3_tt_message/arg_bval.sgm man/m3_tt_message/object.sgm \ + man/m3_tt_message/arg_iv_s.sgm man/m3_tt_message/object_s.sgm \ + man/m3_tt_message/arg_ival.sgm man/m3_tt_message/op.sgm \ + man/m3_tt_message/arg_mode.sgm man/m3_tt_message/op_set.sgm \ + man/m3_tt_message/arg_type.sgm man/m3_tt_message/opnum.sgm \ + man/m3_tt_message/arg_va_s.sgm man/m3_tt_message/otype.sgm \ + man/m3_tt_message/arg_val.sgm man/m3_tt_message/otype_s.sgm \ + man/m3_tt_message/arg_xv_s.sgm man/m3_tt_message/pattern.sgm \ + man/m3_tt_message/arg_xval.sgm man/m3_tt_message/print.sgm \ + man/m3_tt_message/args_cnt.sgm man/m3_tt_message/receive.sgm \ + man/m3_tt_message/rejecter.sgm man/m3_tt_message/reject_c.sgm \ + man/m3_tt_message/barg_add.sgm man/m3_tt_message/reject.sgm \ + man/m3_tt_message/bcon_set.sgm man/m3_tt_message/reply.sgm \ + man/m3_tt_message/call_add.sgm man/m3_tt_message/scope.sgm \ + man/m3_tt_message/class.sgm man/m3_tt_message/scope_s.sgm \ + man/m3_tt_message/class_s.sgm man/m3_tt_message/send.sgm \ + man/m3_tt_message/con_bval.sgm man/m3_tt_message/sender.sgm \ + man/m3_tt_message/con_ival.sgm man/m3_tt_message/sessio_s.sgm \ + man/m3_tt_message/con_set.sgm man/m3_tt_message/session.sgm \ + man/m3_tt_message/con_slot.sgm man/m3_tt_message/snd_on_e.sgm \ + man/m3_tt_message/con_val.sgm man/m3_tt_message/snd_pt_s.sgm + +MAN_SRCS9 = \ + man/m3_tt_message/con_xval.sgm man/m3_tt_message/snd_pty.sgm \ + man/m3_tt_message/cons_cnt.sgm man/m3_tt_message/st_str.sgm \ + man/m3_tt_message/cr_super.sgm man/m3_tt_message/st_str_s.sgm \ + man/m3_tt_message/create.sgm man/m3_tt_message/state.sgm \ + man/m3_tt_message/destroy.sgm man/m3_tt_message/status.sgm \ + man/m3_tt_message/disp_set.sgm man/m3_tt_message/status_s.sgm \ + man/m3_tt_message/disposit.sgm man/m3_tt_message/uid.sgm \ + man/m3_tt_message/fail.sgm man/m3_tt_message/user.sgm \ + man/m3_tt_message/file.sgm man/m3_tt_message/user_set.sgm \ + man/m3_tt_message/file_set.sgm man/m3_tt_message/xarg_add.sgm \ + man/m3_tt_message/gid.sgm \ + man/m3_tt_message/han_pt_s.sgm man/m3_tt_message/xco_set.sgm \ + man/m3_tt_message/han_pty.sgm \ + man/m3_tt_otype/base.sgm man/m3_tt_otype/is_deriv.sgm \ + man/m3_tt_otype/deri_cnt.sgm man/m3_tt_otype/o_arg_mo.sgm \ + man/m3_tt_otype/derived.sgm man/m3_tt_otype/o_arg_ty.sgm \ + man/m3_tt_otype/h_arg_mo.sgm man/m3_tt_otype/o_args_c.sgm \ + man/m3_tt_otype/h_arg_ty.sgm man/m3_tt_otype/o_cb_add.sgm \ + man/m3_tt_otype/h_args_c.sgm man/m3_tt_otype/o_count.sgm \ + man/m3_tt_otype/h_count.sgm man/m3_tt_otype/osig_op.sgm \ + man/m3_tt_otype/hsig_op.sgm + +MAN_SRCS10 = \ + man/m3_tt_pattern/addr_add.sgm man/m3_tt_pattern/op_add.sgm \ + man/m3_tt_pattern/arg_add.sgm man/m3_tt_pattern/opnu_add.sgm \ + man/m3_tt_pattern/barg_add.sgm man/m3_tt_pattern/otyp_add.sgm \ + man/m3_tt_pattern/bcon_add.sgm man/m3_tt_pattern/print.sgm \ + man/m3_tt_pattern/call_add.sgm man/m3_tt_pattern/register.sgm \ + man/m3_tt_pattern/cat_set.sgm man/m3_tt_pattern/s_pt_add.sgm \ + man/m3_tt_pattern/category.sgm man/m3_tt_pattern/scop_add.sgm \ + man/m3_tt_pattern/clas_add.sgm man/m3_tt_pattern/send_add.sgm \ + man/m3_tt_pattern/cont_add.sgm man/m3_tt_pattern/sess_add.sgm \ + man/m3_tt_pattern/create.sgm man/m3_tt_pattern/stat_add.sgm \ + man/m3_tt_pattern/destroy.sgm man/m3_tt_pattern/unregist.sgm \ + man/m3_tt_pattern/disp_add.sgm man/m3_tt_pattern/user.sgm \ + man/m3_tt_pattern/file_add.sgm man/m3_tt_pattern/user_set.sgm \ + man/m3_tt_pattern/iarg_add.sgm man/m3_tt_pattern/xarg_add.sgm \ + man/m3_tt_pattern/icon_add.sgm man/m3_tt_pattern/xcon_add.sgm \ + man/m3_tt_pattern/obj_add.sgm \ + man/m3_tt_session/bpro_add.sgm man/m3_tt_session/prop_cnt.sgm \ + man/m3_tt_session/bpro_set.sgm man/m3_tt_session/prop_set.sgm \ + man/m3_tt_session/bprop.sgm man/m3_tt_session/propna_c.sgm \ + man/m3_tt_session/join.sgm man/m3_tt_session/propname.sgm \ + man/m3_tt_session/prop.sgm man/m3_tt_session/quit.sgm \ + man/m3_tt_session/prop_add.sgm man/m3_tt_session/types_ld.sgm \ + man/m3_tt_spec/bpro_add.sgm man/m3_tt_spec/prop_add.sgm \ + man/m3_tt_spec/bpro_set.sgm man/m3_tt_spec/prop_cnt.sgm \ + man/m3_tt_spec/bprop.sgm man/m3_tt_spec/prop_set.sgm \ + man/m3_tt_spec/create.sgm man/m3_tt_spec/propna_c.sgm \ + man/m3_tt_spec/destroy.sgm man/m3_tt_spec/propname.sgm \ + man/m3_tt_spec/file.sgm man/m3_tt_spec/type.sgm \ + man/m3_tt_spec/move.sgm man/m3_tt_spec/type_set.sgm \ + man/m3_tt_spec/prop.sgm man/m3_tt_spec/write.sgm + +MAN_SRCS11 = \ + man/m3_ttdt/Get_Modi.sgm man/m3_ttdt/f_reques.sgm \ + man/m3_ttdt/Revert.sgm man/m3_ttdt/m_accept.sgm \ + man/m3_ttdt/Save.sgm man/m3_ttdt/open.sgm \ + man/m3_ttdt/close.sgm man/m3_ttdt/s_imp_on.sgm \ + man/m3_ttdt/f_event.sgm man/m3_ttdt/ses_join.sgm \ + man/m3_ttdt/f_join.sgm man/m3_ttdt/ses_quit.sgm \ + man/m3_ttdt/f_notice.sgm man/m3_ttdt/subc_man.sgm \ + man/m3_ttdt/f_quit.sgm \ + man/m3_ttmedia/Deposit.sgm man/m3_ttmedia/load_rep.sgm \ + man/m3_ttmedia/load.sgm man/m3_ttmedia/pty_decl.sgm \ + man/m3_tttk/Xt_inp_h.sgm man/m3_tttk/m_fail.sgm \ + man/m3_tttk/block_wh.sgm man/m3_tttk/m_reject.sgm \ + man/m3_tttk/m_abando.sgm man/m3_tttk/op_str.sgm \ + man/m3_tttk/m_create.sgm man/m3_tttk/str_op.sgm \ + man/m3_tttk/m_destro.sgm \ + man/man1/dsdm.sgm man/man1/ttmv.sgm man/man1/tttar.sgm \ + man/man1/ksh93.sgm man/man1/ttrm.sgm man/man1/tttrace.sgm \ + man/man1/tt_typ_c.sgm man/man1/ttrmdir.sgm \ + man/man1/ttcp.sgm man/man1/ttsessio.sgm + +MAN_SRCS12 = \ + man/man1_dt/action.sgm man/man1_dt/helptag.sgm \ + man/man1_dt/appgathe.sgm man/man1_dt/helpview.sgm \ + man/man1_dt/appinteg.sgm man/man1_dt/huffcode.sgm \ + man/man1_dt/builder.sgm man/man1_dt/icon.sgm \ + man/man1_dt/calc.sgm man/man1_dt/imsstart.sgm \ + man/man1_dt/chooser.sgm man/man1_dt/info.sgm \ + man/man1_dt/cm.sgm man/man1_dt/infogen.sgm \ + man/man1_dt/cm_delet.sgm man/man1_dt/ksh.sgm \ + man/man1_dt/cm_edito.sgm man/man1_dt/login.sgm \ + man/man1_dt/cm_inser.sgm man/man1_dt/lp.sgm \ + man/man1_dt/cm_looku.sgm man/man1_dt/mail.sgm \ + man/man1_dt/codegen.sgm man/man1_dt/mailpr.sgm \ + man/man1_dt/config.sgm man/man1_dt/pad.sgm \ + man/man1_dt/convertv.sgm man/man1_dt/printinf.sgm \ + man/man1_dt/create.sgm man/man1_dt/screen.sgm \ + man/man1_dt/docbook.sgm man/man1_dt/searchpa.sgm \ + man/man1_dt/exec.sgm man/man1_dt/sess_res.sgm \ + man/man1_dt/file.sgm man/man1_dt/session.sgm \ + man/man1_dt/file_cop.sgm man/man1_dt/srcreate.sgm \ + man/man1_dt/file_err.sgm man/man1_dt/srdbrec.sgm \ + man/man1_dt/udcfonte.sgm man/man1_dt/srhan.sgm \ + man/man1_dt/fplist.sgm man/man1_dt/srindex.sgm \ + man/man1_dt/greet.sgm man/man1_dt/srkdump.sgm \ + man/man1_dt/he_ctag1.sgm man/man1_dt/srload.sgm \ + man/man1_dt/he_htag1.sgm man/man1_dt/style.sgm \ + man/man1_dt/he_htag2.sgm man/man1_dt/term.sgm \ + man/man1_dt/hello.sgm man/man1_dt/types.sgm \ + man/man1_dt/helpgen.sgm man/man1_dt/udcexch.sgm \ + man/man1_dt/helpprin.sgm man/man1_dt/wm.sgm \ + man/man1_dt/pdm.sgm man/man1_dt/pdmd.sgm + +MAN_SRCS13 = \ + man/man1m/dtspcd.sgm \ + man/man1m/rpccmsd.sgm man/man1m/ttdbck.sgm \ + man/man1m/rpcttdbs.sgm man/man1m/ttdbserv.sgm \ + man/man4/Deposit.sgm man/man4/Save.sgm man/man4/dticonfi.sgm \ + man/man4/Display.sgm man/man4/Saved.sgm man/man4/dtpmfile.sgm \ + man/man4/DtDndPro.sgm man/man4/Set_Env.sgm man/man4/dtresour.sgm \ + man/man4/Edit.sgm man/man4/Set_Geom.sgm man/man4/dtsdldtd.sgm \ + man/man4/Get_Env.sgm man/man4/Set_Icon.sgm man/man4/dtsdlfil.sgm \ + man/man4/Get_Geom.sgm man/man4/Set_Loca.sgm man/man4/dtsessdb.sgm \ + man/man4/Get_Icon.sgm man/man4/Set_Map.sgm man/man4/dtsessio.sgm \ + man/man4/Get_Loca.sgm man/man4/Set_Situ.sgm man/man4/dtspcden.sgm \ + man/man4/Get_Map.sgm man/man4/Signal.sgm man/man4/dtsrdbfl.sgm \ + man/man4/Get_Modi.sgm man/man4/Started.sgm man/man4/dtsrfzkf.sgm \ + man/man4/Get_Situ.sgm man/man4/Status.sgm man/man4/dtsrhanf.sgm \ + man/man4/Get_Stat.sgm man/man4/Stopped.sgm man/man4/dtsrlngf.sgm \ + man/man4/Get_Sysi.sgm man/man4/Translat.sgm man/man4/dtsrocfl.sgm \ + man/man4/Get_XInf.sgm man/man4/bil.sgm man/man4/dtwmrc.sgm \ + man/man4/Instanti.sgm man/man4/dtaction.sgm man/man4/genloc.sgm \ + man/man4/Lower.sgm man/man4/dtbmfile.sgm \ + man/man4/Mail.sgm man/man4/dtcm_arc.sgm man/man4/ifloadil.sgm \ + man/man4/Modified.sgm man/man4/dtcm_ent.sgm man/man4/ifprnial.sgm \ + man/man4/Pause.sgm man/man4/dtdpfile.sgm man/man4/ifquit.sgm \ + man/man4/Print.sgm man/man4/dtdtfile.sgm man/man4/ifshwial.sgm \ + man/man4/Quit.sgm man/man4/dtdtsfil.sgm man/man4/mt-libtt.sgm \ + man/man4/Raise.sgm man/man4/dtfile_c.sgm man/man4/startlog.sgm \ + man/man4/Resume.sgm man/man4/dtfpfile.sgm man/man4/tttracef.sgm \ + man/man4/Revert.sgm man/man4/dthelpta.sgm \ + man/man4/Reverted.sgm man/man4/dthffile.sgm + +MAN_SRCS14 = \ + man/man5/Dt.sgm man/man5/DtTerm.sgm man/man5/dtinfobk.sgm \ + man/man5/DtAction.sgm man/man5/DtWsm.sgm man/man5/dtinfost.sgm \ + man/man5/DtComboB.sgm man/man5/Tttt_c.sgm man/man5/dtinfotc.sgm \ + man/man5/DtDnd.sgm man/man5/Tttttk.sgm man/man5/dtmaiact.sgm \ + man/man5/DtDts.sgm man/man5/csacsa.sgm man/man5/dtmanact.sgm \ + man/man5/DtEditor.sgm man/man5/dtactact.sgm man/man5/dtpriact.sgm \ + man/man5/DtHelp.sgm man/man5/dtappact.sgm man/man5/dtsearch.sgm \ + man/man5/DtHelpDi.sgm man/man5/dtbuiact.sgm man/man5/dtsesact.sgm \ + man/man5/DtHelpQD.sgm man/man5/dtcalact.sgm man/man5/dtstyact.sgm \ + man/man5/DtInfoLib.sgm man/man5/dtclcact.sgm man/man5/dtteract.sgm \ + man/man5/DtMenuBu.sgm man/man5/dtenvvar.sgm man/man5/dttermes.sgm \ + man/man5/DtMrm.sgm man/man5/dtfilact.sgm man/man5/dttexact.sgm \ + man/man5/DtMsgLog.sgm man/man5/dtfilsys.sgm man/man5/dttraact.sgm \ + man/man5/DtPrint.sgm man/man5/dthelact.sgm man/man5/imssact.sgm \ + man/man5/DtSaver.sgm man/man5/dticoact.sgm man/man5/mmdbgifo.sgm \ + man/man5/DtSessio.sgm man/man5/dtinfact.sgm man/man5/mmdbhndl.sgm \ + man/man5/DtSpinBo.sgm man/man5/dtinfdlb.sgm man/man5/mmdbireq.sgm \ + man/man5/DtStdApp.sgm man/man5/dtinfoaf.sgm \ + man/man5/DtStdInt.sgm man/man5/dtinfobc.sgm + + +MAN_ID = cde.man.toc +include man/Title.am + +MAN_TOC = man/TOC.sgm +$(INFOLIB)/$(BOOKCASE)/dtsearch/dtsearch.ocf: $(MAN_TOC) + +MAN_SRCS = $(MAN_SRCS1) $(MAN_SRCS2) $(MAN_SRCS3) $(MAN_SRCS4) \ + $(MAN_SRCS5) $(MAN_SRCS6) $(MAN_SRCS7) $(MAN_SRCS8) \ + $(MAN_SRCS9) $(MAN_SRCS10) $(MAN_SRCS11) $(MAN_SRCS12) \ + $(MAN_SRCS13) $(MAN_SRCS14) + +$(MAN_TOC): $(MAN_SRCS) + $(DGENV) $(DTINFOGEN) tocgen -T $(DTINFOGENTMPDIR) $(DTINFOGENOPTIONS) -f $(MAN_TOC) -id $(MAN_ID) -title $(MAN_TITLE) man/book.sgm + +BUILT_SOURCES += $(MAN_TOC) +CLEANFILES += $(MAN_TOC) diff --git a/cde/doc/common/guides/progGuide.am b/cde/doc/common/guides/progGuide.am new file mode 100644 index 000000000..7b8b51df3 --- /dev/null +++ b/cde/doc/common/guides/progGuide.am @@ -0,0 +1,32 @@ +# build a guide + +PROGGUIDE_SRCS = \ + progGuide/BEntity.sgm progGuide/ch08.sgm \ + progGuide/book.sgm progGuide/ch09.sgm \ + progGuide/ch01.sgm progGuide/ch10.sgm \ + progGuide/ch02.sgm progGuide/ch11.sgm \ + progGuide/ch12.sgm \ + progGuide/ch03.sgm progGuide/glossary.sgm \ + progGuide/ch04.sgm progGuide/part1.sgm \ + progGuide/ch05.sgm progGuide/part2.sgm \ + progGuide/ch06.sgm progGuide/part3.sgm \ + progGuide/ch07.sgm progGuide/preface.sgm + +PROGGUIDE_GRS = \ + progGuide/graphics/ComboBo3.tif progGuide/graphics/NoPrint.tif \ + progGuide/graphics/ComboBox.tif progGuide/graphics/approot.tif \ + progGuide/graphics/MenuBut2.tif progGuide/graphics/package.tif + +$(INFOLIB)/$(BOOKCASE)/dtsearch/dtsearch.ocf: $(PROGGUIDE_GRS) + +PROGGUIDE_ID = cde.progGuide.toc +include progGuide/Title.am + +PROGGUIDE_TOC = progGuide/TOC.sgm +$(INFOLIB)/$(BOOKCASE)/dtsearch/dtsearch.ocf: $(PROGGUIDE_TOC) + +$(PROGGUIDE_TOC): $(PROGGUIDE_SRCS) + $(DGENV) $(DTINFOGEN) tocgen -T $(DTINFOGENTMPDIR) $(DTINFOGENOPTIONS) -f $(PROGGUIDE_TOC) -id $(PROGGUIDE_ID) -title $(PROGGUIDE_TITLE) progGuide/book.sgm + +BUILT_SOURCES += $(PROGGUIDE_TOC) +CLEANFILES += $(PROGGUIDE_TOC) diff --git a/cde/doc/common/guides/progOview.am b/cde/doc/common/guides/progOview.am new file mode 100644 index 000000000..b0655a657 --- /dev/null +++ b/cde/doc/common/guides/progOview.am @@ -0,0 +1,27 @@ +# build a guide + +PROGOVIEW_SRCS = \ + progOview/BEntity.sgm progOview/ch02.sgm progOview/ch07.sgm \ + progOview/appa.sgm progOview/ch03.sgm progOview/credits.sgm \ + progOview/ch04.sgm progOview/part1.sgm \ + progOview/book.sgm progOview/ch05.sgm progOview/part2.sgm \ + progOview/ch01.sgm progOview/ch06.sgm progOview/preface.sgm + +PROGOVIEW_GRS = \ + progOview/graphics/ComboBo3.tif progOview/graphics/SpinBox.tif \ + progOview/graphics/ComboBox.tif progOview/graphics/fpanel.tif \ + progOview/graphics/MenuBut2.tif + +$(INFOLIB)/$(BOOKCASE)/dtsearch/dtsearch.ocf: $(PROGOVIEW_GRS) + +PROGOVIEW_ID = cde.progOview.toc +include progOview/Title.am + +PROGOVIEW_TOC = progOview/TOC.sgm +$(INFOLIB)/$(BOOKCASE)/dtsearch/dtsearch.ocf: $(PROGOVIEW_TOC) + +$(PROGOVIEW_TOC): $(PROGOVIEW_SRCS) + $(DGENV) $(DTINFOGEN) tocgen -T $(DTINFOGENTMPDIR) $(DTINFOGENOPTIONS) -f $(PROGOVIEW_TOC) -id $(PROGOVIEW_ID) -title $(PROGOVIEW_TITLE) progOview/book.sgm + +BUILT_SOURCES += $(PROGOVIEW_TOC) +CLEANFILES += $(PROGOVIEW_TOC) diff --git a/cde/doc/common/guides/sysAdminGuide.am b/cde/doc/common/guides/sysAdminGuide.am new file mode 100644 index 000000000..2a221ee13 --- /dev/null +++ b/cde/doc/common/guides/sysAdminGuide.am @@ -0,0 +1,67 @@ +# build a guide + +SYSADMINGUIDE_SRCS = \ + sysAdminGuide/BEntity.sgm sysAdminGuide/ch09.sgm \ + sysAdminGuide/book.sgm sysAdminGuide/ch10.sgm \ + sysAdminGuide/ch01.sgm sysAdminGuide/ch11.sgm \ + sysAdminGuide/ch02.sgm sysAdminGuide/ch12.sgm \ + sysAdminGuide/ch03.sgm sysAdminGuide/ch13.sgm \ + sysAdminGuide/ch04.sgm sysAdminGuide/ch14.sgm \ + sysAdminGuide/ch05.sgm sysAdminGuide/ch15.sgm \ + sysAdminGuide/ch06.sgm sysAdminGuide/ch16.sgm \ + sysAdminGuide/ch07.sgm \ + sysAdminGuide/ch08.sgm sysAdminGuide/preface.sgm + +SYSADMINGUIDE_GRS = \ + sysAdminGuide/graphics/ActIcon.tif \ + sysAdminGuide/graphics/ActIconI.tif \ + sysAdminGuide/graphics/CreActIc.tif \ + sysAdminGuide/graphics/DtApps.tif \ + sysAdminGuide/graphics/Open4Xwd.tif \ + sysAdminGuide/graphics/TextPad.tif \ + sysAdminGuide/graphics/XwdDispl.tif \ + sysAdminGuide/graphics/actionfs.tif \ + sysAdminGuide/graphics/actionic.tif \ + sysAdminGuide/graphics/actionna.tif \ + sysAdminGuide/graphics/actions1.tif \ + sysAdminGuide/graphics/adddtype.tif \ + sysAdminGuide/graphics/advcract.tif \ + sysAdminGuide/graphics/appgath.tif \ + sysAdminGuide/graphics/appgroup.tif \ + sysAdminGuide/graphics/appmgrwc.tif \ + sysAdminGuide/graphics/appmgrwi.tif \ + sysAdminGuide/graphics/appserv.tif \ + sysAdminGuide/graphics/appserv1.tif \ + sysAdminGuide/graphics/colorset.tif \ + sysAdminGuide/graphics/complexa.tif \ + sysAdminGuide/graphics/connect.tif \ + sysAdminGuide/graphics/connecti.tif \ + sysAdminGuide/graphics/content.tif \ + sysAdminGuide/graphics/creatact.tif \ + sysAdminGuide/graphics/datatype.tif \ + sysAdminGuide/graphics/fileserv.tif \ + sysAdminGuide/graphics/findset.tif \ + sysAdminGuide/graphics/fpboxes.tif \ + sysAdminGuide/graphics/fpmainbo.tif \ + sysAdminGuide/graphics/fpsubbox.tif \ + sysAdminGuide/graphics/idchar.tif \ + sysAdminGuide/graphics/idname.tif \ + sysAdminGuide/graphics/inclfile.tif \ + sysAdminGuide/graphics/login.tif \ + sysAdminGuide/graphics/nfsbased.tif \ + sysAdminGuide/graphics/permpat.tif \ + sysAdminGuide/graphics/sesserve.tif + +$(INFOLIB)/$(BOOKCASE)/dtsearch/dtsearch.ocf: $(SYSADMINGUIDE_GRS) + +SYSADMINGUIDE_ID = cde.sysAdminGuide.toc +include sysAdminGuide/Title.am + +SYSADMINGUIDE_TOC = sysAdminGuide/TOC.sgm +$(INFOLIB)/$(BOOKCASE)/dtsearch/dtsearch.ocf: $(SYSADMINGUIDE_TOC) + +$(SYSADMINGUIDE_TOC): $(SYSADMINGUIDE_SRCS) + $(DGENV) $(DTINFOGEN) tocgen -T $(DTINFOGENTMPDIR) $(DTINFOGENOPTIONS) -f $(SYSADMINGUIDE_TOC) -id $(SYSADMINGUIDE_ID) -title $(SYSADMINGUIDE_TITLE) sysAdminGuide/book.sgm + +BUILT_SOURCES += $(SYSADMINGUIDE_TOC) +CLEANFILES += $(SYSADMINGUIDE_TOC) diff --git a/cde/doc/common/guides/ttGuide.am b/cde/doc/common/guides/ttGuide.am new file mode 100644 index 000000000..e76aca6f8 --- /dev/null +++ b/cde/doc/common/guides/ttGuide.am @@ -0,0 +1,19 @@ +# build a guide + +TTGUIDE_SRCS = \ + ttGuide/BEntity.sgm ttGuide/appd.sgm ttGuide/ch03.sgm \ + ttGuide/appa.sgm ttGuide/book.sgm ttGuide/ch04.sgm \ + ttGuide/appb.sgm ttGuide/ch01.sgm ttGuide/credits.sgm \ + ttGuide/appc.sgm ttGuide/ch02.sgm ttGuide/preface.sgm + +TTGUIDE_ID = cde.ttGuide.toc +include ttGuide/Title.am + +TTGUIDE_TOC = ttGuide/TOC.sgm +$(INFOLIB)/$(BOOKCASE)/dtsearch/dtsearch.ocf: $(TTGUIDE_TOC) + +$(TTGUIDE_TOC): $(TTGUIDE_SRCS) + $(DGENV) $(DTINFOGEN) tocgen -T $(DTINFOGENTMPDIR) $(DTINFOGENOPTIONS) -f $(TTGUIDE_TOC) -id $(TTGUIDE_ID) -title $(TTGUIDE_TITLE) ttGuide/book.sgm + +BUILT_SOURCES += $(TTGUIDE_TOC) +CLEANFILES += $(TTGUIDE_TOC) diff --git a/cde/doc/common/guides/usersGuide.am b/cde/doc/common/guides/usersGuide.am new file mode 100644 index 000000000..5a34512de --- /dev/null +++ b/cde/doc/common/guides/usersGuide.am @@ -0,0 +1,122 @@ +# build a guide + +USERSGUIDE_SRCS = \ + usersGuide/BEntity.sgm usersGuide/ch07.sgm \ + usersGuide/appa.sgm usersGuide/ch08.sgm \ + usersGuide/appb.sgm usersGuide/ch09.sgm \ + usersGuide/book.sgm usersGuide/ch10.sgm \ + usersGuide/ch01.sgm usersGuide/ch11.sgm \ + usersGuide/ch02.sgm usersGuide/ch12.sgm \ + usersGuide/ch03.sgm usersGuide/ch13.sgm \ + usersGuide/ch04.sgm usersGuide/credits.sgm \ + usersGuide/ch05.sgm usersGuide/glossary.sgm \ + usersGuide/ch06.sgm usersGuide/preface.sgm + +USERSGUIDE_GRS1 = \ + usersGuide/graphics/3clck.tif usersGuide/graphics/SMKey.tif \ + usersGuide/graphics/3drg.tif usersGuide/graphics/SMMainPa.tif \ + usersGuide/graphics/AMaddapp.tif usersGuide/graphics/SMMouse.tif \ + usersGuide/graphics/BSAMIcon.tif usersGuide/graphics/SMScreen.tif \ + usersGuide/graphics/BSAppMgr.tif usersGuide/graphics/SMStartu.tif \ + usersGuide/graphics/BSFMIcon.tif usersGuide/graphics/SMWindow.tif \ + usersGuide/graphics/BSFilMgr.tif usersGuide/graphics/Screen1.tif \ + usersGuide/graphics/BSHlpmnu.tif usersGuide/graphics/Screen2.tif \ + usersGuide/graphics/BSMinBut.tif usersGuide/graphics/TECopyTo.tif \ + usersGuide/graphics/BSObjpop.tif usersGuide/graphics/TEbutton.tif \ + usersGuide/graphics/BSPullmn.tif usersGuide/graphics/TEdataf.tif \ + usersGuide/graphics/BSSMIcon.tif usersGuide/graphics/TEfindch.tif \ + usersGuide/graphics/BSWSObjs.tif usersGuide/graphics/TEformat.tif \ + usersGuide/graphics/BSWSmenu.tif usersGuide/graphics/TEinclud.tif \ + usersGuide/graphics/BSWinmnu.tif usersGuide/graphics/TEopenfi.tif \ + usersGuide/graphics/BSchkbx.tif usersGuide/graphics/TEprint.tif \ + usersGuide/graphics/BSlsts.tif usersGuide/graphics/TEsaveas.tif \ + usersGuide/graphics/BSpushb.tif usersGuide/graphics/TEspell.tif \ + usersGuide/graphics/BSresize.tif usersGuide/graphics/TEstatus.tif \ + usersGuide/graphics/BSscroll.tif usersGuide/graphics/TEsubpan.tif \ + usersGuide/graphics/BStxtfld.tif usersGuide/graphics/TEwindow.tif \ + usersGuide/graphics/CRaeicon.tif usersGuide/graphics/TEwrapto.tif \ + usersGuide/graphics/CRapptls.tif usersGuide/graphics/WinFrmCs.tif \ + usersGuide/graphics/CRdayico.tif usersGuide/graphics/WndwIcns.tif \ + usersGuide/graphics/CRdayvw.tif usersGuide/graphics/admpasad.tif \ + usersGuide/graphics/CRfpnl.tif usersGuide/graphics/apmappic.tif \ + usersGuide/graphics/CRmonthi.tif usersGuide/graphics/apmcreat.tif \ + usersGuide/graphics/CRmonthv.tif usersGuide/graphics/apmfp.tif \ + usersGuide/graphics/CRnextic.tif usersGuide/graphics/apmicons.tif \ + usersGuide/graphics/CRopalp.tif usersGuide/graphics/apmlabel.tif + +USERSGUIDE_GRS2 = \ + usersGuide/graphics/CRprevic.tif usersGuide/graphics/apmpasub.tif \ + usersGuide/graphics/CRtdicon.tif usersGuide/graphics/apmwin.tif \ + usersGuide/graphics/CRtodayi.tif usersGuide/graphics/appgroup.tif \ + usersGuide/graphics/CRtodols.tif usersGuide/graphics/fpanel.tif \ + usersGuide/graphics/CRv5alp.tif usersGuide/graphics/fpappmag.tif \ + usersGuide/graphics/CRweekic.tif usersGuide/graphics/fpbusy.tif \ + usersGuide/graphics/CRweekvw.tif usersGuide/graphics/fpcal.tif \ + usersGuide/graphics/CRyearic.tif usersGuide/graphics/fpclock.tif \ + usersGuide/graphics/CRyearvw.tif usersGuide/graphics/fpconwsu.tif \ + usersGuide/graphics/CompWind.tif usersGuide/graphics/fpcopyma.tif \ + usersGuide/graphics/FMFPctrl.tif usersGuide/graphics/fpexit.tif \ + usersGuide/graphics/FMFPtrsh.tif usersGuide/graphics/fpfile.tif \ + usersGuide/graphics/FMaction.tif usersGuide/graphics/fphelp.tif \ + usersGuide/graphics/FMdirlk.tif usersGuide/graphics/fphelpfp.tif \ + usersGuide/graphics/FMdirnw.tif usersGuide/graphics/fphelpin.tif \ + usersGuide/graphics/FMdragic.tif usersGuide/graphics/fphelpoi.tif \ + usersGuide/graphics/FMfind.tif usersGuide/graphics/fphelpsu.tif \ + usersGuide/graphics/FMiconbr.tif usersGuide/graphics/fpicon.tif \ + usersGuide/graphics/FMmain.tif usersGuide/graphics/fpiconed.tif \ + usersGuide/graphics/FMpopupm.tif usersGuide/graphics/fpinstal.tif \ + usersGuide/graphics/FMtreevw.tif usersGuide/graphics/fploadsw.tif \ + usersGuide/graphics/FSBOpen.tif usersGuide/graphics/fplock.tif \ + usersGuide/graphics/H4Hdapps.tif usersGuide/graphics/fpmail1.tif \ + usersGuide/graphics/H4Hfhelp.tif usersGuide/graphics/fpmail2.tif \ + usersGuide/graphics/fpmin.tif \ + usersGuide/graphics/H4Hgsash.tif usersGuide/graphics/fpmove.tif \ + usersGuide/graphics/H4Hhctrl.tif usersGuide/graphics/fpnlext.tif \ + usersGuide/graphics/H4Hhist.tif usersGuide/graphics/fpnllck.tif \ + usersGuide/graphics/H4Hhmenu.tif usersGuide/graphics/fpperapp.tif \ + usersGuide/graphics/H4Hhmngr.tif usersGuide/graphics/fpperpri.tif + +USERSGUIDE_GRS3 = \ + usersGuide/graphics/H4Hhorg.tif usersGuide/graphics/fppopcon.tif \ + usersGuide/graphics/H4Hhyper.tif usersGuide/graphics/fppopsub.tif \ + usersGuide/graphics/H4Hindex.tif usersGuide/graphics/fppopwk1.tif \ + usersGuide/graphics/H4Hmanac.tif usersGuide/graphics/fppopwk2.tif \ + usersGuide/graphics/H4Hmandi.tif usersGuide/graphics/fpprint.tif \ + usersGuide/graphics/H4Hpopup.tif usersGuide/graphics/fpstyle.tif \ + usersGuide/graphics/H4Hprint.tif usersGuide/graphics/fpsubclo.tif \ + usersGuide/graphics/fpswitch.tif \ + usersGuide/graphics/fpswiton.tif \ + usersGuide/graphics/H4Htopic.tif usersGuide/graphics/fpterm.tif \ + usersGuide/graphics/IEmain.tif usersGuide/graphics/fptexed.tif \ + usersGuide/graphics/MailAttI.tif usersGuide/graphics/fptext.tif \ + usersGuide/graphics/MailFind.tif usersGuide/graphics/fptrash.tif \ + usersGuide/graphics/MailFndC.tif usersGuide/graphics/fpwkbut.tif \ + usersGuide/graphics/MailIcon.tif usersGuide/graphics/icontool.tif \ + usersGuide/graphics/MailOptD.tif usersGuide/graphics/prtmgric.tif \ + usersGuide/graphics/MailRcpt.tif usersGuide/graphics/prtsetup.tif \ + usersGuide/graphics/Mailbox.tif usersGuide/graphics/subarrow.tif \ + usersGuide/graphics/PMMainW.tif usersGuide/graphics/ugamgrfp.tif \ + usersGuide/graphics/PMprops.tif usersGuide/graphics/ugappmgr.tif \ + usersGuide/graphics/PMscreen.tif usersGuide/graphics/ugdtterm.tif \ + usersGuide/graphics/SMBack.tif usersGuide/graphics/ugfilemg.tif \ + usersGuide/graphics/SMBeep.tif usersGuide/graphics/ugfmicon.tif \ + usersGuide/graphics/SMColBox.tif usersGuide/graphics/ugglobop.tif \ + usersGuide/graphics/SMColor.tif usersGuide/graphics/ugpamenu.tif \ + usersGuide/graphics/SMFont.tif usersGuide/graphics/ugtermop.tif \ + usersGuide/graphics/SMFront.tif usersGuide/graphics/ugtermpo.tif + +$(INFOLIB)/$(BOOKCASE)/dtsearch/dtsearch.ocf: $(USERSGUIDE_GRS1) \ + $(USERSGUIDE_GRS2) $(USERSGUIDE_GRS3) + +USERSGUIDE_ID = cde.usersGuide.toc +include usersGuide/Title.am + +USERSGUIDE_TOC = usersGuide/TOC.sgm +$(INFOLIB)/$(BOOKCASE)/dtsearch/dtsearch.ocf: $(USERSGUIDE_TOC) + +$(USERSGUIDE_TOC): $(USERSGUIDE_SRCS) + $(DGENV) $(DTINFOGEN) tocgen -T $(DTINFOGENTMPDIR) $(DTINFOGENOPTIONS) -f $(USERSGUIDE_TOC) -id $(USERSGUIDE_ID) -title $(USERSGUIDE_TITLE) usersGuide/book.sgm + +BUILT_SOURCES += usersGuide/TOC.sgm +CLEANFILES += usersGuide/TOC.sgm + From eebb078c19e53ef4de74609bf0a643696d720231 Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Thu, 9 Dec 2021 11:37:50 -0700 Subject: [PATCH 13/25] doc/C/guides: build the infolib and search DB --- cde/doc/C/guides/Makefile.am | 15 ++++++++++++++- cde/doc/common/guides/guides_env.am | 21 +++++++++++++-------- 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/cde/doc/C/guides/Makefile.am b/cde/doc/C/guides/Makefile.am index 7cf5b6ccb..98708380d 100644 --- a/cde/doc/C/guides/Makefile.am +++ b/cde/doc/C/guides/Makefile.am @@ -12,7 +12,7 @@ CLEANFILES = # this sets the LANG and HELP_LANG variables include $(top_srcdir)/programs/localized/templates/C.am -# build guides +# build guide TOCs and deps include $(top_srcdir)/doc/common/guides/usersGuide.am include $(top_srcdir)/doc/common/guides/infoUGuide.am include $(top_srcdir)/doc/common/guides/infoAPGuide.am @@ -22,6 +22,19 @@ include $(top_srcdir)/doc/common/guides/man.am include $(top_srcdir)/doc/common/guides/builderGuide.am include $(top_srcdir)/doc/common/guides/dtkshGuide.am include $(top_srcdir)/doc/common/guides/glossary.am +include $(top_srcdir)/doc/common/guides/i18nGuide.am include $(top_srcdir)/doc/common/guides/progOview.am include $(top_srcdir)/doc/common/guides/ttGuide.am +include $(top_srcdir)/doc/common/guides/helpGuide.am +include $(top_srcdir)/doc/common/guides/docbookGuide.am + +# build the infolib + search DB +INFOLIBDEPS = $(SGMLDEPS) $(top_srcdir)/doc/common/docbook/docbook.stl + +$(INFOLIB)/$(BOOKCASE)/dtsearch/dtsearch.ocf: $(INFOLIBDEPS) + $(MKDIR_P) $(INFOLIB) + $(DGENV) $(DTINFOGEN) build -v -T $(DTINFOGENTMPDIR) $(DTINFOGENOPTIONS) $(DGOPTS) $(SSENTS) -l $(INFOLIB) bookcase.bc + +BUILT_SOURCES += $(INFOLIB)/$(BOOKCASE)/dtsearch/dtsearch.ocf +CLEANFILES += $(INFOLIB)/$(BOOKCASE)/dtsearch/dtsearch.ocf diff --git a/cde/doc/common/guides/guides_env.am b/cde/doc/common/guides/guides_env.am index f3ed77f69..e31b76b81 100644 --- a/cde/doc/common/guides/guides_env.am +++ b/cde/doc/common/guides/guides_env.am @@ -4,26 +4,31 @@ INFOLIB = ../cde.dti BOOKCASE = CDEDOC INFOLIBNAME = -n cde -# INFOLIBDESC = -d InfoLibDesc +# INFOLIBDESC must be set in the per-lang guides/Makefile.am (without +# the -d option) prior to including this file. +# orig: INFOLIBDESC = -d InfoLibDesc + SSENTS = -m common/catalog DGENV = LANG=$(LANG) SGML_SEARCH_PATH=".:.." DTINFOGENOPTIONS = $(INFOLIBNAME) -d $(INFOLIBDESC) -# Note the triple-dollar sign - this escapes $$ (pid) for the tmp dir -DTINFOGENTMPDIR = /tmp/guides.$$$ +# Note the quad-dollar sign - this escapes $$ (pid) for the tmp +# dir. This is required for milti-core builds to work. +DTINFOGENTMPDIR = /tmp/dtinfogen-guides.$$$$ DTHELPSRC = $(top_srcdir)/lib/DtHelp DTLCXENVSETUP = DTLCXSEARCHPATH=$(DTHELPSRC) DTINFOGENSRC = $(top_srcdir)/programs/dtinfo/dtinfogen -SGMLDIR = $(top_builddir)/programs/nsgmls +NSGMLS = $(top_builddir)/programs/nsgmls DTSRDIR = $(top_builddir)/programs/dtsr -DTINFOGEN = $(DTLCXENVSETUP) DTINFO_HOME=$(DTINFOGENSRC) \ - DTINFO_BIN=$(DTINFOGENSRC)/install:$(DTINFOGENSRC)/mmdb/StyleSheet:$(DTINFOGENSRC)/mmdb/src:$(SGMLDIR):$(DTSRDIR) \ - $(DTINFOGENSRC)/infolib/etc/dtinfogen - SGMLDIR = $(top_srcdir)/programs/dtinfo/dtinfogen/infolib/C/SGML SGMLDEPS = $(SGMLDIR)/docbook.dtd $(SGMLDIR)/iso-box.gml \ $(SGMLDIR)/iso-dia.gml $(SGMLDIR)/iso-grk3.gml $(SGMLDIR)/iso-lat1.gml \ $(SGMLDIR)/iso-lat2.gml $(SGMLDIR)/iso-num.gml $(SGMLDIR)/iso-pub.gml \ $(SGMLDIR)/iso-tech.gml + +DTINFOGEN = $(DTLCXENVSETUP) DTINFO_HOME=$(DTINFOGENSRC) \ + DTINFO_BIN=$(DTINFOGENSRC)/install:$(DTINFOGENSRC)/mmdb/StyleSheet:$(DTINFOGENSRC)/mmdb/src:$(NSGMLS):$(DTSRDIR) \ + $(DTINFOGENSRC)/infolib/etc/dtinfogen + From a9e028f7c642592f4e9873d0fbe4a31317b4038c Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Thu, 9 Dec 2021 14:38:15 -0700 Subject: [PATCH 14/25] doc/C: get m-guides setup --- cde/.gitignore | 2 +- cde/configure.ac | 1 + cde/doc/C/Makefile.am | 2 +- cde/doc/C/m-guides/Makefile.am | 9 +++++++++ 4 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 cde/doc/C/m-guides/Makefile.am diff --git a/cde/.gitignore b/cde/.gitignore index 4c1c9d57a..4bbcdacad 100644 --- a/cde/.gitignore +++ b/cde/.gitignore @@ -392,7 +392,7 @@ doc/C/guides/usersGuide/TOC.sgm doc/C/guides/man/TOC.sgm doc/C/cde.dti/ doc/C/help/*.sdl -doc/C/m-guides/ +doc/C/m-guides/common doc/C/man/man1/* doc/C/man/man1m/* doc/C/man/man3/* diff --git a/cde/configure.ac b/cde/configure.ac index fb30f1a3a..55934f535 100644 --- a/cde/configure.ac +++ b/cde/configure.ac @@ -832,6 +832,7 @@ doc/C/Makefile doc/C/help/Makefile doc/C/man/Makefile doc/C/guides/Makefile +doc/C/m-guides/Makefile doc/de_DE.ISO8859-1/Makefile doc/de_DE.ISO8859-1/help/Makefile diff --git a/cde/doc/C/Makefile.am b/cde/doc/C/Makefile.am index ef4c09585..b30c5638c 100644 --- a/cde/doc/C/Makefile.am +++ b/cde/doc/C/Makefile.am @@ -1,4 +1,4 @@ MAINTAINERCLEANFILES = Makefile.in -SUBDIRS = help man guides +SUBDIRS = m-guides man guides help diff --git a/cde/doc/C/m-guides/Makefile.am b/cde/doc/C/m-guides/Makefile.am new file mode 100644 index 000000000..ffbae4f5d --- /dev/null +++ b/cde/doc/C/m-guides/Makefile.am @@ -0,0 +1,9 @@ +MAINTAINERCLEANFILES = Makefile.in + +BUILT_SOURCES = common/ManLinks.sgm +CLEANFILES = $(BUILT_SOURCES) + +$(BUILT_SOURCES): + ($(MKDIR_P) common && $(LN_S) ../../guides/common/ManLinksMotif.sgm $@) + + From b29bd77a2f4b19345c10a30b6a62d421b4f9ab6b Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Thu, 9 Dec 2021 15:48:20 -0700 Subject: [PATCH 15/25] m4/compiler_flag_chk.m4: fix bug related to not testing the actual flag --- cde/m4/compiler_flag_chk.m4 | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/cde/m4/compiler_flag_chk.m4 b/cde/m4/compiler_flag_chk.m4 index d5ce3be74..9591ceae5 100644 --- a/cde/m4/compiler_flag_chk.m4 +++ b/cde/m4/compiler_flag_chk.m4 @@ -5,17 +5,17 @@ AC_DEFUN([CXX_FLAG_CHECK], [dnl AC_MSG_CHECKING([if $CXX supports $1]) AC_LANG_PUSH([C++]) - ac_saved_cxxflags="$CXX_COMPILER_FLAGS" - CXX_COMPILER_FLAGS="-Werror $1" + ac_saved_cxxflags="$CXXFLAGS" + CXXFLAGS="-Werror $1" AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [cxx_flag_check=yes], [cxx_flag_check=no] ) AC_MSG_RESULT([$cxx_flag_check]) - CXX_COMPILER_FLAGS="$ac_saved_cxxflags" + CXXFLAGS="$ac_saved_cxxflags" if test "$cxx_flag_check" = yes then - CXX_COMPILER_FLAGS="$CXX_COMPILER_FLAGS $1" + CXX_COMPILER_FLAGS="$1 $CXX_COMPILER_FLAGS " fi AC_LANG_POP([C++]) ]) @@ -24,17 +24,17 @@ AC_DEFUN([C_FLAG_CHECK], [dnl AC_MSG_CHECKING([if $CC supports $1]) AC_LANG_PUSH([C]) - ac_saved_ccflags="$C_COMPILER_FLAGS" - C_COMPILER_FLAGS="-Werror $1" + ac_saved_ccflags="$CFLAGS" + CFLAGS="-Werror $1" AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [cc_flag_check=yes], [cc_flag_check=no] ) AC_MSG_RESULT([$cc_flag_check]) - C_COMPILER_FLAGS="$ac_saved_ccflags" + CFLAGS="$ac_saved_ccflags" if test "$cc_flag_check" = yes then - C_COMPILER_FLAGS="$C_COMPILER_FLAGS $1" + C_COMPILER_FLAGS="$1 $C_COMPILER_FLAGS " fi AC_LANG_POP([C]) ]) From 30e65c6b1419fec59fb3d2fc96aa88cbbbfaf4a8 Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Fri, 10 Dec 2021 09:47:31 -0700 Subject: [PATCH 16/25] doc/common/guides/guides_env.am: use HELP_LANG --- cde/doc/common/guides/guides_env.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cde/doc/common/guides/guides_env.am b/cde/doc/common/guides/guides_env.am index e31b76b81..fe36b809a 100644 --- a/cde/doc/common/guides/guides_env.am +++ b/cde/doc/common/guides/guides_env.am @@ -9,11 +9,11 @@ INFOLIBNAME = -n cde # orig: INFOLIBDESC = -d InfoLibDesc SSENTS = -m common/catalog -DGENV = LANG=$(LANG) SGML_SEARCH_PATH=".:.." +DGENV = LANG=$(HELP_LANG) SGML_SEARCH_PATH=".:.." DTINFOGENOPTIONS = $(INFOLIBNAME) -d $(INFOLIBDESC) # Note the quad-dollar sign - this escapes $$ (pid) for the tmp -# dir. This is required for milti-core builds to work. +# dir. This is required for multi-core builds to work. DTINFOGENTMPDIR = /tmp/dtinfogen-guides.$$$$ DTHELPSRC = $(top_srcdir)/lib/DtHelp From 383f0cf4a006125179a5f4d787aa819efeabced2 Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Fri, 10 Dec 2021 12:01:48 -0700 Subject: [PATCH 17/25] C/guides: install them --- cde/doc/C/guides/Makefile.am | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/cde/doc/C/guides/Makefile.am b/cde/doc/C/guides/Makefile.am index 98708380d..f338b8bf6 100644 --- a/cde/doc/C/guides/Makefile.am +++ b/cde/doc/C/guides/Makefile.am @@ -38,3 +38,35 @@ $(INFOLIB)/$(BOOKCASE)/dtsearch/dtsearch.ocf: $(INFOLIBDEPS) BUILT_SOURCES += $(INFOLIB)/$(BOOKCASE)/dtsearch/dtsearch.ocf CLEANFILES += $(INFOLIB)/$(BOOKCASE)/dtsearch/dtsearch.ocf + +# installation - these files *may* change depending on if the docs +# ever change, but for now we will list them as they are currently +# installed. + +cdedtidir = $(CDE_INSTALLATION_TOP)/infolib/$(HELP_LANG)/cde.dti +dist_cdedti_DATA = ../cde.dti/bookcase.map ../cde.dti/cde.oli + +cdedtidocdir = $(cdedtidir)/CDEDOC +dist_cdedtidoc_DATA = ../cde.dti/CDEDOC/CDEDOC.dbd \ + ../cde.dti/CDEDOC/CDEDOC.dbi \ + ../cde.dti/CDEDOC/CDEDOC.sch + +cdedtidocsearchdir = $(cdedtidocdir)/dtsearch +dist_cdedtidocsearch_DATA = ../cde.dti/CDEDOC/dtsearch/CDEDOC.d00 \ + ../cde.dti/CDEDOC/dtsearch/CDEDOC.d22 \ + ../cde.dti/CDEDOC/dtsearch/CDEDOC.dbd \ + ../cde.dti/CDEDOC/dtsearch/CDEDOC.k21 \ + ../cde.dti/CDEDOC/dtsearch/CDEDOC.sfx \ + ../cde.dti/CDEDOC/dtsearch/CDEDOC.d01 \ + ../cde.dti/CDEDOC/dtsearch/CDEDOC.d23 \ + ../cde.dti/CDEDOC/dtsearch/CDEDOC.k00 \ + ../cde.dti/CDEDOC/dtsearch/CDEDOC.k22 \ + ../cde.dti/CDEDOC/dtsearch/CDEDOC.stp \ + ../cde.dti/CDEDOC/dtsearch/CDEDOC.d21 \ + ../cde.dti/CDEDOC/dtsearch/CDEDOC.d99 \ + ../cde.dti/CDEDOC/dtsearch/CDEDOC.k01 \ + ../cde.dti/CDEDOC/dtsearch/CDEDOC.k23 \ + ../cde.dti/CDEDOC/dtsearch/dtsearch.ocf + +BUILT_SOURCES += $(cdedti_DATA) $(cdedtidoc_DATA) $(cdedtidocsearch_DATA) +CLEANFILES += $(cdedti_DATA) $(cdedtidoc_DATA) $(cdedtidocsearch_DATA) From f8877e8e2495fd4e4c2bf0ee661378032374f6cc Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Fri, 10 Dec 2021 12:19:13 -0700 Subject: [PATCH 18/25] dtinfo: fix some installation issues --- cde/doc/C/guides/Makefile.am | 6 ++++++ cde/programs/dtinfo/DtMmdb/Makefile.am | 2 +- cde/programs/dtinfo/DtMmdb/oliasdb/Makefile.am | 2 -- cde/programs/dtinfo/clients/dtinfo_start/Makefile.am | 3 ++- cde/programs/dtinfo/dtinfo/install/lib/Makefile.am | 2 +- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/cde/doc/C/guides/Makefile.am b/cde/doc/C/guides/Makefile.am index f338b8bf6..39da9f18e 100644 --- a/cde/doc/C/guides/Makefile.am +++ b/cde/doc/C/guides/Makefile.am @@ -70,3 +70,9 @@ dist_cdedtidocsearch_DATA = ../cde.dti/CDEDOC/dtsearch/CDEDOC.d00 \ BUILT_SOURCES += $(cdedti_DATA) $(cdedtidoc_DATA) $(cdedtidocsearch_DATA) CLEANFILES += $(cdedti_DATA) $(cdedtidoc_DATA) $(cdedtidocsearch_DATA) + +# link the C version to en_US.UTF-8 +install-data-hook: + $(RM) $(DESTDIR)$(CDE_INSTALLATION_TOP)/infolib/en_US.UTF-8 + cd $(DESTDIR)$(CDE_INSTALLATION_TOP)/infolib && $(LN_S) C en_US.UTF-8 + diff --git a/cde/programs/dtinfo/DtMmdb/Makefile.am b/cde/programs/dtinfo/DtMmdb/Makefile.am index 0951c53aa..d0c4797f3 100644 --- a/cde/programs/dtinfo/DtMmdb/Makefile.am +++ b/cde/programs/dtinfo/DtMmdb/Makefile.am @@ -29,6 +29,6 @@ libDtMmdb_la_LIBADD = api/libapi.la btree/libbtree.la \ libDtMmdb_la_LDFLAGS = -version-info 2:1:0 infolibdir = $(CDE_INSTALLATION_TOP)/infolib/etc -infolib_DATA = oliasdb/mmdb.infolib.spec \ +dist_infolib_DATA = oliasdb/mmdb.infolib.spec \ StyleSheet/hardcopy.feature.spec \ StyleSheet/online.feature.spec diff --git a/cde/programs/dtinfo/DtMmdb/oliasdb/Makefile.am b/cde/programs/dtinfo/DtMmdb/oliasdb/Makefile.am index 436f1c46e..fdc97de6a 100644 --- a/cde/programs/dtinfo/DtMmdb/oliasdb/Makefile.am +++ b/cde/programs/dtinfo/DtMmdb/oliasdb/Makefile.am @@ -2,8 +2,6 @@ infolibdir = ${prefix}/infolib MAINTAINERCLEANFILES = Makefile.in -infolib_DATA = mmdb.infolib.spec - noinst_LTLIBRARIES = liboliasdb.la liboliasdb_la_CXXFLAGS = -DC_API -DNO_DB_LOCK -DCDE_NEXT -I.. -I../misc \ diff --git a/cde/programs/dtinfo/clients/dtinfo_start/Makefile.am b/cde/programs/dtinfo/clients/dtinfo_start/Makefile.am index b19afee3e..9ad8f0126 100644 --- a/cde/programs/dtinfo/clients/dtinfo_start/Makefile.am +++ b/cde/programs/dtinfo/clients/dtinfo_start/Makefile.am @@ -1,6 +1,7 @@ MAINTAINERCLEANFILES = Makefile.in -noinst_PROGRAMS = dtinfo_start +startinstdir = $(CDE_INSTALLATION_TOP)/infolib/etc +startinst_PROGRAMS = dtinfo_start BUILT_SOURCES = dtinfo_start.opnums diff --git a/cde/programs/dtinfo/dtinfo/install/lib/Makefile.am b/cde/programs/dtinfo/dtinfo/install/lib/Makefile.am index bde9efe87..ad68f1716 100644 --- a/cde/programs/dtinfo/dtinfo/install/lib/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/install/lib/Makefile.am @@ -5,4 +5,4 @@ etcdir = $(CDE_CONFIGURATION_TOP) SUBDIRS = bitmaps fonts infolibdir = $(CDE_INSTALLATION_TOP)/infolib/etc -infolib_DATA = mmdb.mark.spec +dist_infolib_DATA = mmdb.mark.spec From b900f8a36def7a981d8b2ad4a1a61e2be0fcca9a Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Fri, 10 Dec 2021 14:08:02 -0700 Subject: [PATCH 19/25] DtPamSvc: move PamSvc.h to include/Dt/ --- cde/{lib/DtPamSvc => include/Dt}/PamSvc.h | 0 cde/lib/DtPamSvc/Makefile.am | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) rename cde/{lib/DtPamSvc => include/Dt}/PamSvc.h (100%) diff --git a/cde/lib/DtPamSvc/PamSvc.h b/cde/include/Dt/PamSvc.h similarity index 100% rename from cde/lib/DtPamSvc/PamSvc.h rename to cde/include/Dt/PamSvc.h diff --git a/cde/lib/DtPamSvc/Makefile.am b/cde/lib/DtPamSvc/Makefile.am index cdc2b2e75..60aa5afce 100644 --- a/cde/lib/DtPamSvc/Makefile.am +++ b/cde/lib/DtPamSvc/Makefile.am @@ -2,7 +2,8 @@ MAINTAINERCLEANFILES = Makefile.in lib_LTLIBRARIES = libDtPamSvc.la -libDtPamSvc_la_SOURCES = PamSvc.c ${top_srcdir}/Dt/PamSvc.h +# the PamSvc.h header file is located in include/Dt/ +libDtPamSvc_la_SOURCES = PamSvc.c ${top_srcdir}/include/Dt/PamSvc.h libDtPamSvc_la_LIBADD = -lpam From 18e25ce2733fa9e5da389d0a32f22b7d5c0ea226 Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Fri, 10 Dec 2021 17:24:40 -0700 Subject: [PATCH 20/25] dtsession/SmUI.c: fix a build issue on OpenBSD 7 --- cde/programs/dtsession/SmUI.c | 308 +++++++++++++++++----------------- 1 file changed, 154 insertions(+), 154 deletions(-) diff --git a/cde/programs/dtsession/SmUI.c b/cde/programs/dtsession/SmUI.c index 48cbb1749..6f07ec406 100644 --- a/cde/programs/dtsession/SmUI.c +++ b/cde/programs/dtsession/SmUI.c @@ -45,17 +45,17 @@ ** ** ******************************************************************* - ** (c) Copyright Hewlett-Packard Company, 1990. All rights are - ** reserved. Copying or other reproduction of this program - ** except for archival purposes is prohibited without prior - ** written consent of Hewlett-Packard Company. + ** (c) Copyright Hewlett-Packard Company, 1990. All rights are + ** reserved. Copying or other reproduction of this program + ** except for archival purposes is prohibited without prior + ** written consent of Hewlett-Packard Company. ******************************************************************** ** ** ** ***************************************************************************** *************************************<+>*************************************/ -#ifndef _XOPEN_SOURCE +#if defined(__linux__) && !defined(_XOPEN_SOURCE) # define _XOPEN_SOURCE 600 #endif @@ -160,7 +160,7 @@ static Boolean saveTimeout; * Inputs: * ------ * - * + * * Outputs: * ------- * None. @@ -168,9 +168,9 @@ static Boolean saveTimeout; * * Comments: * -------- - * + * *************************************<->***********************************/ -Widget +Widget CreateLockDialog( void ) { int i, slen; @@ -181,7 +181,7 @@ CreateLockDialog( void ) char *lockMessage; char *envLog; Pixel fg, bg, focus_color; /* foreground, background colors */ - + i = 0; XtSetArg(uiArgs[i], XmNallowShellResize, True); i++; XtSetArg(uiArgs[i], XmNmarginWidth, 0); i++; @@ -203,10 +203,10 @@ CreateLockDialog( void ) XtSetArg(uiArgs[i], XmNmwmDecorations, 0);i++; XtSetArg(uiArgs[i], XmNmwmInputMode, MWM_INPUT_SYSTEM_MODAL);i++; XtSetValues(XtParent(tmpLock), uiArgs, i); - + i = 0; XtSetArg(uiArgs[i], XmNshadowType, XmSHADOW_OUT); i++; - XtSetArg(uiArgs[i], XmNshadowThickness, 2); i++; + XtSetArg(uiArgs[i], XmNshadowThickness, 2); i++; XtSetArg(uiArgs[i], XmNtopAttachment, XmATTACH_FORM); i++; XtSetArg(uiArgs[i], XmNtopOffset, 15); i++; XtSetArg(uiArgs[i], XmNbottomAttachment, XmATTACH_FORM); i++; @@ -232,7 +232,7 @@ CreateLockDialog( void ) i = 0; XtSetArg(uiArgs[i], XmNshadowType, XmSHADOW_OUT); i++; - XtSetArg(uiArgs[i], XmNshadowThickness, 2); i++; + XtSetArg(uiArgs[i], XmNshadowThickness, 2); i++; XtSetArg(uiArgs[i], XmNtopAttachment, XmATTACH_FORM); i++; XtSetArg(uiArgs[i], XmNtopOffset, 15); i++; XtSetArg(uiArgs[i], XmNbottomAttachment, XmATTACH_FORM); i++; @@ -245,7 +245,7 @@ CreateLockDialog( void ) loginFrame = XmCreateFrame(tmpLock, "loginFrame", uiArgs, i); - /* + /* * create the login matte... */ i = 0; @@ -256,7 +256,7 @@ CreateLockDialog( void ) * create the login/password forms */ i = 0; - XtSetArg(uiArgs[i], XmNshadowThickness, 0); i++; + XtSetArg(uiArgs[i], XmNshadowThickness, 0); i++; XtSetArg(uiArgs[i], XmNrightAttachment, XmATTACH_FORM); i++; XtSetArg(uiArgs[i], XmNrightOffset, 15); i++; XtSetArg(uiArgs[i], XmNbottomAttachment, XmATTACH_POSITION); i++; @@ -267,7 +267,7 @@ CreateLockDialog( void ) i = 0; XtSetArg(uiArgs[i], XmNresizePolicy, XmRESIZE_NONE);i++; - XtSetArg(uiArgs[i], XmNshadowThickness, 0); i++; + XtSetArg(uiArgs[i], XmNshadowThickness, 0); i++; XtSetArg(uiArgs[i], XmNtopAttachment, XmATTACH_POSITION); i++; XtSetArg(uiArgs[i], XmNtopPosition, 50); i++; XtSetArg(uiArgs[i], XmNleftAttachment, XmATTACH_OPPOSITE_WIDGET); i++; @@ -364,9 +364,9 @@ CreateLockDialog( void ) XtGetValues(indFrame, uiArgs, i); XtVaSetValues ( smDD.indLabel[0], XmNborderWidth, 2, - XmNborderColor, focus_color, + XmNborderColor, focus_color, NULL ); - + /* * Manage forms AFTER all children have been managed */ @@ -391,7 +391,7 @@ CreateLockDialog( void ) * Description: * ----------- * Determines which exit routines get called when an exit request is made - * of the session manager. + * of the session manager. * If smGD.bmsDead == false, we just exit. * If ASK_STATE is turned on, the query dialog is * put up, if VERBOSE is on, confirm exit in current mode (restart or reset) @@ -402,7 +402,7 @@ CreateLockDialog( void ) * ------ * msg -- if non-zero, Session_Exit request to reply/fail && destroy * - * + * * Outputs: * ------- * None. @@ -410,7 +410,7 @@ CreateLockDialog( void ) * * Comments: * -------- - * + * *************************************<->***********************************/ void ExitSession( @@ -430,7 +430,7 @@ ExitSession( } else { - if(smSettings.confirmMode == DtSM_VERBOSE_MODE || + if(smSettings.confirmMode == DtSM_VERBOSE_MODE || smSettings.startState == DtSM_ASK_STATE) { ConfirmExit( msg, True ); @@ -460,7 +460,7 @@ ExitSession( * ------ * msg -- if non-zero, Session_Exit request to reply/fail && destroy * - * + * * Outputs: * ------- * None. @@ -468,10 +468,10 @@ ExitSession( * * Comments: * -------- - * + * *************************************<->***********************************/ -int -ConfirmExit( +int +ConfirmExit( Tt_message msg, Boolean doSave) { @@ -489,13 +489,13 @@ ConfirmExit( /* * Create all compound strings for confirmation dialogs */ - returnToCurrent = XmStringCreateLocalized(((char *)GETMESSAGE(18, 4, + returnToCurrent = XmStringCreateLocalized(((char *)GETMESSAGE(18, 4, "Exiting the desktop session...\n\n\ Your Current session will be restored upon login.\n\n\ Application updates you have not saved will be lost.\n\n\ Continue Logout?"))); - homeToHome = XmStringCreateLocalized(((char *)GETMESSAGE(18, 5, + homeToHome = XmStringCreateLocalized(((char *)GETMESSAGE(18, 5, "Exiting the desktop session...\n\n\ Your Home session will be restored upon login.\n\ Your Current session will not be saved.\n\n\ @@ -513,13 +513,13 @@ Continue Logout?"))); * Build up the correct string for this dialog */ i = 0; - if (smGD.sessionType == HOME_SESSION && - smSettings.startState == DtSM_HOME_STATE) + if (smGD.sessionType == HOME_SESSION && + smSettings.startState == DtSM_HOME_STATE) { XtSetArg(uiArgs[i], XmNmessageString, homeToHome); i++; } else if (smGD.sessionType == CURRENT_SESSION && - smSettings.startState == DtSM_HOME_STATE) + smSettings.startState == DtSM_HOME_STATE) { XtSetArg(uiArgs[i], XmNmessageString, currentToHome); i++; } @@ -546,7 +546,7 @@ Continue Logout?"))); smDD.confExit = XmCreateWarningDialog(smGD.topLevelWid, "exitDialog", uiArgs, i); - + i = 0; XtSetArg(uiArgs[i], XmNuseAsyncGeometry, True);i++; XtSetArg(uiArgs[i], XmNmwmFunctions, 0);i++; @@ -577,13 +577,13 @@ Continue Logout?"))); * restored so must update the dialog's message. */ i = 0; - if (smGD.sessionType == HOME_SESSION && - smSettings.startState == DtSM_HOME_STATE) + if (smGD.sessionType == HOME_SESSION && + smSettings.startState == DtSM_HOME_STATE) { XtSetArg(uiArgs[i], XmNmessageString, homeToHome); i++; } else if (smGD.sessionType == CURRENT_SESSION && - smSettings.startState == DtSM_HOME_STATE) + smSettings.startState == DtSM_HOME_STATE) { XtSetArg(uiArgs[i], XmNmessageString, currentToHome); i++; } @@ -605,7 +605,7 @@ Continue Logout?"))); XtAddCallback (XtParent(smDD.confExit), XmNpopupCallback, DialogUp, NULL); - + XtManageChild(smDD.confExit); return(0); } @@ -625,7 +625,7 @@ Continue Logout?"))); * Inputs: * ------ * - * + * * Outputs: * ------- * None. @@ -633,9 +633,9 @@ Continue Logout?"))); * * Comments: * -------- - * + * *************************************<->***********************************/ -int +int WarnMsgFailure( void ) { int i; @@ -644,7 +644,7 @@ WarnMsgFailure( void ) if(smDD.deadWid == NULL) { - bmsDeadString = XmStringCreateLocalized(((char *)GETMESSAGE(18, 38, + bmsDeadString = XmStringCreateLocalized(((char *)GETMESSAGE(18, 38, "Messaging System Inoperative\n\n\ To restart:\n\n1) Save all open data files.\n\ 2) Logout.\n\ @@ -675,7 +675,7 @@ proceed to save your files."))); (MWM_DECOR_TITLE | MWM_DECOR_BORDER));i++; XtSetArg(uiArgs[i], XmNmwmInputMode, MWM_INPUT_SYSTEM_MODAL);i++; XtSetValues(XtParent(smDD.deadWid), uiArgs, i); - + XtAddCallback (XtParent(smDD.deadWid), XmNpopupCallback, DialogUp, NULL); XtUnmanageChild(XmMessageBoxGetChild(smDD.deadWid, @@ -714,7 +714,7 @@ proceed to save your files."))); * Inputs: * ------ * - * + * * Outputs: * ------- * None. @@ -722,9 +722,9 @@ proceed to save your files."))); * * Comments: * -------- - * + * *************************************<->***********************************/ -static int +static int CompatModeExit( void ) { int i; @@ -733,7 +733,7 @@ CompatModeExit( void ) if(smDD.compatExit == NULL) { - compatModeString = XmStringCreateLocalized(((char *)GETMESSAGE(18, 34, + compatModeString = XmStringCreateLocalized(((char *)GETMESSAGE(18, 34, "This session was started from an X Window System startup script.\n\n\ No session information will be saved.\n\nUse the reset key sequence to log out."))); @@ -761,7 +761,7 @@ No session information will be saved.\n\nUse the reset key sequence to log out." (MWM_DECOR_TITLE | MWM_DECOR_BORDER));i++; XtSetArg(uiArgs[i], XmNmwmInputMode, MWM_INPUT_SYSTEM_MODAL);i++; XtSetValues(XtParent(smDD.compatExit), uiArgs, i); - + XtAddCallback (XtParent(smDD.compatExit), XmNpopupCallback, DialogUp, NULL); XtUnmanageChild(XmMessageBoxGetChild(smDD.compatExit, @@ -798,7 +798,7 @@ No session information will be saved.\n\nUse the reset key sequence to log out." * Inputs: * ------ * - * + * * Outputs: * ------- * None. @@ -806,9 +806,9 @@ No session information will be saved.\n\nUse the reset key sequence to log out." * * Comments: * -------- - * + * *************************************<->***********************************/ -Widget +Widget CreateLockDialogWithCover( Widget parent ) { @@ -848,7 +848,7 @@ CreateLockDialogWithCover( XtSetArg(uiArgs[i], XmNforeground, &fg); i++; XtSetArg(uiArgs[i], XmNbackground, &bg); i++; XtGetValues(tmpLock, uiArgs, i); - + i = 0; XtSetArg(uiArgs[i], XmNfillMode, XmFILL_SELF); i++; XtSetArg(uiArgs[i], XmNbehavior, XmICON_LABEL); i++; @@ -858,10 +858,10 @@ CreateLockDialogWithCover( XtSetArg(uiArgs[i], XmNshadowThickness, 0); i++; XtSetArg(uiArgs[i], XmNtraversalOn, False); i++; loginPic = _DtCreateIcon(picFrame, "lockLabelPixmap", uiArgs, i); - + i = 0; XtSetArg(uiArgs[i], XmNshadowType, XmSHADOW_OUT); i++; - XtSetArg(uiArgs[i], XmNshadowThickness, 2); i++; + XtSetArg(uiArgs[i], XmNshadowThickness, 2); i++; XtSetArg(uiArgs[i], XmNtopAttachment, XmATTACH_FORM); i++; XtSetArg(uiArgs[i], XmNtopOffset, 15); i++; XtSetArg(uiArgs[i], XmNbottomAttachment, XmATTACH_FORM); i++; @@ -873,7 +873,7 @@ CreateLockDialogWithCover( XtSetArg(uiArgs[i], XmNrightOffset, 0); i++; loginFrame = XmCreateFrame(tmpLock, "loginFrame", uiArgs, i); - /* + /* * create the login matte... */ i = 0; @@ -884,7 +884,7 @@ CreateLockDialogWithCover( * create the login/password forms */ i = 0; - XtSetArg(uiArgs[i], XmNshadowThickness, 0); i++; + XtSetArg(uiArgs[i], XmNshadowThickness, 0); i++; XtSetArg(uiArgs[i], XmNrightAttachment, XmATTACH_FORM); i++; XtSetArg(uiArgs[i], XmNrightOffset, 15); i++; XtSetArg(uiArgs[i], XmNbottomAttachment, XmATTACH_POSITION); i++; @@ -895,7 +895,7 @@ CreateLockDialogWithCover( i = 0; XtSetArg(uiArgs[i], XmNresizePolicy, XmRESIZE_NONE);i++; - XtSetArg(uiArgs[i], XmNshadowThickness, 0); i++; + XtSetArg(uiArgs[i], XmNshadowThickness, 0); i++; XtSetArg(uiArgs[i], XmNtopAttachment, XmATTACH_POSITION); i++; XtSetArg(uiArgs[i], XmNtopPosition, 50); i++; XtSetArg(uiArgs[i], XmNleftAttachment, XmATTACH_OPPOSITE_WIDGET); i++; @@ -985,7 +985,7 @@ CreateLockDialogWithCover( uiArgs, i); XtManageChild(smDD.indLabel[1]); XmStringFree(passwordString); - + i = 0; XtSetArg(uiArgs[i], XmNhighlightColor, &focus_color); i++; XtGetValues(indFrame, uiArgs, i); @@ -1003,7 +1003,7 @@ CreateLockDialogWithCover( XtManageChild(loginPic); XtManageChild(picFrame); XtManageChild(loginFrame); - + return(tmpLock); } @@ -1022,7 +1022,7 @@ CreateLockDialogWithCover( * Inputs: * ------ * - * + * * Outputs: * ------- * None. @@ -1030,9 +1030,9 @@ CreateLockDialogWithCover( * * Comments: * -------- - * + * *************************************<->***********************************/ -Widget +Widget CreateCoverDialog( int screenNum, Boolean withLock ) @@ -1080,7 +1080,7 @@ CreateCoverDialog( } XtRealizeWidget(tmpCover); - + return(tmpCover); } @@ -1100,7 +1100,7 @@ CreateCoverDialog( * Inputs: * ------ * - * + * * Outputs: * ------- * None. @@ -1108,9 +1108,9 @@ CreateCoverDialog( * * Comments: * -------- - * + * *************************************<->***********************************/ -static void +static void ExitConfirmed( Widget w, XtPointer client_data, @@ -1141,7 +1141,7 @@ ExitConfirmed( * msg -- if non-zero, Session_Exit request to reply/fail && destroy * doSave - if True, the session will be saved. * - * + * * Outputs: * ------- * None. @@ -1149,9 +1149,9 @@ ExitConfirmed( * * Comments: * -------- - * + * *************************************<->***********************************/ -void +void ImmediateExit( int mode, Tt_message msg, @@ -1200,14 +1200,14 @@ ImmediateExit( if (smGD.sessionType == CURRENT_SESSION || smGD.sessionType == DEFAULT_SESSION) - SaveState (False, DtSM_CURRENT_STATE, SmSaveLocal, True, + SaveState (False, DtSM_CURRENT_STATE, SmSaveLocal, True, DEFAULT_INTERACT_STYLE, DEFAULT_FAST, DEFAULT_GLOBAL); - else if (smGD.sessionType == HOME_SESSION && + else if (smGD.sessionType == HOME_SESSION && smSettings.startState == DtSM_CURRENT_STATE) - SaveState (False, DtSM_HOME_STATE, SmSaveLocal, True, + SaveState (False, DtSM_HOME_STATE, SmSaveLocal, True, DEFAULT_INTERACT_STYLE, DEFAULT_FAST, DEFAULT_GLOBAL); else - SaveState (False, DtSM_HOME_STATE, SmSaveGlobal, True, + SaveState (False, DtSM_HOME_STATE, SmSaveGlobal, True, DEFAULT_INTERACT_STYLE, DEFAULT_FAST, DEFAULT_GLOBAL); /* @@ -1225,10 +1225,10 @@ ImmediateExit( smGD.ExitComplete = False; saveTimeout = False; - timerId = XtAppAddTimeOut (smGD.appCon, smRes.saveYourselfTimeout, + timerId = XtAppAddTimeOut (smGD.appCon, smRes.saveYourselfTimeout, SaveTimeout, NULL); - while (smXSMP.saveState.saveComplete == False && + while (smXSMP.saveState.saveComplete == False && smXSMP.saveState.shutdownCanceled == False) { if (saveTimeout) break; @@ -1237,19 +1237,19 @@ ImmediateExit( XtDispatchEvent(&next); } } - + /* JET - need this, since dtsession was exiting in the * XtAppNextEvent above (receiving it's own EXIT SM message) This * is checked in SmExit() so exit's will only occur after this * housekeeping has been completed. */ - smGD.ExitComplete = True; + smGD.ExitComplete = True; if (smXSMP.saveState.shutdownCanceled == False) { - /* + /* * Run the user's exit script if there is one */ - if (smGD.compatMode == False) + if (smGD.compatMode == False) { StartEtc(True); /* run sessionexit */ } @@ -1276,7 +1276,7 @@ ImmediateExit( * client_data - tells which dialog to unmange (the query or confirm exit) * msg -- if non-zero, Session_Exit request to reply/fail && destroy * - * + * * Outputs: * ------- * None. @@ -1284,9 +1284,9 @@ ImmediateExit( * * Comments: * -------- - * + * *************************************<->***********************************/ -static void +static void ExitCancelled( Widget w, XtPointer client_data, @@ -1326,7 +1326,7 @@ ExitCancelled( * Inputs: * ------ * - * + * * Outputs: * ------- * None @@ -1335,9 +1335,9 @@ ExitCancelled( * Comments: * -------- * This routine can be used for any generic SYSTEM_MODAL dialog - * + * *************************************<->***********************************/ -void +void DialogUp( Widget w, XtPointer client_data, @@ -1355,12 +1355,12 @@ DialogUp( XtSetArg(uiArgs[i], XmNwidth, &width);i++; XtSetArg(uiArgs[i], XmNheight, &height);i++; XtGetValues(w, uiArgs, i); - + /* JET - get xinerama info */ #ifdef USE_XINERAMA /* use the 'prefered' screen */ - if (!_DtXineramaGetScreen(smGD.DtXineramaInfo, - smRes.xineramaPreferredScreen, + if (!_DtXineramaGetScreen(smGD.DtXineramaInfo, + smRes.xineramaPreferredScreen, &dpwidth, &dpheight, &xorg, &yorg)) { /* no joy here either - setup for normal */ dpwidth = DisplayWidth(smGD.display, smGD.screen); @@ -1405,7 +1405,7 @@ DialogUp( * ------ * flag = TRUE for Enter, FALSE for Leave. * - * + * * Outputs: * ------- * None. @@ -1414,19 +1414,19 @@ DialogUp( * Comments: * -------- * Stolen from the window manager code. - * + * *************************************<->***********************************/ -void +void ShowWaitState( Boolean flag ) { if (flag) { - XGrabPointer (smGD.display, DefaultRootWindow(smGD.display), FALSE, - 0, GrabModeAsync, GrabModeAsync, None, + XGrabPointer (smGD.display, DefaultRootWindow(smGD.display), FALSE, + 0, GrabModeAsync, GrabModeAsync, None, smGD.waitCursor, CurrentTime); - XGrabKeyboard (smGD.display, DefaultRootWindow(smGD.display), FALSE, + XGrabKeyboard (smGD.display, DefaultRootWindow(smGD.display), FALSE, GrabModeAsync, GrabModeAsync, CurrentTime); } else @@ -1456,9 +1456,9 @@ ShowWaitState( * Comments: * --------- * This code was stolen from the window manager - * + * *************************************<->***********************************/ -Boolean +Boolean InitCursorInfo( void ) { unsigned int cWidth; @@ -1492,7 +1492,7 @@ InitCursorInfo( void ) * Inputs: * ------ * - * + * * Outputs: * ------- * None. @@ -1500,20 +1500,20 @@ InitCursorInfo( void ) * * Comments: * -------- - * + * *************************************<->***********************************/ -static void +static void LockDialogUp( Widget w, XtPointer client_data, XtPointer call_data ) { - + register int i; Dimension width, height; /* size values returned by XtGetValues */ Dimension shadowThickness;/* size values returned by XtGetValues */ unsigned int dpwidth, dpheight, xorg, yorg; /* JET - xinerama */ - + struct { /* position, size of widgets (pixels) */ int x, y; @@ -1525,12 +1525,12 @@ LockDialogUp( int width1, width2; /* general width variable */ int x1, y1; /* general position variables */ int index; - + /* JET - get xinerama info */ #ifdef USE_XINERAMA /* use the prefered screen */ - if (!_DtXineramaGetScreen(smGD.DtXineramaInfo, - smRes.xineramaPreferredScreen, + if (!_DtXineramaGetScreen(smGD.DtXineramaInfo, + smRes.xineramaPreferredScreen, &dpwidth, &dpheight, &xorg, &yorg)) { /* no joy here either - setup for normal */ dpwidth = DisplayWidth(smGD.display, smGD.screen); @@ -1555,7 +1555,7 @@ LockDialogUp( { index = 0; } - + /* * - center the main matte horizontally and vertically... */ @@ -1573,7 +1573,7 @@ LockDialogUp( if ( mw.x < 0 ) mw.x = 0; if ( mw.y < 0 ) mw.y = 0; - + /* adjust origins if using Xinerama */ x1 = mw.x + xorg; y1 = mw.y + yorg; @@ -1590,12 +1590,12 @@ LockDialogUp( */ XtSetArg(uiArgs[0], XmNwidth, &width); XtGetValues(smDD.loginMatte[index], uiArgs, 1); - width1 = (int)width; + width1 = (int)width; XtSetArg(uiArgs[0], XmNwidth, &width); XtGetValues(smDD.loginForm[index], uiArgs, 1); width2 = (int)width; - + i = 0; XtSetArg(uiArgs[i], XmNleftAttachment, XmATTACH_FORM); i++; XtSetArg(uiArgs[i], XmNleftOffset, (width1 - width2) / 2); i++; @@ -1619,7 +1619,7 @@ LockDialogUp( * ------ * client_data - sends in the dialog to be dismissed. * - * + * * Outputs: * ------- * None. @@ -1627,9 +1627,9 @@ LockDialogUp( * * Comments: * -------- - * + * *************************************<->***********************************/ -static void +static void SimpleOK( Widget w, XtPointer client_data, @@ -1673,7 +1673,7 @@ SimpleOK( * ------ * numChars = number of characters entered into the field * - * + * * Outputs: * ------- * None. @@ -1681,9 +1681,9 @@ SimpleOK( * * Comments: * -------- - * + * *************************************<->***********************************/ -void +void UpdatePasswdField( int numChars ) { @@ -1726,7 +1726,7 @@ UpdatePasswdField( { index = 0; } - + i = 0; XtSetArg(uiArgs[i], XmNlabelString, tmpString); i++; XtSetValues(smDD.indLabel[index], uiArgs, i); @@ -1750,7 +1750,7 @@ UpdatePasswdField( * Inputs: * ------ * - * + * * Outputs: * ------- * None. @@ -1758,9 +1758,9 @@ UpdatePasswdField( * * Comments: * -------- - * + * *************************************<->***********************************/ -int +int WarnNoStartup( void ) { int i; @@ -1824,7 +1824,7 @@ For additional information, see the CDE User's Guide."))); * * Inputs: * ------ - * + * * Outputs: * ------- * @@ -1833,7 +1833,7 @@ For additional information, see the CDE User's Guide."))); * * Comments: * -------- - * + * *************************************<->***********************************/ Boolean ConfirmSessionCreation ( @@ -1877,7 +1877,7 @@ ConfirmSessionCreation ( SM_EXIT(1); } - pch2 = strdup ((char *) GETMESSAGE(18, 52, + pch2 = strdup ((char *) GETMESSAGE(18, 52, "A display-specific '%s' session was selected\nfor display '%s' but one does not exist.\n\nIf you continue, a new display-specific session will\nbe created.")); if (!pch2) { PrintError(DtError, smNLS.cantMallocErrorString); @@ -1900,7 +1900,7 @@ ConfirmSessionCreation ( j = 0; XtToolkitInitialize (); smGD.appCon = XtCreateApplicationContext(); - smGD.display = XtOpenDisplay(smGD.appCon, NULL, argv[0], + smGD.display = XtOpenDisplay(smGD.appCon, NULL, argv[0], SM_RESOURCE_CLASS, NULL, 0, &argc, argv); XtSetArg(args[j], XmNbackground, @@ -1944,7 +1944,7 @@ ConfirmSessionCreation ( smDD.confirmSession = XmCreateWarningDialog( tmp_widget, "confirmDialog", uiArgs, i); - XtAddCallback (smDD.confirmSession, XmNokCallback, + XtAddCallback (smDD.confirmSession, XmNokCallback, ConfirmOKCB, NULL); /* @@ -1961,7 +1961,7 @@ ConfirmSessionCreation ( XtAddCallback (smDD.confirmSession, XmNcancelCallback, ConfirmCancelCB, NULL); - + XtManageChild(smDD.confirmSession); /* @@ -1972,9 +1972,9 @@ ConfirmSessionCreation ( XtSetArg(uiArgs[i], XmNheight, &height); i++; XtGetValues(smDD.confirmSession, uiArgs, i); - x = (DisplayWidth(smGD.display, XDefaultScreen(smGD.display)) / 2) + x = (DisplayWidth(smGD.display, XDefaultScreen(smGD.display)) / 2) - (width / 2); - y = (DisplayHeight(smGD.display, XDefaultScreen(smGD.display)) / 2) + y = (DisplayHeight(smGD.display, XDefaultScreen(smGD.display)) / 2) - (height / 2); i = 0; @@ -2014,7 +2014,7 @@ ConfirmSessionCreation ( * ConfirmOKCB () * *************************************<->***********************************/ -static void +static void ConfirmOKCB( Widget w, XtPointer client_data, @@ -2028,9 +2028,9 @@ ConfirmOKCB( /*************************************<->************************************* * * ConfirmCancelCB () - * + * *************************************<->***********************************/ -static void +static void ConfirmCancelCB( Widget w, XtPointer client_data, @@ -2050,7 +2050,7 @@ ConfirmCancelCB( * * Inputs: * ------ - * + * * Outputs: * ------- * @@ -2059,7 +2059,7 @@ ConfirmCancelCB( * * Comments: * -------- - * + * *************************************<->***********************************/ void PostXSMPFailureDialog ( @@ -2082,7 +2082,7 @@ PostXSMPFailureDialog ( XEvent next; int len; - pch1 = strdup ((char *) GETMESSAGE(40, 1, + pch1 = strdup ((char *) GETMESSAGE(40, 1, "A session cannot be started because of the\nfollowing error:")); if (!pch1) { PrintError(DtError, smNLS.cantMallocErrorString); @@ -2120,14 +2120,14 @@ PostXSMPFailureDialog ( SM_EXIT(1); } - pch3 = strdup ((char *) GETMESSAGE(18, 70, + pch3 = strdup ((char *) GETMESSAGE(18, 70, "See the following for more information:")); if (!pch3) { PrintError(DtError, smNLS.cantMallocErrorString); SM_EXIT(1); } - pch4 = strdup ((char *) GETMESSAGE(18, 71, + pch4 = strdup ((char *) GETMESSAGE(18, 71, "CDE Advanced Users and System's Administration Guide")); if (!pch4) { PrintError(DtError, smNLS.cantMallocErrorString); @@ -2138,7 +2138,7 @@ PostXSMPFailureDialog ( strcpy (error_file, ""); /* JET - VU#497553 */ - if (check_errorlog) + if (check_errorlog) { char *home; @@ -2151,13 +2151,13 @@ PostXSMPFailureDialog ( if (len > MAXPATHLEN) error_file = XtRealloc(error_file, len + 1); - sprintf (error_file, "%s/%s/%s", home, + sprintf (error_file, "%s/%s/%s", home, DtPERSONAL_CONFIG_DIRECTORY, DtERRORLOG_FILE); } } - pch5 = XtMalloc (strlen (pch1) + strlen (pch2) + strlen (pch3) + strlen (pch4) + + pch5 = XtMalloc (strlen (pch1) + strlen (pch2) + strlen (pch3) + strlen (pch4) + strlen (error_file) + 15); if (!pch5) { PrintError(DtError, smNLS.cantMallocErrorString); @@ -2172,13 +2172,13 @@ PostXSMPFailureDialog ( * No top level widget has been created so must create one now. */ j = 0; - XtSetArg (args[j], XmNbackground, XBlackPixel(smGD.display, + XtSetArg (args[j], XmNbackground, XBlackPixel(smGD.display, XDefaultScreen(smGD.display))); j++; XtSetArg (args[j], XmNmappedWhenManaged, False); j++; XtSetArg (args[j], XmNwidth, 1); j++; XtSetArg (args[j], XmNheight, 1); j++; - smGD.topLevelWid = XtAppCreateShell (SM_RESOURCE_NAME, + smGD.topLevelWid = XtAppCreateShell (SM_RESOURCE_NAME, SM_RESOURCE_CLASS, applicationShellWidgetClass, smGD.display, args, j); @@ -2210,7 +2210,7 @@ PostXSMPFailureDialog ( smDD.confirmSession = XmCreateWarningDialog( smGD.topLevelWid, "confirmDialog", uiArgs, i); - XtAddCallback (smDD.confirmSession, XmNokCallback, + XtAddCallback (smDD.confirmSession, XmNokCallback, XSMPFailureOKCB, NULL); /* @@ -2237,9 +2237,9 @@ PostXSMPFailureDialog ( XtSetArg(uiArgs[i], XmNheight, &height); i++; XtGetValues(smDD.confirmSession, uiArgs, i); - x = (DisplayWidth(smGD.display, XDefaultScreen(smGD.display)) / 2) + x = (DisplayWidth(smGD.display, XDefaultScreen(smGD.display)) / 2) - (width / 2); - y = (DisplayHeight(smGD.display, XDefaultScreen(smGD.display)) / 2) + y = (DisplayHeight(smGD.display, XDefaultScreen(smGD.display)) / 2) - (height / 2); i = 0; @@ -2266,7 +2266,7 @@ PostXSMPFailureDialog ( * XSMPFailureOKCB () * *************************************<->***********************************/ -static void +static void XSMPFailureOKCB( Widget w, XtPointer client_data, @@ -2290,12 +2290,12 @@ XSMPFailureOKCB( * * Inputs: * ------ - * + * * Outputs: * ------- * *************************************<->***********************************/ -void +void PostSaveSessionErrorDialog ( void ) { int i; @@ -2304,7 +2304,7 @@ PostSaveSessionErrorDialog ( void ) if(smDD.saveSession == NULL) { - messageString = XmStringCreateLocalized (((char *) GETMESSAGE(18, 56, + messageString = XmStringCreateLocalized (((char *) GETMESSAGE(18, 56, "The session cannot be saved because the required\n\ 'save_type' parameter was not in the message.\n\n\ The session will not be saved."))); @@ -2321,7 +2321,7 @@ The session will not be saved."))); XtSetArg (uiArgs[i], XmNhelpLabelString, smDD.helpString); i++; XtSetArg (uiArgs[i], XmNautoUnmanage, False); i++; - smDD.saveSession = XmCreateErrorDialog(smGD.topLevelWid, + smDD.saveSession = XmCreateErrorDialog(smGD.topLevelWid, "sessionSaveDialog", uiArgs, i); i = 0; @@ -2332,7 +2332,7 @@ The session will not be saved."))); XtSetArg (uiArgs[i], XmNmwmInputMode, MWM_INPUT_SYSTEM_MODAL);i++; XtSetValues(XtParent(smDD.saveSession), uiArgs, i); - + XtAddCallback (XtParent(smDD.saveSession), XmNpopupCallback, DialogUp, NULL); @@ -2362,7 +2362,7 @@ The session will not be saved."))); * * Inputs: * ------ - * + * * Outputs: void * ------- * @@ -2386,14 +2386,14 @@ PostReasonsDialog ( int len; XEvent next; - str1 = strdup ((char *) GETMESSAGE(40, 28, + str1 = strdup ((char *) GETMESSAGE(40, 28, "Application '%s'\nexited for the following reason:\n\n%s")); if (!str1) { PrintError(DtError, smNLS.cantMallocErrorString); SM_EXIT(1); } - for (i = 0, len = 0; i < numMsgs; i++) + for (i = 0, len = 0; i < numMsgs; i++) len += strlen (message[i]); str2 = XtMalloc (len + (numMsgs * 3) + 1); @@ -2417,7 +2417,7 @@ PostReasonsDialog ( DtMsgLogMessage (smGD.programName, DtMsgLogWarning, str3); free (str1); - str1 = strdup ((char *) GETMESSAGE(40, 29, + str1 = strdup ((char *) GETMESSAGE(40, 29, "Application Close Reasons")); if (!str1) { PrintError(DtError, smNLS.cantMallocErrorString); @@ -2444,7 +2444,7 @@ PostReasonsDialog ( XtSetArg (uiArgs[i], XmNhelpLabelString, helpString); i++; XtSetArg (uiArgs[i], XmNautoUnmanage, False); i++; - smDD.clientReasons = XmCreateWarningDialog(smGD.topLevelWid, + smDD.clientReasons = XmCreateWarningDialog(smGD.topLevelWid, "clientReasons", uiArgs, i); i = 0; @@ -2454,7 +2454,7 @@ PostReasonsDialog ( (MWM_DECOR_TITLE | MWM_DECOR_BORDER));i++; XtSetArg(uiArgs[i], XmNmwmInputMode, MWM_INPUT_SYSTEM_MODAL);i++; XtSetValues(XtParent(smDD.clientReasons), uiArgs, i); - + XtAddCallback (XtParent(smDD.clientReasons), XmNpopupCallback, DialogUp, NULL); @@ -2470,8 +2470,8 @@ PostReasonsDialog ( XtAddCallback (smDD.clientReasons, XmNhelpCallback, TopicHelpRequested, HELP_APP_CLOSE_REASONS_STR); #endif - free (str1); - XtFree (str2); + free (str1); + XtFree (str2); XtFree (str3); XmStringFree (msgString); XmStringFree (okString); @@ -2520,7 +2520,7 @@ SaveTimeout ( saveTimeout = True; if (smXSMP.saveState.shutdownCanceled == False) { - /* + /* * Run the user's exit script if there is one */ if (smGD.compatMode == False) From dda11f0e3811b0ddc2f3b87c83cfc47418aac385 Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Sat, 11 Dec 2021 13:10:24 -0700 Subject: [PATCH 21/25] Fix a bunch of -Wempty-body warnings reported by clang Many of these were real bugs, like: if (cond); do_something etc... Others were just cosmetic - like placing the ';' on a separate line to make the intention clear. --- cde/lib/DtPrint/PsubUtil.c | 3 ++- cde/lib/DtSvc/DtUtil1/GetMwmW.c | 2 +- cde/programs/dtappbuilder/src/ab/attch_ed_stubs.c | 2 +- cde/programs/dtappbuilder/src/ab/prop.c | 6 +++--- cde/programs/dtcalc/functions.c | 5 +++-- cde/programs/dtdocbook/instant/tables.c | 3 ++- cde/programs/dtlogin/util.c | 5 +++-- cde/programs/dtmail/MotifApp/DialogManager.C | 11 ++++++++--- cde/programs/dtmail/libDtMail/Common/DtMailRc.C | 4 ++-- cde/programs/dtmail/libDtMail/Common/DtMailServer.C | 3 ++- cde/programs/dtpad/printSetup.c | 2 +- 11 files changed, 28 insertions(+), 18 deletions(-) diff --git a/cde/lib/DtPrint/PsubUtil.c b/cde/lib/DtPrint/PsubUtil.c index 3359a37b6..aefc3e034 100644 --- a/cde/lib/DtPrint/PsubUtil.c +++ b/cde/lib/DtPrint/PsubUtil.c @@ -573,7 +573,8 @@ _DtPrintGetDefaultXPrinterName( else if((default_printer = getenv("XPRINTER")) != (String)NULL); else if((default_printer = getenv("PDPRINTER")) != (String)NULL); else if((default_printer = getenv("LPDEST")) != (String)NULL); - else if((default_printer = getenv("PRINTER")) != (String)NULL); + else if((default_printer = getenv("PRINTER")) != (String)NULL) + ; /* * return a copy of the printer name */ diff --git a/cde/lib/DtSvc/DtUtil1/GetMwmW.c b/cde/lib/DtSvc/DtUtil1/GetMwmW.c index 5461cefbf..e5f920076 100644 --- a/cde/lib/DtSvc/DtUtil1/GetMwmW.c +++ b/cde/lib/DtSvc/DtUtil1/GetMwmW.c @@ -149,7 +149,7 @@ _GetMwmWindow( } } - if (rcode == Success); + if (rcode == Success) { *pMwmWindow = pWmInfo->wmWindow; } diff --git a/cde/programs/dtappbuilder/src/ab/attch_ed_stubs.c b/cde/programs/dtappbuilder/src/ab/attch_ed_stubs.c index 5377bc44d..700e3d493 100644 --- a/cde/programs/dtappbuilder/src/ab/attch_ed_stubs.c +++ b/cde/programs/dtappbuilder/src/ab/attch_ed_stubs.c @@ -3670,7 +3670,7 @@ attch_ed_verify_props(void) * Get parent of current object */ parent = obj_get_parent(ats->cur_object); - if (parent); + if (parent) parent = obj_get_root(parent); /* diff --git a/cde/programs/dtappbuilder/src/ab/prop.c b/cde/programs/dtappbuilder/src/ab/prop.c index 52fff33e0..b2f19f023 100644 --- a/cde/programs/dtappbuilder/src/ab/prop.c +++ b/cde/programs/dtappbuilder/src/ab/prop.c @@ -2634,11 +2634,11 @@ propP_popup_message( /* * Free help data strings */ - if (help_data.help_text); + if (help_data.help_text) XtFree(help_data.help_text); - if (help_data.help_volume); + if (help_data.help_volume) XtFree(help_data.help_volume); - if (help_data.help_locationID); + if (help_data.help_locationID) XtFree(help_data.help_locationID); } else diff --git a/cde/programs/dtcalc/functions.c b/cde/programs/dtcalc/functions.c index 8658c83fe..1f985dc23 100644 --- a/cde/programs/dtcalc/functions.c +++ b/cde/programs/dtcalc/functions.c @@ -539,8 +539,9 @@ do_calc(void) /* Perform arithmetic calculation and display result. */ mpcdm(&dres, v->MPresult) ; } - else if (IS_KEY(v->cur_op, KEY_EQ)) /* do nothing. */ ; /* Equals */ - + else if (IS_KEY(v->cur_op, KEY_EQ)) /* Equals */ + ; /* do nothing. */ + show_display(v->MPresult) ; if (!(IS_KEY(v->current, KEY_EQ) && IS_KEY(v->old_cal_value, KEY_EQ))) diff --git a/cde/programs/dtdocbook/instant/tables.c b/cde/programs/dtdocbook/instant/tables.c index 9e67e0366..533a99c88 100644 --- a/cde/programs/dtdocbook/instant/tables.c +++ b/cde/programs/dtdocbook/instant/tables.c @@ -768,7 +768,8 @@ TblTableRowEnd( if ((at = FindAttValByName(e, "ROWSEP"))) { if (at[0] == '1') fprintf(fp, "_\n"); } - else if (rowsep) /* fprintf(fp, "_\n") */ ; + else if (rowsep) /* fprintf(fp, "_\n") */ + ; } /* diff --git a/cde/programs/dtlogin/util.c b/cde/programs/dtlogin/util.c index 8e0f51ee2..a46b7ca0c 100644 --- a/cde/programs/dtlogin/util.c +++ b/cde/programs/dtlogin/util.c @@ -705,9 +705,10 @@ ScanNLSDir(char *dirname) continue; if (locale[0] != '.' && - LANGLISTSIZE > (int) (strlen(languageList)+strlen(locale)+2)); + LANGLISTSIZE > (int) (strlen(languageList)+strlen(locale)+2)) { - (void) sprintf(locale_path, "%s/%s", dirname, locale); + (void) snprintf(locale_path, MAXPATHLEN, "%s/%s", + dirname, locale); retval = stat(locale_path, &locale_stat); if (0 == retval && S_ISDIR(locale_stat.st_mode)) diff --git a/cde/programs/dtmail/MotifApp/DialogManager.C b/cde/programs/dtmail/MotifApp/DialogManager.C index 8051a7a44..91ae65c5f 100644 --- a/cde/programs/dtmail/MotifApp/DialogManager.C +++ b/cde/programs/dtmail/MotifApp/DialogManager.C @@ -417,9 +417,14 @@ DialogManager::forceUpdate( Widget w ) if ( !w ) return; XtAppContext cxt=XtWidgetToApplicationContext( w ); - for (diashell=w;!XtIsShell(diashell);diashell=XtParent(diashell)); - for ( topshell=diashell;XtIsTopLevelShell( topshell ); - topshell = XtParent( topshell ) ); + for (diashell=w; + !XtIsShell(diashell); + diashell=XtParent(diashell)) + ; + for ( topshell=diashell; + XtIsTopLevelShell( topshell ); + topshell = XtParent( topshell ) ) + ; // if (XtIsRealized(diashell) && XtIsRealized(topshell)){ dpy=XtDisplay(diashell); diff --git a/cde/programs/dtmail/libDtMail/Common/DtMailRc.C b/cde/programs/dtmail/libDtMail/Common/DtMailRc.C index a2794c530..b4732147b 100644 --- a/cde/programs/dtmail/libDtMail/Common/DtMailRc.C +++ b/cde/programs/dtmail/libDtMail/Common/DtMailRc.C @@ -2050,8 +2050,8 @@ DtMail::MailRc::expand(char *name) close(pivec[1]); l = read(pivec[0], xname, LINESIZE); close(pivec[0]); - while (wait(&s) != pid); - ; + while (wait(&s) != pid) + ; s &= 0377; if (s != 0 && s != SIGPIPE) { fprintf(stderr, "Echo failed\n"); diff --git a/cde/programs/dtmail/libDtMail/Common/DtMailServer.C b/cde/programs/dtmail/libDtMail/Common/DtMailServer.C index 112b15872..861d06afd 100644 --- a/cde/programs/dtmail/libDtMail/Common/DtMailServer.C +++ b/cde/programs/dtmail/libDtMail/Common/DtMailServer.C @@ -789,8 +789,9 @@ DtMailServer::retrieve_messages(DtMailEnv &error) if (ok != DTME_MailServerAccess_SocketIOError) if (ok == DTME_NoError) ok = ptrans_quit(); - else + else { (void) ptrans_quit(); + } vtalarm_setitimer(0); SockClose(_sockfp); _sockfp = NULL; diff --git a/cde/programs/dtpad/printSetup.c b/cde/programs/dtpad/printSetup.c index 8191bbde6..4ae105e7e 100644 --- a/cde/programs/dtpad/printSetup.c +++ b/cde/programs/dtpad/printSetup.c @@ -280,7 +280,7 @@ PrintSetupDestroy(PrintSetup *pSetup) if (pSetup->docName) free(pSetup->docName); - if (pSetup->dtprintSetup); + if (pSetup->dtprintSetup) _psReleasePrintSetupDialog(pSetup); XtFree((char*) pSetup); } From adc056eb831de0667f61c719f11fe4a509cec4a5 Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Sat, 11 Dec 2021 14:21:14 -0700 Subject: [PATCH 22/25] MIMEBodyPart.C: fix a couple sizeof-pointer-memaccess warnings --- cde/programs/dtmail/libDtMail/RFC/MIMEBodyPart.C | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cde/programs/dtmail/libDtMail/RFC/MIMEBodyPart.C b/cde/programs/dtmail/libDtMail/RFC/MIMEBodyPart.C index 7ec705808..013425453 100644 --- a/cde/programs/dtmail/libDtMail/RFC/MIMEBodyPart.C +++ b/cde/programs/dtmail/libDtMail/RFC/MIMEBodyPart.C @@ -984,9 +984,9 @@ MIMEBodyPart::parameterValue( vtok++; if (isCaseSensitive) - rtn = strncmp(vtok, parameter, sizeof(parameter)); + rtn = strncmp(vtok, parameter, strlen(vtok)); else - rtn = strncasecmp(vtok, parameter, sizeof(parameter)); + rtn = strncasecmp(vtok, parameter, strlen(vtok)); if (0 == rtn) { From d470302354c1daf58be018fb434cc04d62fc79f7 Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Sat, 11 Dec 2021 14:45:33 -0700 Subject: [PATCH 23/25] Fix several pointer-bool-conversion warnings that could cause cores --- cde/programs/dtcreate/af_aux.c | 6 +++--- cde/programs/dtcreate/cmnrtns.c | 2 +- cde/programs/dtcreate/main.c | 2 +- cde/programs/dticon/fileIO.c | 19 +++++++++++-------- cde/programs/dticon/utils.c | 2 +- cde/programs/dtstyle/MainWin.c | 2 +- 6 files changed, 18 insertions(+), 15 deletions(-) diff --git a/cde/programs/dtcreate/af_aux.c b/cde/programs/dtcreate/af_aux.c index f5ebf2d2d..46297fba1 100644 --- a/cde/programs/dtcreate/af_aux.c +++ b/cde/programs/dtcreate/af_aux.c @@ -220,7 +220,7 @@ void getAF_Icons(FiletypeData *pFiletypedata) /***************************************************************/ pIconData = GetIconDataFromWid(AF_MED_IconGadget); if ( (pIconData->pmDirtyBit) && - (pIconData->pmFileName) && + (pIconData->pmFileName[0]) && (strlen(pIconData->pmFileName)) ) { pFiletypedata->pszMedPmIcon = XtMalloc(strlen(pIconData->pmFileName) + 1); if (pFiletypedata->pszMedPmIcon) { @@ -234,7 +234,7 @@ void getAF_Icons(FiletypeData *pFiletypedata) /* Medium Bitmap */ /***************************************************************/ if ( (pIconData->bmDirtyBit) && - (pIconData->bmFileName) && + (pIconData->bmFileName[0]) && (strlen(pIconData->bmFileName)) ) { pFiletypedata->pszMedBmIcon = XtMalloc(strlen(pIconData->bmFileName) + 1); if (pFiletypedata->pszMedBmIcon) { @@ -249,7 +249,7 @@ void getAF_Icons(FiletypeData *pFiletypedata) /***************************************************************/ pIconData = GetIconDataFromWid(AF_TINY_IconGadget); if ( (pIconData->pmDirtyBit) && - (pIconData->pmFileName) && + (pIconData->pmFileName[0]) && (strlen(pIconData->pmFileName)) ) { pFiletypedata->pszTinyPmIcon = XtMalloc(strlen(pIconData->pmFileName) + 1); if (pFiletypedata->pszTinyPmIcon) { diff --git a/cde/programs/dtcreate/cmnrtns.c b/cde/programs/dtcreate/cmnrtns.c index 56e7272ae..acab64784 100644 --- a/cde/programs/dtcreate/cmnrtns.c +++ b/cde/programs/dtcreate/cmnrtns.c @@ -700,7 +700,7 @@ void SetIconData(Widget wid, char *pszIconFile, enum icon_size_range enumIconSiz pIconData = GetIconDataFromWid(wid); if (pIconData) { if ( (pIconData->pmDirtyBit) && - (pIconData->pmFileName) && + (pIconData->pmFileName[0]) && (strlen(pIconData->pmFileName)) ) { #ifdef DEBUG printf("SetIconData: unlink '%s'\n", pIconData->pmFileName); /* debug */ diff --git a/cde/programs/dtcreate/main.c b/cde/programs/dtcreate/main.c index 5dd83254b..c96964a0d 100644 --- a/cde/programs/dtcreate/main.c +++ b/cde/programs/dtcreate/main.c @@ -634,7 +634,7 @@ void RemoveTmpIconFiles( void ) for (i=0; i < ICON_NUMBER; i++) { if ( (IconDataList[i]->pmDirtyBit) && - (IconDataList[i]->pmFileName) && + (IconDataList[i]->pmFileName[0]) && (strlen(IconDataList[i]->pmFileName)) ) { #ifdef DEBUG printf("RemoveTmpIconFiles: unlink '%s'\n", IconDataList[i]->pmFileName); /* debug */ diff --git a/cde/programs/dticon/fileIO.c b/cde/programs/dticon/fileIO.c index 57f86cb34..aeaa57250 100644 --- a/cde/programs/dticon/fileIO.c +++ b/cde/programs/dticon/fileIO.c @@ -221,10 +221,13 @@ Boolean Read_File( char *fnameIn ) { - char *base_name, *suffix, fname[MAXPATHLEN+1], *tmp, *tmp2; - unsigned int mask_width_ret, mask_height_ret; - int mask_x_hot, mask_y_hot, first; - struct stat statBuf; + char *base_name = NULL, *suffix = NULL, + fname[MAXPATHLEN], *tmp = NULL, *tmp2 = NULL; + unsigned int mask_width_ret = 0, mask_height_ret = 0; + int mask_x_hot = 0, mask_y_hot = 0, first = 0; + struct stat statBuf = {}; + + fname[0] = 0; #ifdef DEBUG if (debug) @@ -241,7 +244,7 @@ Read_File( if (tmp && tmp2 && (tmp2 == tmp+1)) { char *netfile, *localfile; - + tmp[0] = '\0'; netfile = tt_host_file_netfile(fnameIn, tmp+1); localfile = tt_netfile_file(netfile); @@ -259,7 +262,7 @@ Read_File( /*** - if we got a NULL base_name, return FALSE ***/ base_name = strrchr(fname, '/'); - if (fname) + if (fname[0]) base_name = (base_name ? base_name + 1 : fname); if (!base_name) return (False); @@ -491,7 +494,7 @@ Write_File( base_name = strrchr(fname, '/'); - if (fname) { + if (fname[0]) { base_name = (base_name ? base_name + 1 : fname); } @@ -735,7 +738,7 @@ Display_XPMFile( reset_debug = True; } #endif - PixelTableClear; /* force new pixel table now */ + PixelTableClear(); /* force new pixel table now */ for (i=0; i Date: Sat, 11 Dec 2021 14:57:20 -0700 Subject: [PATCH 24/25] Fix some shift-op-parentheses warnings --- cde/lib/DtSvc/DtCodelibs/strhash.C | 12 ++++++------ cde/programs/dtwm/WmInitWs.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cde/lib/DtSvc/DtCodelibs/strhash.C b/cde/lib/DtSvc/DtCodelibs/strhash.C index b04f8fc5f..dd06655de 100644 --- a/cde/lib/DtSvc/DtCodelibs/strhash.C +++ b/cde/lib/DtSvc/DtCodelibs/strhash.C @@ -65,10 +65,10 @@ unsigned strhash(const char *p) while (*p != '\0') { h = (h << 4) + (unsigned)CHARADV(p); - if (g = h & ((unsigned)0xF << BITS(unsigned) - 4)) + if ((g = h) & ((unsigned)0xF << (BITS(unsigned) - 4))) { - h ^= g >> BITS(unsigned) - 4; - h ^= g; + h ^= g >> (BITS(unsigned) - 4); + h ^= g; } } return h; @@ -93,10 +93,10 @@ unsigned strhashi(const char *p) h = (h << 4) + (unsigned)tolower(*p++); } - if (g = h & ((unsigned)0xF << BITS(unsigned) - 4)) + if ((g = h) & ((unsigned)0xF << (BITS(unsigned) - 4))) { - h ^= g >> BITS(unsigned) - 4; - h ^= g; + h ^= g >> (BITS(unsigned) - 4); + h ^= g; } } return h; diff --git a/cde/programs/dtwm/WmInitWs.c b/cde/programs/dtwm/WmInitWs.c index c70b2c195..740fb5cc0 100644 --- a/cde/programs/dtwm/WmInitWs.c +++ b/cde/programs/dtwm/WmInitWs.c @@ -234,7 +234,7 @@ BuildLockMaskSequence(void) * funny because we skip the case of all the * bits cleared. */ - run = (0x1 << bit-1); /* number of consecutive masks to set + run = (0x1 << (bit-1)); /* number of consecutive masks to set bits in */ bit_on = False; /* are we setting bits or not? */ From c479fe7b9edcf69be477af7190175631d78e855d Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Sat, 11 Dec 2021 15:07:27 -0700 Subject: [PATCH 25/25] Fix some logical-not-parentheses warnings --- cde/lib/DtSearch/raima/connect.c | 2 +- cde/lib/tt/slib/mp_s_procid.C | 2 +- cde/programs/dtmail/dtmail/RoamCmds.C | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cde/lib/DtSearch/raima/connect.c b/cde/lib/DtSearch/raima/connect.c index 4bd9e739e..d992bb479 100644 --- a/cde/lib/DtSearch/raima/connect.c +++ b/cde/lib/DtSearch/raima/connect.c @@ -121,7 +121,7 @@ int dbn /* Database number */ goto quit; /* ensure record not already connected to set */ - if ( ! crmp.owner == NULL_DBA ) { + if ( ! (crmp.owner == NULL_DBA) ) { stat = dberr(S_ISOWNED); goto quit; } diff --git a/cde/lib/tt/slib/mp_s_procid.C b/cde/lib/tt/slib/mp_s_procid.C index 71b840a29..357374a03 100644 --- a/cde/lib/tt/slib/mp_s_procid.C +++ b/cde/lib/tt/slib/mp_s_procid.C @@ -100,7 +100,7 @@ add_message(const _Tt_s_message_ptr &m) { _Tt_xdr_version xvers(_version); - if (! _flags&(1<<_TT_PROC_ACTIVE)) { + if (! (_flags&(1<<_TT_PROC_ACTIVE))) { _tt_syslog(0, LOG_ERR, catgets(_ttcatd, 2, 4, "A ToolTalk client died before it " diff --git a/cde/programs/dtmail/dtmail/RoamCmds.C b/cde/programs/dtmail/dtmail/RoamCmds.C index aae58f946..1dc98940b 100644 --- a/cde/programs/dtmail/dtmail/RoamCmds.C +++ b/cde/programs/dtmail/dtmail/RoamCmds.C @@ -4003,8 +4003,8 @@ VacationCmd::parseVacationMessage() for (hnd = env->getFirstHeader(error, &name, value); error.isNotSet() && hnd; hnd = env->getNextHeader(error, hnd, &name, value)) { - - if (!strcmp(name, "Subject") == 0) { + + if (strcmp(name, "Subject")) { continue; } else {