From bdf9256ab2077a2da3b7ad48910cae047addce61 Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Thu, 2 Dec 2021 17:21:48 -0700 Subject: [PATCH] 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 \