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 cdcfeaeef..7c4a00a99 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') @@ -729,6 +729,43 @@ 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/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 +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/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 @@ -797,6 +834,8 @@ doc/util/dbtoman/instant/Makefile 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 ac359b2cd..b30c5638c 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 = m-guides man guides help diff --git a/cde/doc/C/guides/Makefile.am b/cde/doc/C/guides/Makefile.am new file mode 100644 index 000000000..39da9f18e --- /dev/null +++ b/cde/doc/C/guides/Makefile.am @@ -0,0 +1,78 @@ +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 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 +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/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 + +# 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) + +# 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/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/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 $@) + + 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..fe36b809a --- /dev/null +++ b/cde/doc/common/guides/guides_env.am @@ -0,0 +1,34 @@ +# make include file: env variables needed for the guides + +INFOLIB = ../cde.dti +BOOKCASE = CDEDOC + +INFOLIBNAME = -n cde +# 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=$(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 multi-core builds to work. +DTINFOGENTMPDIR = /tmp/dtinfogen-guides.$$$$ + +DTHELPSRC = $(top_srcdir)/lib/DtHelp +DTLCXENVSETUP = DTLCXSEARCHPATH=$(DTHELPSRC) +DTINFOGENSRC = $(top_srcdir)/programs/dtinfo/dtinfogen +NSGMLS = $(top_builddir)/programs/nsgmls +DTSRDIR = $(top_builddir)/programs/dtsr + +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 + 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 + 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 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/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/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/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/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/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]) ]) 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/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/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/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/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 $@ 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..26d9aa99d --- /dev/null +++ b/cde/programs/dtinfo/dtinfo/src/Basic/Makefile.am @@ -0,0 +1,16 @@ +MAINTAINERCLEANFILES = Makefile.in + +noinst_LIBRARIES = libBasic.a + +# get our env +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk + +# class info +include Classlist.mk + +libBasic_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) + +libBasic_a_SOURCES = ../Prelude.h $(Basic_SRCS) + +RANLIB = echo +libBasic_a_AR = $(LD) -r -o 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..560466b9f --- /dev/null +++ b/cde/programs/dtinfo/dtinfo/src/Graphics/Makefile.am @@ -0,0 +1,16 @@ +MAINTAINERCLEANFILES = Makefile.in + +noinst_LIBRARIES = libGraphics.a + +# get our env +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk + +# class info +include Classlist.mk + +libGraphics_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) + +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 10402a440..603b40391 100644 --- a/cde/programs/dtinfo/dtinfo/src/Makefile.am +++ b/cde/programs/dtinfo/dtinfo/src/Makefile.am @@ -1,11 +1,72 @@ MAINTAINERCLEANFILES = Makefile.in -SUBDIRS = Agents Basic +# get our env variables +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk + +# get the toplevel Classlist +include Classlist.mk + +# CLASSLIST is defined in the top (dtinfo) level Classlist.mk file +SUBDIRS = Widgets $(CLASSLIBS) Messages cgm + +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 + + +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) > $@ + +# dtinfo class dfile and hfile building for the modules +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. + +noinst_DATA = dtinfo.msg.updated + +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 + +## 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 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/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 58d668edf..952d71287 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..d4b6b80b3 --- /dev/null +++ b/cde/programs/dtinfo/dtinfo/src/Managers/Makefile.am @@ -0,0 +1,21 @@ +MAINTAINERCLEANFILES = Makefile.in + +noinst_LIBRARIES = libManagers.a + +# get our env +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk + +# class info +include Classlist.mk + +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) + +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..f80425b9e --- /dev/null +++ b/cde/programs/dtinfo/dtinfo/src/Marks/Makefile.am @@ -0,0 +1,17 @@ +MAINTAINERCLEANFILES = Makefile.in + +noinst_LIBRARIES = libMarks.a + +# get our env +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk + +# class info +include Classlist.mk + +libMarks_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) + +libMarks_a_SOURCES = ../Prelude.h $(Marks_SRCS) + +RANLIB = echo +libMarks_a_AR = $(LD) -r -o + 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..136d5fc94 --- /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 $(top_srcdir)/programs/dtinfo/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..b85ffbaf8 --- /dev/null +++ b/cde/programs/dtinfo/dtinfo/src/OliasSearch/Makefile.am @@ -0,0 +1,16 @@ +MAINTAINERCLEANFILES = Makefile.in + +noinst_LIBRARIES = libOliasSearch.a + +# get our env +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk + +# class info +include Classlist.mk + +libOliasSearch_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) + +libOliasSearch_a_SOURCES = ../Prelude.h $(OliasSearch_SRCS) + +RANLIB = echo +libOliasSearch_a_AR = $(LD) -r -o 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..5c586a388 --- /dev/null +++ b/cde/programs/dtinfo/dtinfo/src/OnlineRender/Makefile.am @@ -0,0 +1,22 @@ +MAINTAINERCLEANFILES = Makefile.in + +noinst_LIBRARIES = libOnlineRender.a + +# get our env +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk + +# class info +include Classlist.mk + +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) + +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..53233960e --- /dev/null +++ b/cde/programs/dtinfo/dtinfo/src/Other/Makefile.am @@ -0,0 +1,21 @@ +MAINTAINERCLEANFILES = Makefile.in + +noinst_LIBRARIES = libOther.a + +# get our env +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk + +# class info +include Classlist.mk + +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) + +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..1e88e5aa3 --- /dev/null +++ b/cde/programs/dtinfo/dtinfo/src/Preferences/Makefile.am @@ -0,0 +1,16 @@ +MAINTAINERCLEANFILES = Makefile.in + +noinst_LIBRARIES = libPreferences.a + +# get our env +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk + +# class info +include Classlist.mk + +libPreferences_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) + +libPreferences_a_SOURCES = ../Prelude.h $(Preferences_SRCS) + +RANLIB = echo +libPreferences_a_AR = $(LD) -r -o 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..36612b908 --- /dev/null +++ b/cde/programs/dtinfo/dtinfo/src/Query/Makefile.am @@ -0,0 +1,21 @@ +MAINTAINERCLEANFILES = Makefile.in + +noinst_LIBRARIES = libQuery.a + +# get our env +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk + +# class info +include Classlist.mk + +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) + +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..43dcfbad2 --- /dev/null +++ b/cde/programs/dtinfo/dtinfo/src/Support/Makefile.am @@ -0,0 +1,16 @@ +MAINTAINERCLEANFILES = Makefile.in + +noinst_LIBRARIES = libSupport.a + +# get our env +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk + +# class info +include Classlist.mk + +libSupport_a_CXXFLAGS = $(DTINFO_DEFINES) $(DTINFO_INCLUDES) + +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/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..bb68e2f16 --- /dev/null +++ b/cde/programs/dtinfo/dtinfo/src/UAS/Base/Makefile.am @@ -0,0 +1,22 @@ +MAINTAINERCLEANFILES = Makefile.in + +noinst_LIBRARIES = libBase.a + +# get our env +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk + +# class info +include Classlist.mk + +libBase_a_CXXFLAGS = -I.. -I ../.. -I../Support $(DTINFO_DEFINES) \ + $(DTINFO_INCLUDES) +libBase_a_SOURCES = $(Base_SRCS) + +RANLIB = echo +libBase_a_AR = $(LD) -r -o + +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 4d78d2c48..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 $ */ +# $XConsortium: Classlist.mk /main/4 1996/10/30 14:46:56 drk $ -MSGS = \ -Base \ -DtSR \ -MMDB +UAS_MSGS = \ +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..a30087220 --- /dev/null +++ b/cde/programs/dtinfo/dtinfo/src/UAS/DtSR/Makefile.am @@ -0,0 +1,22 @@ +MAINTAINERCLEANFILES = Makefile.in + +noinst_LIBRARIES = libDtSR.a + +# get our env +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk + +# class info +include Classlist.mk + +libDtSR_a_CXXFLAGS = -I../Base -I./Util_Classes -I../.. \ + $(DTINFO_DEFINES) $(DTINFO_INCLUDES) +libDtSR_a_SOURCES = $(DtSR_SRCS) + +RANLIB = echo +libDtSR_a_AR = $(LD) -r -o + +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..289197a4f --- /dev/null +++ b/cde/programs/dtinfo/dtinfo/src/UAS/MMDB/Makefile.am @@ -0,0 +1,23 @@ +MAINTAINERCLEANFILES = Makefile.in + +noinst_LIBRARIES = libMMDB.a + +# get our env +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk + +# class info +include Classlist.mk + +libMMDB_a_CXXFLAGS = -I../Base -I../.. $(DTINFO_DEFINES) \ + $(DTINFO_INCLUDES) +libMMDB_a_SOURCES = $(MMDB_SRCS) + +RANLIB = echo +libMMDB_a_AR = $(LD) -r -o + + +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 new file mode 100644 index 000000000..1e418d195 --- /dev/null +++ b/cde/programs/dtinfo/dtinfo/src/UAS/Makefile.am @@ -0,0 +1,26 @@ +MAINTAINERCLEANFILES = Makefile.in + +SUBDIRS = Base MMDB DtSR + +noinst_LIBRARIES = libUAS.a + +# get our env +include $(top_srcdir)/programs/dtinfo/dtinfo_env.mk + +# class info +include Classlist.mk + +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 + +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 new file mode 100644 index 000000000..9029a942a --- /dev/null +++ b/cde/programs/dtinfo/dtinfo/src/Widgets/Makefile.am @@ -0,0 +1,15 @@ +MAINTAINERCLEANFILES = Makefile.in + +noinst_LIBRARIES = libWidgets.a + +# get our env +include $(top_srcdir)/programs/dtinfo/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 + +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 new file mode 100644 index 000000000..008f66280 --- /dev/null +++ b/cde/programs/dtinfo/dtinfo/src/cgm/Makefile.am @@ -0,0 +1,22 @@ +MAINTAINERCLEANFILES = Makefile.in + +noinst_LIBRARIES = libcgm.a + +# get our env +include $(top_srcdir)/programs/dtinfo/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 +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.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/dtinfo_dfiles_hfiles.mk b/cde/programs/dtinfo/dtinfo/src/dtinfo_dfiles_hfiles.mk new file mode 100644 index 000000000..94406e048 --- /dev/null +++ b/cde/programs/dtinfo/dtinfo/src/dtinfo_dfiles_hfiles.mk @@ -0,0 +1,110 @@ +## 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 +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/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 \ diff --git a/cde/programs/dtinfo/dtinfo_env.mk b/cde/programs/dtinfo/dtinfo_env.mk new file mode 100644 index 000000000..5a4ea0bc3 --- /dev/null +++ b/cde/programs/dtinfo/dtinfo_env.mk @@ -0,0 +1,49 @@ +# 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 \ +-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... 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$(WWLSRC)/include +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 +TREERES = $(TOOLS)/misc/treeres +MSGSETS = $(TOOLS)/misc/msgsets + +DTINFO_INCLUDES = -I.. $(UAS_INCLUDES) $(EXCEPTIONS_INCLUDES) \ + $(WWL_INCLUDES) $(STYLE_SHEET_INCLUDES) \ + $(COMMON_CLASS_INCLUDES) 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/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 + + + diff --git a/cde/programs/dtinfo/mmdb/HardCopy/Makefile.am b/cde/programs/dtinfo/mmdb/HardCopy/Makefile.am index b7b07aa5a..17ae72de1 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_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..36e27e680 100644 --- a/cde/programs/dtinfo/mmdb/Makefile.am +++ b/cde/programs/dtinfo/mmdb/Makefile.am @@ -12,15 +12,21 @@ 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_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 diff --git a/cde/programs/dtinfo/mmdb/StyleSheet/Makefile.am b/cde/programs/dtinfo/mmdb/StyleSheet/Makefile.am index f3433c9f5..c06324777 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_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..74378b1d7 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_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..388951e66 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_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..9c58c883f 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_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..94b2ebb19 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_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..7bf4ac36b 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_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..bab8c0aed 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_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..e857b56d3 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_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..f0146f2a1 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_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..4857d139c 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_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..39ce6ba5f 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_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..fcf498d9c 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_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..85921d1a0 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_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..15de30858 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_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..cb0b8671f 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_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..e3b394ec8 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_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..468e73a01 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_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..bed6a5885 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_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..3252f55d0 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_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) 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 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/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 { 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/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) { 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); } 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) diff --git a/cde/programs/dtstyle/MainWin.c b/cde/programs/dtstyle/MainWin.c index 9bab52b84..ff9d60cff 100644 --- a/cde/programs/dtstyle/MainWin.c +++ b/cde/programs/dtstyle/MainWin.c @@ -626,7 +626,7 @@ callCancels( void ) XtCallCallbacks(style.startupDialog, XmNcallback, &CancelBut); } - if (dialogStates) + if (dialogStates[0]) _DtAddToResource(style.display, dialogStates); calledAlready = True; 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? */ 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);