dthelpprint: make it build.

diff --git a/cde/configure.ac b/cde/configure.ac
index 77159e9bda297a1694feaaa0def5983f6bc58023..a8a66bf938dd8bfb5d0ea4ad999783c6e4761e48 100644 (file)
--- a/cde/configure.ac
+++ b/cde/configure.ac
@@ -513,6 +513,7 @@ programs/dthelp/Makefile
 programs/dthelp/dthelpview/Makefile
 programs/dthelp/dthelpgen/Makefile
 programs/dthelp/dthelpdemo/Makefile
+programs/dthelp/dthelpprint/Makefile
 
 programs/nsgmls/Makefile
 

diff --git a/cde/lib/DtHelp/HelpXlate.h b/cde/lib/DtHelp/HelpXlate.h
index 89908b298329009b84bf351d69d22d5fc2f1399c..af212c74d894b36d10af4cd2294d870a9b319a1d 100644 (file)
--- a/cde/lib/DtHelp/HelpXlate.h
+++ b/cde/lib/DtHelp/HelpXlate.h
@@ -41,8 +41,8 @@
 #ifndef _DtHELP_XLATE_I
 #define _DtHELP_XLATE_I
 
-#include <LocaleXlate.h>
-#include <XlationSvc.h>
+#include <Dt/LocaleXlate.h>
+#include <Dt/XlationSvc.h>
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/cde/programs/dthelp/Makefile.am b/cde/programs/dthelp/Makefile.am
index 810da52f50cbef0a390ea48b2decc0cd30d2e4d9..970aa4116da2fb1f200e2c0d79dbd73537ce7906 100644 (file)
--- a/cde/programs/dthelp/Makefile.am
+++ b/cde/programs/dthelp/Makefile.am
@@ -1,5 +1,5 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-SUBDIRS = dthelpview dthelpgen dthelpdemo
+SUBDIRS = dthelpview dthelpgen dthelpdemo dthelpprint
 
-#NOTYET  = parser dthelpprint
+#NOTYET  = parser 

diff --git a/cde/programs/dthelp/dthelpprint/Makefile.am b/cde/programs/dthelp/dthelpprint/Makefile.am
index 7ee85f0ecbaad2e12eacff2433ea01cd2e30301a..8dca02139874f17598ded3ca7a29c0d9ff6ec267 100644 (file)
--- a/cde/programs/dthelp/dthelpprint/Makefile.am
+++ b/cde/programs/dthelp/dthelpprint/Makefile.am
@@ -1,9 +1,13 @@
-bin_PROGRAMS = dthelpprint dthelpprint.sh
+MAINTAINERCLEANFILES = Makefile.in
 
-dthelpprint_CPPFLAGS = -I.. -DCDE_CONFIGURATION_TOP='"${prefix}"' \
-                    -DCDE_INSTALLATION_TOP='"$(CDE_INSTALLATION_TOP)"'
+bin_PROGRAMS = dthelpprint
+bin_SCRIPTS =  dthelpprint.sh
 
-dthelpprint_LDADD = $(LIBSVC) $(LIBTT) $(LIBHELP) $(XTOOLLIB) ${X_LIBS}
+dthelpprint_CPPFLAGS = -I.. -I ../../../lib/DtHelp \
+       -DCDE_CONFIGURATION_TOP='"${prefix}"' \
+       -DCDE_INSTALLATION_TOP='"$(CDE_INSTALLATION_TOP)"'
+
+dthelpprint_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB)
 
 if SOLARIS
 dthelpprint_LDADD += -lw -ldl -lgen -lm

diff --git a/cde/programs/dthelp/dthelpprint/PrintTopics.c b/cde/programs/dthelp/dthelpprint/PrintTopics.c
index 0d9959b988d2c18b1659b58c1393f80d79d53d50..6ef36ca4724936e8552308e63f33b1eb7f13f31c 100644 (file)
--- a/cde/programs/dthelp/dthelpprint/PrintTopics.c
+++ b/cde/programs/dthelp/dthelpprint/PrintTopics.c
@@ -58,15 +58,17 @@ $COPYRIGHT$:
 
 #include <time.h>
 
+
 #include "HelpPrintI.h"  /* helpprint */
 
-#include "HelpTermP.h" /* from libDtHelp */
-#include "CanvasP.h"   /* from libDtHelp */
+#include "DtI/HelpTermP.h"     /* from libDtHelp */
+#include "Dt/CanvasP.h"        /* from libDtHelp */
 #include "StringFuncsI.h" /* from libDtHelp */
-#include "LocaleXlate.h" /* from libDtHelp */
-#include "bufioI.h" /* from libDtHelp; required for AccessI.h */
-#include "FileUtilsI.h" /* from libDtHelp */
+#include "Dt/LocaleXlate.h" /* from libDtHelp */
+#include "DtI/bufioI.h" /* from libDtHelp; required for AccessI.h */
+#include "DtI/FileUtilsI.h" /* from libDtHelp */
 #include "GenUtilsP.h" /* from libDtHelp */
+#include "HelpXlate.h" /* from libDtHelp */
 
 /*#include "AccessI.h" ** from libDtHelp */
 /* I can't include AccessI.h because it redefines the Boolean type,