From 2ea057d511cefbe0172f4f26be69bdf21bade239 Mon Sep 17 00:00:00 2001 From: Peter Howkins Date: Wed, 20 Apr 2016 20:17:22 +0100 Subject: [PATCH] Disable all code related to libXp deprecated and mostly no longer included on current OSes --- cde/config/cf/DtInfo.tmpl | 2 +- cde/config/cf/Motif.tmpl | 18 ++++---- cde/config/cf/X11.tmpl | 22 ---------- cde/config/cf/cde.tmpl | 4 +- cde/config/cf/hpLib.tmpl | 2 +- cde/config/cf/ibmLib.tmpl | 2 +- cde/config/cf/lnxLib.tmpl | 2 +- cde/config/cf/osfLib.tmpl | 2 +- cde/config/cf/sgiLib.tmpl | 2 +- cde/config/cf/sunLib.tmpl | 8 ++-- cde/config/cf/sv4Lib.tmpl | 2 +- cde/lib/DtPrint/Print.h | 4 ++ cde/lib/DtPrint/PrintSetupB.c | 33 +++++++++++++- cde/lib/DtPrint/PrintSetupBP.h | 6 +++ cde/lib/DtPrint/PsubDefProc.c | 44 ++++++++++++++++--- cde/lib/DtPrint/PsubUtil.c | 15 ++++++- cde/lib/DtPrint/PsubUtilI.h | 7 ++- cde/osf/wml/Imakefile | 2 +- cde/programs/dtcalc/Imakefile | 8 ++-- cde/programs/dtcm/dtcm/print.c | 8 ++-- cde/programs/dtcm/dtcm/x_graphics.c | 16 ++++++- cde/programs/dtdbcache/Imakefile | 4 +- cde/programs/dthelp/dthelpdemo/Imakefile | 4 +- cde/programs/dthelp/dthelpgen/Imakefile | 4 +- cde/programs/dthelp/dthelpprint/Imakefile | 4 +- cde/programs/dthelp/dthelpview/Imakefile | 4 +- cde/programs/dtimsstart/Imakefile | 8 ++-- .../dtinfo/dtinfo/src/Agents/NodePrintAgent.C | 4 +- .../dtinfo/src/Agents/PrintPanelAgentMotif.C | 23 ++++++---- .../dtinfo/src/Agents/PrintPanelAgentMotif.hh | 6 ++- .../dtinfo/dtinfo/src/Managers/GraphicsMgr.C | 2 + .../dtinfo/dtinfo/src/Other/AppPrintData.hh | 2 + cde/programs/dtksh/Imakefile | 4 +- cde/programs/dtlogin/Imakefile | 12 ++--- cde/programs/dtmail/dtmail/DmxPrintJob.C | 14 +++--- cde/programs/dtmail/dtmail/DmxPrintJob.h | 2 + cde/programs/dtmail/dtmail/DmxPrintOutput.C | 2 + cde/programs/dtpad/printJob.c | 16 ++++--- cde/programs/dtpad/printOutput.c | 2 + cde/programs/dtpdm/JobBox.c | 18 +++++++- cde/programs/dtpdm/MainWindow.c | 2 + cde/programs/dtpdm/PdmXp.c | 23 ++++++++++ cde/programs/dtpdm/PdmXp.h | 6 +++ cde/programs/dtpdm/PrinterBox.c | 10 ++++- cde/programs/dtpdmd/Imakefile | 4 +- cde/programs/dtpdmd/dtpdmdP.h | 4 ++ cde/programs/dtpdmd/manager.c | 6 +++ cde/programs/dtprintinfo/Imakefile | 6 +-- cde/programs/dtscreen/Imakefile | 4 +- cde/programs/dtsession/Imakefile | 4 +- cde/programs/dtterm/Imakefile | 4 +- cde/programs/dtudcexch/Imakefile | 4 +- cde/programs/dtudcfonted/Imakefile | 4 +- cde/programs/util/dttypes/Imakefile | 4 +- 54 files changed, 302 insertions(+), 127 deletions(-) diff --git a/cde/config/cf/DtInfo.tmpl b/cde/config/cf/DtInfo.tmpl index 9211d5cc..ec6a266d 100644 --- a/cde/config/cf/DtInfo.tmpl +++ b/cde/config/cf/DtInfo.tmpl @@ -404,7 +404,7 @@ XCOMM Following X11 and Mtf defines should be replaced w/ std config # define MtfLibraries $(DYNAMIC) $(XMLIB) #endif #ifndef X11Libraries -# define X11Libraries $(DYNAMIC) $(XTOOLLIB) $(XPLIB) $(XMULIB) $(XLIB) +# define X11Libraries $(DYNAMIC) $(XTOOLLIB) $(XMULIB) $(XLIB) #endif X11_INCLUDES=X11Includes diff --git a/cde/config/cf/Motif.tmpl b/cde/config/cf/Motif.tmpl index ee04e4d7..dc053ab8 100644 --- a/cde/config/cf/Motif.tmpl +++ b/cde/config/cf/Motif.tmpl @@ -325,31 +325,31 @@ XCOMM $TOG: Motif.tmpl /main/6 1999/05/19 17:00:05 mgreess $ #endif #ifndef XmClientLibs -# define XmClientLibs $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(XMEXTRA_LIBS) +# define XmClientLibs $(XMLIB) $(XTOOLLIB) $(XLIB) $(XMEXTRA_LIBS) #endif #ifndef XmClientDepLibs -# define XmClientDepLibs $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXPLIB) $(DEPXLIB) +# define XmClientDepLibs $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB) #endif #ifndef MrmClientLibs -# define MrmClientLibs $(MRESOURCELIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(XMEXTRA_LIBS) +# define MrmClientLibs $(MRESOURCELIB) $(XMLIB) $(XTOOLLIB) $(XLIB) $(XMEXTRA_LIBS) #endif #ifndef MrmClientDepLibs -# define MrmClientDepLibs $(DEPMRESOURCELIB) $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXPLIB) $(DEPXLIB) +# define MrmClientDepLibs $(DEPMRESOURCELIB) $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB) #endif #ifndef UilClientLibs -# define UilClientLibs $(UILLIB) $(MRESOURCELIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(XMEXTRA_LIBS) +# define UilClientLibs $(UILLIB) $(MRESOURCELIB) $(XMLIB) $(XTOOLLIB) $(XLIB) $(XMEXTRA_LIBS) #endif #ifndef UilClientDepLibs -# define UilClientDepLibs $(DEPUILLIB) $(DEPMRESOURCELIB) $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXPLIB) $(DEPXLIB) +# define UilClientDepLibs $(DEPUILLIB) $(DEPMRESOURCELIB) $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB) #endif #ifndef TestClientLibs # define TestClientLibs $(PURIFYLIBS) $(TESTCOMLIB) \ $(AUTOSCRIPTLIB) $(AUTOUTILLIB) \ $(AUTOCREATELIB) $(AUTOVISUALLIB) $(AUTOSYNTHLIB) \ - $(XMLIB) $(TESTGEOLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) \ + $(XMLIB) $(TESTGEOLIB) $(XTOOLLIB) $(XLIB) \ $(AUTOEXTRALIBS) $(XMEXTRA_LIBS) #endif #ifndef TestUilClientLibs @@ -357,7 +357,7 @@ XCOMM $TOG: Motif.tmpl /main/6 1999/05/19 17:00:05 mgreess $ $(AUTOSCRIPTLIB) $(AUTOUTILLIB) \ $(AUTOCREATELIB) $(AUTOVISUALLIB) $(AUTOSYNTHLIB) \ $(UILLIB) $(MRESOURCELIB) $(XMLIB) $(TESTGEOLIB) \ - $(XTOOLLIB) $(XPLIB) $(XLIB) $(AUTOEXTRALIBS) $(XMEXTRA_LIBS) + $(XTOOLLIB) $(XLIB) $(AUTOEXTRALIBS) $(XMEXTRA_LIBS) #endif #ifndef TestClientDepLibs # define TestClientDepLibs XmClientDepLibs @@ -578,7 +578,7 @@ LINTXMWIDGETLIB = $(MWIDGETSRC)/llib-l/Xm.ln #if NeedDefaultDepLibs # if HasSharedLibraries || defined(UseInstalled) - DEPLIBS = $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXPLIB) $(DEPXLIB) + DEPLIBS = $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB) # else DEPLIBS = $(LOCAL_LIBRARIES) # endif diff --git a/cde/config/cf/X11.tmpl b/cde/config/cf/X11.tmpl index 53b7f5be..3ca148d3 100644 --- a/cde/config/cf/X11.tmpl +++ b/cde/config/cf/X11.tmpl @@ -933,28 +933,6 @@ SharedLibReferences(OLDX,oldX,$(OLDXLIBSRC),SOOLDXREV,SharedOldXRev) ProjectUnsharedLibReferences(OLDX,oldX,$(OLDXLIBSRC),XBuildLibDir) #endif -#ifndef SharedLibXp -#define SharedLibXp HasSharedLibraries -#endif -#ifndef NormalLibXp -#define NormalLibXp (!SharedLibXp | ForceNormalLib) -#endif -#ifndef DebugLibXp -#define DebugLibXp NO /* debugged Xp library */ -#endif -#ifndef ProfileLibXp -#define ProfileLibXp NO /* profiled Xp library */ -#endif - XPLIBSRC = $(LIBSRC)/Xp -#if SharedLibXp -#ifndef SharedXpRev -#define SharedXpRev 6.2 -#endif -SharedLibReferences(XP,Xp,$(XPLIBSRC),SOXPREV,SharedXpRev) -#else -ProjectUnsharedLibReferences(XP,Xp,$(XPLIBSRC),XBuildLibDir) -#endif - #ifndef SharedLibXt #define SharedLibXt HasSharedLibraries #endif diff --git a/cde/config/cf/cde.tmpl b/cde/config/cf/cde.tmpl index 8b79b228..65a01992 100644 --- a/cde/config/cf/cde.tmpl +++ b/cde/config/cf/cde.tmpl @@ -425,10 +425,10 @@ ProjectUnsharedLibReferences(CSA,csa,$(CSASRC),CDEBuildLibDir) #ifndef DtClientLibs -# define DtClientLibs $(DTPRINTLIB) $(DTHELPLIB) $(DTWIDGETLIB) $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) +# define DtClientLibs $(DTPRINTLIB) $(DTHELPLIB) $(DTWIDGETLIB) $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XLIB) #endif #ifndef DepDtClientLibs -# define DepDtClientLibs $(DEPDTPRINTLIB) $(DEPDTHELPLIB) $(DEPDTWIDGETLIB) $(DEPDTSVCLIB) $(DEPTTLIB) $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXPLIB) $(DEPXLIB) +# define DepDtClientLibs $(DEPDTPRINTLIB) $(DEPDTHELPLIB) $(DEPDTWIDGETLIB) $(DEPDTSVCLIB) $(DEPTTLIB) $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB) #endif #ifndef DtClientSysLibs # define DtClientSysLibs $(DYNLIBSYSLIB) $(ICONVSYSLIB) $(REGEXSYSLIB) -lm diff --git a/cde/config/cf/hpLib.tmpl b/cde/config/cf/hpLib.tmpl index 42e18a6b..2b152cd7 100644 --- a/cde/config/cf/hpLib.tmpl +++ b/cde/config/cf/hpLib.tmpl @@ -18,7 +18,7 @@ XCOMM $XConsortium: hpLib.tmpl /main/10 1996/12/04 11:57:22 swick $ #define SharedSMReqs $(ICELIB) #define SharedXpReqs $(XLIB) -#define SharedXReqs $(XTOOLLIB) $(XPLIB) $(XLIB) SharedThreadReqs +#define SharedXReqs $(XTOOLLIB) $(XLIB) SharedThreadReqs #define SharedXmReqs SharedXReqs #define SharedMrmReqs $(XMLIB) SharedXReqs #define SharedUilReqs $(MRESOURCELIB) $(XMLIB) SharedXReqs diff --git a/cde/config/cf/ibmLib.tmpl b/cde/config/cf/ibmLib.tmpl index f989d76d..ae1600b0 100644 --- a/cde/config/cf/ibmLib.tmpl +++ b/cde/config/cf/ibmLib.tmpl @@ -39,7 +39,7 @@ XCOMM $XConsortium: ibmLib.tmpl /main/21 1996/12/04 12:21:49 swick $ #define SharedSMReqs $(ICELIB) #define SharedXpReqs $(XLIB) -#define SharedXReqs $(XTOOLLIB) $(XPLIB) $(XLIB) SharedThreadReqs +#define SharedXReqs $(XTOOLLIB) $(XLIB) SharedThreadReqs #define SharedXmReqs $(LDPRELIBS) SharedXReqs #define SharedMrmReqs $(LDPRELIBS) $(XMLIB) SharedXReqs #define SharedUilReqs $(LDPRELIBS) $(MRESOURCELIB) $(XMLIB) SharedXReqs diff --git a/cde/config/cf/lnxLib.tmpl b/cde/config/cf/lnxLib.tmpl index 6a732791..244d4d2f 100644 --- a/cde/config/cf/lnxLib.tmpl +++ b/cde/config/cf/lnxLib.tmpl @@ -23,7 +23,7 @@ XMULIB = -lXmu $(XLIB) #endif #ifndef SharedXReqs -# define SharedXReqs $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) +# define SharedXReqs $(XTOOLLIB) $(XLIB) $(LDPOSTLIBS) #endif #ifndef SharedXmReqs diff --git a/cde/config/cf/osfLib.tmpl b/cde/config/cf/osfLib.tmpl index a67c4106..41db0702 100644 --- a/cde/config/cf/osfLib.tmpl +++ b/cde/config/cf/osfLib.tmpl @@ -31,7 +31,7 @@ XCOMM $XConsortium: osfLib.tmpl /main/22 1996/09/28 16:12:00 rws $ #define SharedSMReqs $(LDPRELIBS) $(ICELIB) #define SharedXpReqs $(LDPRELIBS) $(XLIB) -#define SharedXReqs $(XTOOLLIB) $(XPLIB) $(XLIB) SharedThreadReqs $(LDPOSTLIBS) +#define SharedXReqs $(XTOOLLIB) $(XLIB) SharedThreadReqs $(LDPOSTLIBS) #define SharedXmReqs $(LDPRELIBS) SharedXReqs #define SharedMrmReqs $(LDPRELIBS) $(XMLIB) SharedXReqs #define SharedUilReqs $(LDPRELIBS) $(MRESOURCELIB) $(XMLIB) SharedXReqs diff --git a/cde/config/cf/sgiLib.tmpl b/cde/config/cf/sgiLib.tmpl index a9c28f62..fba0dfb8 100644 --- a/cde/config/cf/sgiLib.tmpl +++ b/cde/config/cf/sgiLib.tmpl @@ -8,7 +8,7 @@ XCOMM $XConsortium: sgiLib.tmpl /main/2 1996/09/28 16:12:44 rws $ #define SharedXawReqs -lw #define SharedXpReqs $(LDPRELIBS) $(XLIB) -#define SharedXReqs $(XTOOLLIB) $(XPLIB) $(XLIB) -lgen +#define SharedXReqs $(XTOOLLIB) $(XLIB) -lgen #define SharedXmReqs $(LDPRELIBS) SharedXReqs #define SharedMrmReqs $(LDPRELIBS) $(XMLIB) SharedXReqs #define SharedUilReqs $(LDPRELIBS) $(MRESOURCELIB) $(XMLIB) SharedXReqs diff --git a/cde/config/cf/sunLib.tmpl b/cde/config/cf/sunLib.tmpl index e0f9cd7d..a39209b5 100644 --- a/cde/config/cf/sunLib.tmpl +++ b/cde/config/cf/sunLib.tmpl @@ -56,14 +56,14 @@ XCOMM $TOG: sunLib.tmpl /main/47 1997/12/12 14:53:33 kaleb $ # define SharedPamRhostsAuthReqs $(LDPRELIBS) -lpam $(LDPOSTLIBS) -lsocket SharedThreadReqs # define SharedPamDceAuthReqs $(LDPRELIBS) -lpam $(LDPOSTLIBS) -ldce -lnsl -lsocket SharedThreadReqs # define SharedTtReqs $(XTOOLLIB) -lnsl -lsocket -lintl -ldl -lc -lw $(CXXLIB) -# define SharedDtSvcReqs $(LDPRELIBS) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) SharedThreadReqs -lgen -lc -lsocket -lnsl -ldl $(CXXLIB) -# define SharedDtMmdbReqs $(LDPRELIBS) $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) SharedThreadReqs -lgen -lc -lsocket -lnsl -ldl +# define SharedDtSvcReqs $(LDPRELIBS) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XLIB) $(LDPOSTLIBS) SharedThreadReqs -lgen -lc -lsocket -lnsl -ldl $(CXXLIB) +# define SharedDtMmdbReqs $(LDPRELIBS) $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XLIB) $(LDPOSTLIBS) SharedThreadReqs -lgen -lc -lsocket -lnsl -ldl # define SharedDtSearchReqs -lm -lc # define SharedDtWidgetReqs $(LDPRELIBS) $(DTSVCLIB) $(XMLIB) -lintl $(LDPOSTLIBS) -lw -lm -lc -# define SharedDtHelpReqs $(LDPRELIBS) $(DTSVCLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) -lw -lgen -lm -lc -ljpeg +# define SharedDtHelpReqs $(LDPRELIBS) $(DTSVCLIB) $(XMLIB) $(XTOOLLIB) $(XLIB) $(LDPOSTLIBS) -lw -lgen -lm -lc -ljpeg # define SharedDtPrintReqs $(LDPRELIBS) $(DTSVCLIB) $(DTHELPLIB) $(XMLIB) -lintl $(LDPOSTLIBS) -lw -lm -lc # define SharedDtTermReqs SharedDtHelpReqs -ldl -lgen -# define SharedDtMrmReqs $(LDPRELIBS) $(DTTERMLIB) $(DTPRINTLIB) $(DTHELPLIB) $(DTWIDGETLIB) $(MRESOURCELIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) -lw -lsocket -lnsl -lc $(CXXLIB) +# define SharedDtMrmReqs $(LDPRELIBS) $(DTTERMLIB) $(DTPRINTLIB) $(DTHELPLIB) $(DTWIDGETLIB) $(MRESOURCELIB) $(XMLIB) $(XTOOLLIB) $(XLIB) $(LDPOSTLIBS) -lw -lsocket -lnsl -lc $(CXXLIB) # define SharedDtMailReqs $(LDPRELIBS) -lw $(CXXLIB) -lm -ldl # define SharedCsaReqs $(LDPRELIBS) $(DTSVCLIB) $(XMLIB) SharedXmReqs diff --git a/cde/config/cf/sv4Lib.tmpl b/cde/config/cf/sv4Lib.tmpl index 71fee57b..f7a4b91e 100644 --- a/cde/config/cf/sv4Lib.tmpl +++ b/cde/config/cf/sv4Lib.tmpl @@ -32,7 +32,7 @@ XMULIB = $(XMULIBONLY) -z nodefs #endif #ifndef SharedXReqs -# define SharedXReqs $(XTOOLLIB) $(XPLIB) $(XLIB) SharedThreadReqs $(LDPOSTLIBS) +# define SharedXReqs $(XTOOLLIB) $(XLIB) SharedThreadReqs $(LDPOSTLIBS) #endif #ifndef SharedXmReqs diff --git a/cde/lib/DtPrint/Print.h b/cde/lib/DtPrint/Print.h index d335ed8b..d58059db 100644 --- a/cde/lib/DtPrint/Print.h +++ b/cde/lib/DtPrint/Print.h @@ -39,7 +39,9 @@ #define _DtPrint_h #include +#if 0 && defined(PRINTING_SUPPORTED) #include +#endif /* PRINTING_SUPPORTED */ #ifdef __cplusplus extern "C" { @@ -182,7 +184,9 @@ typedef struct _DtPrintSetupData { String printer_name; Display *print_display; +#ifdef PRINTING_SUPPORT XPContext print_context; +#endif /* PRINTING_SUPPORTED */ XtEnum destination; String dest_info; XtEnum messages_hint; diff --git a/cde/lib/DtPrint/PrintSetupB.c b/cde/lib/DtPrint/PrintSetupB.c index 7942abe2..e7e0ef01 100644 --- a/cde/lib/DtPrint/PrintSetupB.c +++ b/cde/lib/DtPrint/PrintSetupB.c @@ -670,7 +670,9 @@ ClosePrintConnection( cbs.reason = DtPRINT_CR_CLOSE_PRINT_DISPLAY; psd.printer_name = old_printer_name; psd.print_display = PSUB_Display(psub); +#if 0 && defined(PRINTING_SUPPORTED) psd.print_context = PSUB_Context(psub); +#endif /* PRINTING_SUPPORTED */ XtCallCallbackList((Widget)psub, PSUB_CloseDisplayCallback(psub), (XtPointer)&cbs); @@ -706,8 +708,10 @@ ClosePrintConnection( /* * destroy the print context */ +#if 0 && defined(PRINTING_SUPPORTED) XpDestroyContext(PSUB_Display(psub), PSUB_Context(psub)); PSUB_Context(psub) = (XPContext)NULL; +#endif /* PRINTING_SUPPORTED */ /* * close the print display */ @@ -1595,7 +1599,9 @@ EstablishPrinter( * set the new display and context in the widget */ PSUB_Display(psub) = psd->print_display; +#if 0 && defined(PRINTING_SUPPORTED) PSUB_Context(psub) = psd->print_context; +#endif /* PRINTING_SUPPORTED */ /* * initialize the display for use with Xt */ @@ -1672,7 +1678,9 @@ EstablishPrinter( if(PSUB_PrintSetupMode(psub) == DtPRINT_SETUP_XP) { psd->print_display = PSUB_Display(psub); +#if 0 && defined(PRINTING_SUPPORTED) psd->print_context = PSUB_Context(psub); +#endif /* PRINTING_SUPPORTED */ } break; @@ -1705,6 +1713,7 @@ static void GetPrintAttributes( DtPrintSetupBoxWidget psub) { +#if 0 && defined(PRINTING_SUPPORTED) char* attr_value; XTextProperty text_prop; char** list; @@ -1802,6 +1811,7 @@ GetPrintAttributes( XtSetSensitive(copies_label, False); } } +#endif /* PRINTING_SUPPORTED */ } /* @@ -1866,7 +1876,9 @@ Initialize( */ PSUB_ModalPrinterSpec(new_w) = (String)NULL; PSUB_Display(new_w) = (Display*)NULL; +#if 0 && defined(PRINTING_SUPPORTED) PSUB_Context(new_w) = (XPContext)NULL; +#endif /* PRINTING_SUPPORTED */ PSUB_TimeoutId(new_w) = (XtIntervalId)NULL; /* * retrieve the XpPrinterNameMode application resource for this @@ -2035,9 +2047,12 @@ static Boolean IsSetupRequired( DtPrintSetupBoxWidget psub) { +#if 0 && defined(PRINTING_SUPPORTED) char* setup_proviso; +#endif /* PRINTING_SUPPORTED */ Boolean required = False; +#if 0 && defined(PRINTING_SUPPORTED) setup_proviso = XpGetOneAttribute(PSUB_Display(psub), PSUB_Context(psub), XPPrinterAttr, @@ -2081,6 +2096,7 @@ IsSetupRequired( } XFree(setup_proviso); } +#endif /* PRINTING_SUPPORTED */ return required; } @@ -2482,8 +2498,10 @@ SetPrintAttributes( XmNposition, &PSUB_Copies(psub), NULL); sprintf(str, "*%s: %d\n", XpATTR_COPY_COUNT, PSUB_Copies(psub)); +#if 0 && defined(PRINTING_SUPPORTED) XpSetAttributes(PSUB_Display(psub), PSUB_Context(psub), XPDocAttr, str, XPAttrMerge); +#endif /* PRINTING_SUPPORTED */ } } @@ -4440,7 +4458,9 @@ DtPrintCopySetupData( } target->print_display = source->print_display; +#if 0 && defined(PRINTING_SUPPORTED) target->print_context = source->print_context; +#endif /* PRINTING_SUPPORTED */ target->destination = source->destination; target->messages_hint = source->messages_hint; @@ -4524,7 +4544,9 @@ XtEnum DtPrintFillSetupData( XtEnum status; String new_printer_spec; Display* new_display; +#if 0 && defined(PRINTING_SUPPORTED) XPContext new_context; +#endif /* PRINTING_SUPPORTED */ /* * GUI-less printing; verify the printer name and establish the * print connection without involving the print setup box. @@ -4532,12 +4554,17 @@ XtEnum DtPrintFillSetupData( status = _DtPrintVerifyXPrinter(NULL, print_data->printer_name, &new_printer_spec, - &new_display, - &new_context); + &new_display +#if 0 && defined(PRINTING_SUPPORTED) + ,&new_context +#endif /* PRINTING_SUPPORTED */ + ); if(status == DtPRINT_SUCCESS) { print_data->print_display = new_display; +#if 0 && defined(PRINTING_SUPPORTED) print_data->print_context = new_context; +#endif /* PRINTING_SUPPORTED */ } if(new_printer_spec != (String)NULL) { @@ -4743,7 +4770,9 @@ DtPrintResetConnection( * simply disavow knowledge of the X print connection */ PSUB_Display(psub) = (Display*)NULL; +#if 0 && defined(PRINTING_SUPPORTED) PSUB_Context(psub) = (XPContext)NULL; +#endif /* PRINTING_SUPPORTED */ break; case DtPRINT_CLOSE_CONNECTION: diff --git a/cde/lib/DtPrint/PrintSetupBP.h b/cde/lib/DtPrint/PrintSetupBP.h index d6ff4071..44fe588a 100644 --- a/cde/lib/DtPrint/PrintSetupBP.h +++ b/cde/lib/DtPrint/PrintSetupBP.h @@ -172,7 +172,9 @@ typedef struct _DtPrintDefaultProcData int* printer_counts; int selected_printer; Display* select_printer_info_display; +#if 0 && defined(PRINTING_SUPPORTED) XPContext select_printer_info_context; +#endif /* PRINTING_SUPPORT */ /* * printer info proc */ @@ -272,7 +274,9 @@ typedef struct */ String modal_printer_spec; Display* print_display; +#if 0 && defined(PRINTING_SUPPORTED) XPContext print_context; +#endif /* PRINTING_SUPPORTED */ XtIntervalId timeout_id; /* * descendents @@ -344,8 +348,10 @@ typedef struct _DtPrintSetupBoxRec (((DtPrintSetupBoxWidget) (w))->print_setup_box.cancel_callback) #define PSUB_CloseDisplayCallback(w) \ (((DtPrintSetupBoxWidget) (w))->print_setup_box.close_display_callback) +#if 0 && defined(PRINTING_SUPPORTED) #define PSUB_Context(w) \ (((DtPrintSetupBoxWidget) (w))->print_setup_box.print_context) +#endif /* PRINTING_SUPPORTED */ #define PSUB_Copies(w) \ (((DtPrintSetupBoxWidget) (w))->print_setup_box.copies) #define PSUB_CopiesControl(w) \ diff --git a/cde/lib/DtPrint/PsubDefProc.c b/cde/lib/DtPrint/PsubDefProc.c index 81fe4c8f..5099c366 100644 --- a/cde/lib/DtPrint/PsubDefProc.c +++ b/cde/lib/DtPrint/PsubDefProc.c @@ -213,7 +213,9 @@ BuildPrinterLists( Display* display; int error_base; int event_base; +#if 0 && defined(PRINTING_SUPPORTED) XPPrinterList xp_printer_list; +#endif /* PRINTING_SUPPORTED */ DtPrintSelectPrinterList printer_list; /* * clean up previous lists if needed @@ -245,11 +247,15 @@ BuildPrinterLists( display = XOpenDisplay(server_list[i]); if((Display*)NULL == display) continue; +#if 0 && defined(PRINTING_SUPPORTED) if(!XpQueryExtension(display, &event_base, &error_base)) { +#endif /* PRINTING_SUPPORTED */ XCloseDisplay(display); continue; +#if 0 && defined(PRINTING_SUPPORTED) } +#endif /* PRINTING_SUPPORTED */ /* * add the server to the xp server list */ @@ -258,9 +264,11 @@ BuildPrinterLists( /* * get the printer list for the server */ +#if 0 && defined(PRINTING_SUPPORTED) xp_printer_list = XpGetPrinterList(display, (char*)NULL, &dpd->printer_counts[dpd->xp_server_count]); +#endif /* PRINTING_SUPPORTED */ /* * save a copy of the compound text printer name and * string versions of the name and description for @@ -270,6 +278,7 @@ BuildPrinterLists( XtCalloc(dpd->printer_counts[dpd->xp_server_count], sizeof(DtPrintSelectPrinterRec)); printer_list = dpd->printer_lists[dpd->xp_server_count]; +#if 0 && defined(PRINTING_SUPPORTED) for(j = 0; j < dpd->printer_counts[dpd->xp_server_count]; j++) { printer_list[j].printer_name_ct = @@ -282,6 +291,7 @@ BuildPrinterLists( (unsigned char*)xp_printer_list[j].desc); } XpFreePrinterList(xp_printer_list); +#endif /* PRINTING_SUPPORTED */ /* * sort the printer list */ @@ -424,12 +434,14 @@ CloseSelectPrinterInfoConnection( { if((Display*)NULL != dpd->select_printer_info_display) { +#if 0 && defined(PRINTING_SUPPORTED) if((XPContext)None != dpd->select_printer_info_context) { XpDestroyContext(dpd->select_printer_info_display, dpd->select_printer_info_context); dpd->select_printer_info_context = (XPContext)None; } +#endif /* PRINTING_SUPPORTED */ XCloseDisplay(dpd->select_printer_info_display); dpd->select_printer_info_display = (Display*)NULL; } @@ -1800,8 +1812,11 @@ SelectPrinterInfoCB( _DtPrintVerifyXPrinter(psub, printer_spec, &new_printer_spec, - &dpd->select_printer_info_display, - &dpd->select_printer_info_context); + &dpd->select_printer_info_display +#if 0 && defined(PRINTING_SUPPORTED) + ,&dpd->select_printer_info_context +#endif /* PRINTING_SUPPORTED */ + ); if(status == DtPRINT_SUCCESS) { DtPrintSetupData psd; @@ -1809,7 +1824,9 @@ SelectPrinterInfoCB( memset(&psd, 0, sizeof(DtPrintSetupData)); psd.printer_name = printer_spec; psd.print_display = dpd->select_printer_info_display; +#if 0 && defined(PRINTING_SUPPORTED) psd.print_context = dpd->select_printer_info_context; +#endif /* PRINTING_SUPPORTED */ (*info_proc)(psub, &psd); } else @@ -1988,7 +2005,9 @@ _DtPrintDefProcInitialize(Widget w) dpd->printer_lists = (DtPrintSelectPrinterList*)NULL; dpd->selected_printer = 0; dpd->select_printer_info_display = (Display*)NULL; +#if 0 && defined(PRINTING_SUPPORTED) dpd->select_printer_info_context = (XPContext)None; +#endif /* PRINTING_SUPPORTED */ dpd->printer_info_box = (Widget)NULL; XtAddCallback(w, XmNdestroyCallback, @@ -2036,8 +2055,8 @@ _DtPrintSetupBoxXPrinterInfoProc( Widget wmshell_ancestor; Widget ctl; XmString label; - char* attr_value_ct; - String attr_value; + char* attr_value_ct = NULL; + String attr_value = NULL; XmString empty_label; Widget name_label_top; Position max_y, y; @@ -2077,10 +2096,12 @@ _DtPrintSetupBoxXPrinterInfoProc( */ ctl = XtNameToWidget(dpd->printer_info_box, "*Description"); XtVaSetValues(ctl, XmNlabelString, empty_label, NULL); +#if 0 && defined(PRINTING_SUPPORTED) attr_value_ct = XpGetOneAttribute(print_data->print_display, print_data->print_context, XPPrinterAttr, "descriptor"); +#endif /* PRINTING_SUPPORTED */ if((char*)NULL != attr_value_ct) { attr_value = @@ -2119,10 +2140,12 @@ _DtPrintSetupBoxXPrinterInfoProc( */ ctl = XtNameToWidget(dpd->printer_info_box, "*Format"); XtVaSetValues(ctl, XmNlabelString, empty_label, NULL); +#if 0 && defined(PRINTING_SUPPORTED) attr_value = XpGetOneAttribute(print_data->print_display, print_data->print_context, XPDocAttr, "document-format"); +#endif /* PRINTING_SUPPORTED */ if((String)NULL != attr_value) { char* format_start; @@ -2147,10 +2170,12 @@ _DtPrintSetupBoxXPrinterInfoProc( */ ctl = XtNameToWidget(dpd->printer_info_box, "*Model"); XtVaSetValues(ctl, XmNlabelString, empty_label, NULL); +#if 0 && defined(PRINTING_SUPPORTED) attr_value_ct = XpGetOneAttribute(print_data->print_display, print_data->print_context, XPPrinterAttr, "printer-model"); +#endif /* PRINTING_SUPPORTED */ if((char*)NULL != attr_value_ct) { attr_value = @@ -2471,7 +2496,9 @@ _DtPrintSetupBoxVerifyXPrinterProc( XtEnum status; String new_printer_spec; Display* new_display; +#if 0 && defined(PRINTING_SUPPORTED) XPContext new_context; +#endif /* PRINTING_SUPPORTED */ Widget wmshell_ancestor; wmshell_ancestor = GetWMShellAncestor(w); @@ -2482,8 +2509,11 @@ _DtPrintSetupBoxVerifyXPrinterProc( status = _DtPrintVerifyXPrinter(w, psd->printer_name, &new_printer_spec, - &new_display, - &new_context); + &new_display +#if 0 && defined(PRINTING_SUPPORTED) + ,&new_context +#endif /* PRINTING_SUPPORTED */ + ); if(status == DtPRINT_SUCCESS) { /* @@ -2491,7 +2521,9 @@ _DtPrintSetupBoxVerifyXPrinterProc( * context */ psd->print_display = new_display; +#if 0 && defined(PRINTING_SUPPORTED) psd->print_context = new_context; +#endif /* PRINTING_SUPPORTED */ } else { diff --git a/cde/lib/DtPrint/PsubUtil.c b/cde/lib/DtPrint/PsubUtil.c index 5d6b72c8..d14c32ff 100644 --- a/cde/lib/DtPrint/PsubUtil.c +++ b/cde/lib/DtPrint/PsubUtil.c @@ -183,6 +183,7 @@ OpenXPrinterOnDisplay( Display** new_display, char** ct_printer_name) { +#if 0 && defined(PRINTING_SUPPORTED) Display* print_display; XPPrinterList printer_list; int error_base; @@ -242,6 +243,9 @@ OpenXPrinterOnDisplay( { return DtPRINT_INVALID_DISPLAY; } +#else + return DtPRINT_NO_PRINTER; +#endif } /* @@ -692,6 +696,7 @@ _DtPrintGetXpServerList( /* * convert to a list of strings */ +#if 0 && defined(PRINTING_SUPPORTED) if((Widget)NULL != w && XpQueryExtension(XtDisplay(w), &event_base, &error_base)) @@ -708,6 +713,7 @@ _DtPrintGetXpServerList( server_list = BuildStringList(xp_server_list, 0); } else +#endif /* PRINTING_SUPPORTED */ server_list = (String*)NULL; /* * default the display number to ":0" if needed @@ -1014,8 +1020,11 @@ _DtPrintVerifyXPrinter( Widget w, String printer_spec, String* new_printer_spec, - Display** new_display, - XPContext* new_context) + Display** new_display +#if 0 && defined(PRINTING_SUPPORTED) + ,XPContext* new_context +#endif /* PRINTING_SUPPORTED */ + ) { String default_printer; String printer_name; @@ -1156,6 +1165,7 @@ _DtPrintVerifyXPrinter( /* * initialize the print context */ +#if 0 && defined(PRINTING_SUPPORTED) if((char*)NULL != ct_printer_name) { *new_context = XpCreateContext(print_display, ct_printer_name); @@ -1164,6 +1174,7 @@ _DtPrintVerifyXPrinter( else *new_context = XpCreateContext(print_display, printer_name); XpSetContext(print_display, *new_context); +#endif /* PRINTING_SUPPORTED */ /* * update the display return parm */ diff --git a/cde/lib/DtPrint/PsubUtilI.h b/cde/lib/DtPrint/PsubUtilI.h index 04520198..d0b7f13b 100644 --- a/cde/lib/DtPrint/PsubUtilI.h +++ b/cde/lib/DtPrint/PsubUtilI.h @@ -86,8 +86,11 @@ XtEnum _DtPrintVerifyXPrinter( Widget w, String printer_spec, String* new_printer_spec, - Display** new_display, - XPContext* new_context); + Display** new_display +#if 0 && defined(PRINTING_SUPPORTED) + ,XPContext* new_context +#endif /* PRINTING_SUPPORTED */ + ); diff --git a/cde/osf/wml/Imakefile b/cde/osf/wml/Imakefile index 69994fce..b5258aee 100644 --- a/cde/osf/wml/Imakefile +++ b/cde/osf/wml/Imakefile @@ -8,7 +8,7 @@ XCOMM the full copyright text. INCLUDES = -I. -I$(INCLUDESRC) -I$(MINCLUDESRC) -I$(MLIBSRC) -I$(MTOP)/include DEPLIBS = $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB) -LOCAL_LIBRARIES = $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) +LOCAL_LIBRARIES = $(XMLIB) $(XTOOLLIB) $(XLIB) SRCS1 = wml.c wmlouth.c wmloutmm.c \ diff --git a/cde/programs/dtcalc/Imakefile b/cde/programs/dtcalc/Imakefile index af6fdd31..c38f114c 100644 --- a/cde/programs/dtcalc/Imakefile +++ b/cde/programs/dtcalc/Imakefile @@ -5,11 +5,11 @@ XCOMM $TOG: Imakefile /main/11 1997/09/05 11:28:15 samborn $ INCLUDES = -I. #if defined (SunArchitecture) -DEPLIBS = $(DEPDTSVCLIB) $(DEPTTLIB) $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXPLIB) $(DEPXLIB) -LOCAL_LIBRARIES = $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) +DEPLIBS = $(DEPDTSVCLIB) $(DEPTTLIB) $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB) +LOCAL_LIBRARIES = $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XLIB) #else -DEPLIBS = $(DEPDTHELPLIB) $(DEPDTSVCLIB) $(DEPTTLIB) $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXPLIB) $(DEPXLIB) -LOCAL_LIBRARIES = $(DTHELPLIB) $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) +DEPLIBS = $(DEPDTHELPLIB) $(DEPDTSVCLIB) $(DEPTTLIB) $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB) +LOCAL_LIBRARIES = $(DTHELPLIB) $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XLIB) #endif /* SunArchitecture*/ SYS_LIBRARIES = -lm diff --git a/cde/programs/dtcm/dtcm/print.c b/cde/programs/dtcm/dtcm/print.c index a3418641..bb68c793 100644 --- a/cde/programs/dtcm/dtcm/print.c +++ b/cde/programs/dtcm/dtcm/print.c @@ -38,7 +38,9 @@ #include #include #include +#if 0 && defined(PRINTING_SUPPORTED) #include +#endif /* PRINTING_SUPPORTED */ #include #include #include @@ -872,7 +874,7 @@ clearSetupData(_DtCmPrintData *pd) static void createPrintShell(Calendar *c) { -#if defined(PRINTING_SUPPORTED) +#if 0 && defined(PRINTING_SUPPORTED) _DtCmPrintData *pd = (_DtCmPrintData *)c->print_data; #ifdef GR_DEBUG @@ -1254,7 +1256,7 @@ report_error(Calendar *c, char *title, char *errText) static void pdm_notify_cb(Widget w, XtPointer uData, XtPointer cbData) { -#if defined(PRINTING_SUPPORTED) +#if 0 && defined(PRINTING_SUPPORTED) XmPrintShellCallbackStruct *cbStruct = (XmPrintShellCallbackStruct *)cbData; Calendar *c = (Calendar *)uData; @@ -1332,7 +1334,7 @@ print_cb(Widget w, XtPointer data, XtPointer cbDataP) static void print_setup_cb(Widget w, XtPointer uData, XtPointer cbData) { -#if defined(PRINTING_SUPPORTED) +#if 0 && defined(PRINTING_SUPPORTED) Calendar *c = (Calendar *)uData; _DtCmPrintData *pd = (_DtCmPrintData *)c->print_data; DtPrintSetupCallbackStruct *cbStruct = diff --git a/cde/programs/dtcm/dtcm/x_graphics.c b/cde/programs/dtcm/dtcm/x_graphics.c index bfee10c7..abe2f608 100644 --- a/cde/programs/dtcm/dtcm/x_graphics.c +++ b/cde/programs/dtcm/dtcm/x_graphics.c @@ -57,12 +57,16 @@ #include "print.h" #include +#if 0 && defined(PRINTING_SUPPORTED) #include +#endif /* PRINTING_SUPPORTED */ #include #include #include +#if 0 && defined(PRINTING_SUPPORTED) #include +#endif /* PRINTING_SUPPORTED */ #define XOS_USE_XT_LOCKING #define X_INCLUDE_TIME_H @@ -497,8 +501,10 @@ typedef struct _CMGraphicsInfo static void local_dayname(Calendar *, char **, int); static void local_dayname3(Calendar *, char **, int); static char *get_report_type_string(CMGraphicsInfo *); +#if 0 && defined(PRINTING_SUPPORTED) static void filePrintDoneCB(Display *, XPContext, XPGetDocStatus, XPointer); +#endif /* PRINTING_SUPPORTED */ static void filePrintReportStatus(Calendar *, Boolean); static void showBadAllocError(Calendar *); @@ -2089,6 +2095,7 @@ get_report_type_string(CMGraphicsInfo *gInfo) return reportStrs[reportType]; } +#if 0 && defined(PRINTING_SUPPORTED) static void filePrintDoneCB(Display *dsp, XPContext context, XPGetDocStatus status, XPointer uData) @@ -2103,6 +2110,7 @@ filePrintDoneCB(Display *dsp, XPContext context, XPGetDocStatus status, else filePrintReportStatus(c, (status == XPGetDocFinished)); } +#endif /* PRINTING_SUPPORTED */ static void filePrintReportStatus(Calendar *c, Boolean ok) @@ -2228,7 +2236,7 @@ x_open_file(Calendar *c) NULL, 0); #endif -#if defined(PRINTING_SUPPORTED) +#if 0 && defined(PRINTING_SUPPORTED) #ifdef GR_DEBUG if (!inDebugMode(c)) @@ -2372,7 +2380,9 @@ x_print_file(void *gInfoP, Calendar *c) if (!inDebugMode(c)) #endif { +#if 0 && defined(PRINTING_SUPPORTED) XpEndJob(dsp); +#endif /* PRINTING_SUPPORTED */ /* Make sure we know about a BadAlloc if it happens. */ XSync(XtDisplay(gInfo->drawingArea), FALSE); @@ -2410,6 +2420,7 @@ x_init_printer(void *gInfoP, short orientation) int inchWd; Dimension daWd, daHt; +#if 0 && defined(PRINTING_SUPPORTED) #ifdef GR_DEBUG if (inDebugMode(gInfo->c)) { @@ -2419,6 +2430,7 @@ x_init_printer(void *gInfoP, short orientation) else #endif XpStartPage(XtDisplay(w), XtWindow(XtParent(w))); +#endif /* PRINTING_SUPPORTED */ /* XpStartPage() sets the shell width/height correctly. */ nargs = 0; @@ -2943,7 +2955,9 @@ x_finish_printer(void *gInfoP) tmpSpin(w); else #endif +#if 0 && defined(PRINTING_SUPPORTED) XpEndPage(XtDisplay(w)); +#endif /* PRINTING_SUPPORTED */ } void diff --git a/cde/programs/dtdbcache/Imakefile b/cde/programs/dtdbcache/Imakefile index a8d82d7d..620ca292 100644 --- a/cde/programs/dtdbcache/Imakefile +++ b/cde/programs/dtdbcache/Imakefile @@ -20,9 +20,9 @@ XCOMM $XConsortium: Imakefile /main/5 1996/09/14 15:26:52 drk $ * You cannot put -Llibpath into DEPLIBS. You must put actual * paths to the library. */ -DEPLIBS = $(DEPDTSVCLIB) $(DEPTTLIB) $(DEPXMLIB) $(DEPXPLIB) \ +DEPLIBS = $(DEPDTSVCLIB) $(DEPTTLIB) $(DEPXMLIB) \ $(DEPXTOOLLIB) $(DEPXLIB) -LOCAL_LIBRARIES = $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XPLIB) $(XTOOLLIB) $(XLIB) +LOCAL_LIBRARIES = $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XLIB) SYS_LIBRARIES = -lm diff --git a/cde/programs/dthelp/dthelpdemo/Imakefile b/cde/programs/dthelp/dthelpdemo/Imakefile index 9bcc9a6f..ce54e8b7 100644 --- a/cde/programs/dthelp/dthelpdemo/Imakefile +++ b/cde/programs/dthelp/dthelpdemo/Imakefile @@ -14,8 +14,8 @@ DEPEND_DEFINES = $(DEPENDDEFINES) DEFINES = -D_BMS INCLUDES = -I. -DEPLIBS = $(DEPDTHELPLIB) $(DEPDTSVCLIB) $(DEPTTLIB) $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXPLIB) $(DEPXLIB) -LOCAL_LIBRARIES = $(DTHELPLIB) $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) +DEPLIBS = $(DEPDTHELPLIB) $(DEPDTSVCLIB) $(DEPTTLIB) $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB) +LOCAL_LIBRARIES = $(DTHELPLIB) $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XLIB) SYS_LIBRARIES = DtClientSysLibs $(CXXLIB) SRCS = Main.c HourGlass.c HelpCache.c diff --git a/cde/programs/dthelp/dthelpgen/Imakefile b/cde/programs/dthelp/dthelpgen/Imakefile index d6c06219..b700e28b 100644 --- a/cde/programs/dthelp/dthelpgen/Imakefile +++ b/cde/programs/dthelp/dthelpgen/Imakefile @@ -5,8 +5,8 @@ PROGRAMS = dthelpgen -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" INCLUDES = -I. -DEPLIBS = $(DEPDTHELPLIB) $(DEPDTSVCLIB) $(DEPTTLIB) $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXPLIB) $(DEPXLIB) -LOCAL_LIBRARIES = $(DTHELPLIB) $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) +DEPLIBS = $(DEPDTHELPLIB) $(DEPDTSVCLIB) $(DEPTTLIB) $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB) +LOCAL_LIBRARIES = $(DTHELPLIB) $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XLIB) SYS_LIBRARIES = DtClientSysLibs $(CXXLIB) EXTRA_INCLUDES = -I$(DTHELPSRC) diff --git a/cde/programs/dthelp/dthelpprint/Imakefile b/cde/programs/dthelp/dthelpprint/Imakefile index 0db5ce16..95633ef8 100644 --- a/cde/programs/dthelp/dthelpprint/Imakefile +++ b/cde/programs/dthelp/dthelpprint/Imakefile @@ -6,8 +6,8 @@ DEFINES = -DDTLIB $(ICONV_INBUF_DEFINE) \ -DCDE_CONFIGURATION_TOP='"$(CDE_CONFIGURATION_TOP)"' \ -DCDE_INSTALLATION_TOP='"$(CDE_INSTALLATION_TOP)"' -DEPLIBS = $(DEPDTHELPLIB) $(DEPDTSVCLIB) $(DEPTTLIB) $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXPLIB) $(DEPXLIB) -LOCAL_LIBRARIES = $(DTHELPLIB) $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) +DEPLIBS = $(DEPDTHELPLIB) $(DEPDTSVCLIB) $(DEPTTLIB) $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB) +LOCAL_LIBRARIES = $(DTHELPLIB) $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XLIB) /* Sun needs the widechar library */ #ifdef SunArchitecture diff --git a/cde/programs/dthelp/dthelpview/Imakefile b/cde/programs/dthelp/dthelpview/Imakefile index 177a96ac..59ca67c5 100644 --- a/cde/programs/dthelp/dthelpview/Imakefile +++ b/cde/programs/dthelp/dthelpview/Imakefile @@ -5,8 +5,8 @@ DEPEND_DEFINES = $(DEPENDDEFINES) DEFINES = -D_BMS INCLUDES = -I. -DEPLIBS = $(DEPDTHELPLIB) $(DEPDTSVCLIB) $(DEPTTLIB) $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXPLIB) $(DEPXLIB) -LOCAL_LIBRARIES = $(DTHELPLIB) $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) +DEPLIBS = $(DEPDTHELPLIB) $(DEPDTSVCLIB) $(DEPTTLIB) $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB) +LOCAL_LIBRARIES = $(DTHELPLIB) $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XLIB) SYS_LIBRARIES = DtClientSysLibs $(CXXLIB) SRCS = Main.c ManPage.c Util.c version.c diff --git a/cde/programs/dtimsstart/Imakefile b/cde/programs/dtimsstart/Imakefile index a299def6..d5a86a82 100644 --- a/cde/programs/dtimsstart/Imakefile +++ b/cde/programs/dtimsstart/Imakefile @@ -5,14 +5,14 @@ INCLUDES = -I. -I$(CDELIBSRC) #if defined (SunArchitecture) DEPLIBS = $(DEPDTSVCLIB) $(DEPTTLIB) \ - $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXPLIB) $(DEPXLIB) + $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB) LOCAL_LIBRARIES = $(DTSVCLIB) $(TTLIB) \ - $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) + $(XMLIB) $(XTOOLLIB) $(XLIB) #else DEPLIBS = $(DEPDTHELPLIB) $(DEPDTSVCLIB) $(DEPTTLIB) \ - $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXPLIB) $(DEPXLIB) + $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB) LOCAL_LIBRARIES = $(DTHELPLIB) $(DTSVCLIB) $(TTLIB) \ - $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) + $(XMLIB) $(XTOOLLIB) $(XLIB) #endif /* SunArchitecture */ SYS_LIBRARIES = DtClientSysLibs diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/NodePrintAgent.C b/cde/programs/dtinfo/dtinfo/src/Agents/NodePrintAgent.C index beca3408..be4639bd 100644 --- a/cde/programs/dtinfo/dtinfo/src/Agents/NodePrintAgent.C +++ b/cde/programs/dtinfo/dtinfo/src/Agents/NodePrintAgent.C @@ -220,15 +220,17 @@ _DtHelpCreatePrintArea(Widget parent, extern AppPrintData * l_AppPrintData; DtHelpDispAreaStruct * DisplayArea; String string_resolution; - int resolution; + int resolution = 0; // get print resolution from default-printer-resolution +#if 0 && defined(PRINTING_SUPPORTED) string_resolution = XpGetOneAttribute(XtDisplay(parent), l_AppPrintData->f_print_data->print_context, XPDocAttr, (char*)"default-printer-resolution"); resolution = atoi(string_resolution); XFree(string_resolution); +#endif /* PRINTING_SUPPORTED */ // if not printing, or default-printer-resolution not defined, calcuate from // the X screen resolution diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/PrintPanelAgentMotif.C b/cde/programs/dtinfo/dtinfo/src/Agents/PrintPanelAgentMotif.C index 13920a16..cfbed33e 100644 --- a/cde/programs/dtinfo/dtinfo/src/Agents/PrintPanelAgentMotif.C +++ b/cde/programs/dtinfo/dtinfo/src/Agents/PrintPanelAgentMotif.C @@ -149,7 +149,7 @@ static WXmToggleButton f_print_hierarchy; static Boolean print_hierarchy; // keep track of hierarchy vs section -#if defined(PRINTING_SUPPORTED) +#if 0 && defined(PRINTING_SUPPORTED) static void PrintEverything(AppPrintData *p); #endif /* PRINTING_SUPPORTED */ @@ -435,7 +435,7 @@ PdmNotifyCB(Widget pr_shell, XtPointer client_data, XtPointer call_data) { RCS_DEBUG("PdmNotifyCB called.\n"); -#if defined(PRINTING_SUPPORTED) +#if 0 && defined(PRINTING_SUPPORTED) char *msg; XmPrintShellCallbackStruct* pr_cbs = @@ -469,7 +469,7 @@ CreatePrintShell(Widget widget, AppPrintData* p) { RCS_DEBUG("CreatePrintShell called.\n"); -#if defined(PRINTING_SUPPORTED) +#if 0 && defined(PRINTING_SUPPORTED) char buf[BUFSIZ]; /* @@ -529,7 +529,7 @@ PrintSetupCB(Widget print_dialog, XtPointer client_data, XtPointer call_data) { RCS_DEBUG("PrintSetupCB called.\n"); -#if defined(PRINTING_SUPPORTED) +#if 0 && defined(PRINTING_SUPPORTED) char *msg; AppPrintData *p = (AppPrintData*)client_data; @@ -770,9 +770,9 @@ QuickPrintCB(Widget pr_button, XtPointer client_data, XtPointer call_data) * App-specific print data holder allocate function. * */ +#if 0 && defined(PRINTING_SUPPORTED) void FinishPrintToFile(Display *display, - XPContext context, XPGetDocStatus status, XPointer client_data) { @@ -800,6 +800,7 @@ FinishPrintToFile(Display *display, return; } +#endif /* PRINTING_SUPPORTED */ /* * ------------------------------------------------------------------------ @@ -814,7 +815,7 @@ FinishPrintToFile(Display *display, void DoPrint(Widget widget, AppPrintData * p) { -#if defined(PRINTING_SUPPORTED) +#if 0 && defined(PRINTING_SUPPORTED) int save_data = XPSpool; char *msg; @@ -825,7 +826,7 @@ DoPrint(Widget widget, AppPrintData * p) RCS_DEBUG("DoPrint called.\n"); -#if defined(PRINTING_SUPPORTED) +#if 0 && defined(PRINTING_SUPPORTED) // create print shell, if not done yet CreatePrintShell(widget, p); @@ -928,7 +929,7 @@ DoPrint(Widget widget, AppPrintData * p) } -#if defined(PRINTING_SUPPORTED) +#if 0 && defined(PRINTING_SUPPORTED) /* * ------------------------------------------------------------------------ * Name: PrintEverything @@ -980,12 +981,14 @@ PrintOneUASCommon(UAS_Pointer &doc, Widget pshell, int *cur_pageP) // set print orientation to either landscape or portrait (if set) +#if 0 && defined(PRINTING_SUPPORTED) if (f_printOrientation != NULL) { snprintf(buf, sizeof(buf), "*content-orientation: %s\n", f_printOrientation); XpSetAttributes(XtDisplay(pshell), XpGetContext(XtDisplay(pshell)), XPPageAttr, buf, XPAttrMerge); } +#endif /* PRINTING_SUPPORTED */ for (gHelpDisplayArea->firstVisible = gHelpDisplayArea->nextNonVisible = 0; gHelpDisplayArea->nextNonVisible >= 0; @@ -993,7 +996,9 @@ PrintOneUASCommon(UAS_Pointer &doc, Widget pshell, int *cur_pageP) { (*cur_pageP)++; +#if 0 && defined(PRINTING_SUPPORTED) XpStartPage(XtDisplay(pshell), XtWindow(pshell)); +#endif /* PRINTING_SUPPORTED */ snprintf(buf, sizeof(buf), "%d", *cur_pageP); label = XmStringCreateLocalized(buf); @@ -1008,7 +1013,9 @@ PrintOneUASCommon(UAS_Pointer &doc, Widget pshell, int *cur_pageP) // _DtHelpCleanAndDrawWholeCanvas((XtPointer)gHelpDisplayArea); +#if 0 && defined(PRINTING_SUPPORTED) XpEndPage(XtDisplay(pshell)); +#endif /* PRINTING_SUPPORTED */ } // Print chidren if appropriate diff --git a/cde/programs/dtinfo/dtinfo/src/Agents/PrintPanelAgentMotif.hh b/cde/programs/dtinfo/dtinfo/src/Agents/PrintPanelAgentMotif.hh index 02f1d1cb..8041f5ac 100644 --- a/cde/programs/dtinfo/dtinfo/src/Agents/PrintPanelAgentMotif.hh +++ b/cde/programs/dtinfo/dtinfo/src/Agents/PrintPanelAgentMotif.hh @@ -26,7 +26,9 @@ */ #include +#if 0 && defined(PRINTING_SUPPORTED) #include +#endif /* PRINTING_SUPPORTED */ #include
#include "UAS.hh" @@ -77,7 +79,9 @@ void customizePrintSetupBox(AppPrintData * p); void DoPrint(Widget widget, AppPrintData * p); void Print(AppPrintData *p); void PrintCloseDisplayCB(Widget, XtPointer, XtPointer); -void FinishPrintToFile(Display*, XPContext, XPGetDocStatus, XPointer); +#if 0 && defined(PRINTING_SUPPORTED) +void FinishPrintToFile(Display*, XPointer); +#endif /* PRINTING_SUPPORTED */ void CreatePrintShell(Widget, AppPrintData*); void CreatePrintSetup(Widget parent, AppPrintData* p); diff --git a/cde/programs/dtinfo/dtinfo/src/Managers/GraphicsMgr.C b/cde/programs/dtinfo/dtinfo/src/Managers/GraphicsMgr.C index abb06f43..0f3faa38 100644 --- a/cde/programs/dtinfo/dtinfo/src/Managers/GraphicsMgr.C +++ b/cde/programs/dtinfo/dtinfo/src/Managers/GraphicsMgr.C @@ -109,6 +109,7 @@ GraphicsMgr::get_graphic (UAS_Pointer &gr) // if printing, get print resolution from default-printer-resolution +#if 0 && defined(PRINTING_SUPPORTED) if (window_system().printing()) { string_resolution = XpGetOneAttribute(window_system().printDisplay(), l_AppPrintData->f_print_data->print_context, @@ -116,6 +117,7 @@ GraphicsMgr::get_graphic (UAS_Pointer &gr) resolution = atoi(string_resolution); XFree(string_resolution); } +#endif /* PRINTING_SUPPORTED */ // if not printing, or default-printer-resolution not defined, calcuate from // the X screen resolution diff --git a/cde/programs/dtinfo/dtinfo/src/Other/AppPrintData.hh b/cde/programs/dtinfo/dtinfo/src/Other/AppPrintData.hh index 27467895..f7c530ed 100644 --- a/cde/programs/dtinfo/dtinfo/src/Other/AppPrintData.hh +++ b/cde/programs/dtinfo/dtinfo/src/Other/AppPrintData.hh @@ -14,7 +14,9 @@ #define _AppPrintData_hh #include +#if 0 && defined(PRINTING_SUPPORTED) #include +#endif /* PRINTING_SUPPORTED */ #include
#include "UAS.hh" diff --git a/cde/programs/dtksh/Imakefile b/cde/programs/dtksh/Imakefile index 29aabae5..7a735136 100644 --- a/cde/programs/dtksh/Imakefile +++ b/cde/programs/dtksh/Imakefile @@ -15,10 +15,10 @@ INCLUDES = -I. -I$(KSH93SRC)/include/ast -I$(KSH93SRC)/src/cmd/ksh93/include -I$ * paths to the library. */ DEPLIBS = $(DEPDTHELPLIB) $(DEPDTSVCLIB) $(DEPDTWIDGETLIB) $(DEPDTPRINTLIB) \ - $(DEPXPLIB) $(DEPTTLIB) $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB) \ + $(DEPTTLIB) $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB) \ $(KSH93SRC)/lib/libast.a LOCAL_LIBRARIES = $(DTHELPLIB) $(DTWIDGETLIB) $(DTSVCLIB) $(DTPRINTLIB) \ - $(XPLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XLIB) \ + $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XLIB) \ $(KSH93SRC)/lib/libcmd.a $(KSH93SRC)/lib/libast.a SYS_LIBRARIES = -lm $(DYNLIBSYSLIB) $(REGEXSYSLIB) $(ICONVSYSLIB) diff --git a/cde/programs/dtlogin/Imakefile b/cde/programs/dtlogin/Imakefile index d039a7be..1cd87051 100644 --- a/cde/programs/dtlogin/Imakefile +++ b/cde/programs/dtlogin/Imakefile @@ -313,14 +313,14 @@ EXTRA_RES_DEFINES = \ DEPLIBS1 = $(DEPXAUTHLIB) $(DEPXDMCPLIB) $(LOGINDEPXMULIB) $(LOGINDEPXLIB) DEPLIBS2 = $(DEPDTWIDGETLIB) $(DEPDTSVCLIB) $(DEPTTLIB) $(DEPXMLIB) \ - $(DEPXTOOLLIB) $(DEPXPLIB) $(DEPXLIB) - DEPLIBS3 = $(DEPXDMCPLIB) $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXPLIB) $(DEPXLIB) + $(DEPXTOOLLIB) $(DEPXLIB) + DEPLIBS3 = $(DEPXDMCPLIB) $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB) BASE_LIBS1 = $(XAUTHLIB) $(LOGINXMULIB) $(XDMCPLIB) $(LOGINXLIB) BASE_LIBS2 = $(DTWIDGETLIB) $(DTSVCLIB) $(TTLIB) $(XMLIB) \ - $(XTOOLLIB) $(XPLIB) $(XLIB) $(XINLIB) + $(XTOOLLIB) $(XLIB) $(XINLIB) BASE_LIBS3 = $(DTWIDGETLIB) $(DTSVCLIB) $(TTLIB) $(XDMCPLIB) $(XMLIB) \ - $(XTOOLLIB) $(XPLIB) $(XLIB) $(XINLIB) + $(XTOOLLIB) $(XLIB) $(XINLIB) LOCAL_LIBRARIES1 = $(BASE_LIBS1) $(IAFSYSLIB) LOCAL_LIBRARIES2 = $(BASE_LIBS2) @@ -336,7 +336,7 @@ EXTRA_RES_DEFINES = \ BASE_LIBS1 = $(XAUTHLIB) $(LOGINXMULIB) $(XDMCPLIB) $(XTOOLLIB) \ $(LOGINXLIB) BASE_LIBS2 = $(DTWIDGETLIB) $(DTSVCLIB) $(TTLIB) \ - $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) + $(XMLIB) $(XTOOLLIB) $(XLIB) # endif #endif @@ -345,7 +345,7 @@ EXTRA_RES_DEFINES = \ BASE_LIBS1 = $(XAUTHLIB) $(LOGINXMULIB) $(XDMCPLIB) $(XTOOLLIB) \ $(LOGINXLIB) BASE_LIBS2 = $(DTWIDGETLIB) $(DTSVCLIB) $(TTLIB) \ - $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) + $(XMLIB) $(XTOOLLIB) $(XLIB) # endif #endif diff --git a/cde/programs/dtmail/dtmail/DmxPrintJob.C b/cde/programs/dtmail/dtmail/DmxPrintJob.C index f300585a..ad15d0ec 100644 --- a/cde/programs/dtmail/dtmail/DmxPrintJob.C +++ b/cde/programs/dtmail/dtmail/DmxPrintJob.C @@ -82,7 +82,9 @@ #include #include #include +#if 0 && defined(PRINTING_SUPPORTED) #include +#endif /* PRINTING_SUPPORTED */ #include "Dmx.h" #include "DmxPrintJob.h" #include "DmxPrintOptions.h" @@ -310,7 +312,7 @@ DmxPrintJob::execute (void) void DmxPrintJob::createPrintShell (void) { -#if defined(PRINTING_SUPPORTED) +#if 0 && defined(PRINTING_SUPPORTED) DtMailEnv dmxenv; DtMail::Session *d_session = theRoamApp.session()->session(); @@ -459,7 +461,7 @@ ok_cb(DtMailGenDialog *genDialog) void DmxPrintJob::doPrint (void) { -#if defined(PRINTING_SUPPORTED) +#if 0 && defined(PRINTING_SUPPORTED) DtMailEnv dmxenv; DtMail::Session *d_session = theRoamApp.session()->session(); XPSaveData dest = XPSpool; @@ -670,7 +672,7 @@ DmxPrintJob::printOnePageCB( XtPointer client_data, XtPointer call_data) { -#if defined(PRINTING_SUPPORTED) +#if 0 && defined(PRINTING_SUPPORTED) DmxPrintJob *thisJob = (DmxPrintJob *) client_data; XmPrintShellCallbackStruct *pscbs = (XmPrintShellCallbackStruct*)call_data; @@ -978,6 +980,7 @@ DmxPrintJob::getPageHeaderString( * Name: DmxPrintJob::finishedPrintToFile * Description: */ +#if 0 && defined(PRINTING_SUPPORTED) void DmxPrintJob::finishedPrintToFile( Display *display, @@ -1023,6 +1026,7 @@ DmxPrintJob::finishedPrintToFile( } thisJob->cancel(); } +#endif /* PRINTING_SUPPORTED */ /* * Name: DmxPrintJob::cancelCB @@ -1069,7 +1073,7 @@ DmxPrintJob::pdmNotificationCB( XtPointer client_data, XtPointer call_data) { -#if defined(PRINTING_SUPPORTED) +#if 0 && defined(PRINTING_SUPPORTED) DmxPrintJob *thisJob = (DmxPrintJob *) client_data; XmPrintShellCallbackStruct *pscbs = (XmPrintShellCallbackStruct*)call_data; char *message = NULL; @@ -1118,7 +1122,7 @@ DmxPrintJob::pdmSetupCB( XtPointer client_data, XtPointer call_data) { -#if defined(PRINTING_SUPPORTED) +#if 0 && defined(PRINTING_SUPPORTED) DmxPrintJob *thisJob = (DmxPrintJob *) client_data; DtPrintSetupCallbackStruct *pbs = (DtPrintSetupCallbackStruct *) call_data; diff --git a/cde/programs/dtmail/dtmail/DmxPrintJob.h b/cde/programs/dtmail/dtmail/DmxPrintJob.h index 00e9bf7c..b2017fad 100644 --- a/cde/programs/dtmail/dtmail/DmxPrintJob.h +++ b/cde/programs/dtmail/dtmail/DmxPrintJob.h @@ -127,11 +127,13 @@ class DmxPrintJob : public UIComponent void createPrintShell (void); void createOutputWidgets (void); void doPrint (void); +#if 0 && defined(PRINTING_SUPPORTED) static void finishedPrintToFile( Display*, XPContext, XPGetDocStatus, XPointer); +#endif /* PRINTING_SUPPORTED */ char * getPageHeaderString( DmxMsg*, DmxStringTypeEnum); Boolean loadOutputWidgets (void); void updatePageHeaders( diff --git a/cde/programs/dtmail/dtmail/DmxPrintOutput.C b/cde/programs/dtmail/dtmail/DmxPrintOutput.C index 55808c47..cbd3df77 100644 --- a/cde/programs/dtmail/dtmail/DmxPrintOutput.C +++ b/cde/programs/dtmail/dtmail/DmxPrintOutput.C @@ -77,7 +77,9 @@ #include #include #include +#if 0 && defined(PRINTING_SUPPORTED) #include +#endif /* PRINTING_SUPPORTED */ #include #include
diff --git a/cde/programs/dtpad/printJob.c b/cde/programs/dtpad/printJob.c index 00aaa44d..adb365aa 100644 --- a/cde/programs/dtpad/printJob.c +++ b/cde/programs/dtpad/printJob.c @@ -76,7 +76,9 @@ #include #include #include +#if 0 && defined(PRINTING_SUPPORTED) #include +#endif /* PRINTING_SUPPORTED */ #include
#include
@@ -91,11 +93,13 @@ static void _pjUpdatePageHeaders( PrintStringTypeEnum, PrintStringTypeEnum, PrintStringTypeEnum); +#if 0 && defined(PRINTING_SUPPORTED) static void _pjFinishedPrintToFile( Display*, XPContext, XPGetDocStatus, XPointer); +#endif /* PRINTING_SUPPORTED */ static char * _pjGetPageHeaderString(PrintJob*, PrintStringTypeEnum); static void _pjCancelCB (Widget, XtPointer client_data, XtPointer); @@ -374,7 +378,7 @@ _pjCreatePrintShell(PrintJob *pJob) pJob->parentShell == NULL || pJob->pSetup == NULL) return; -#if defined(PRINTING_SUPPORTED) +#if 0 && defined(PRINTING_SUPPORTED) /* * Create the print shell and @@ -589,7 +593,7 @@ _pjCreateOutputWidgets(PrintJob *pJob) static void _pjDoPrint(PrintJob *pJob) { -#if defined(PRINTING_SUPPORTED) +#if 0 && defined(PRINTING_SUPPORTED) static char buf[1024]; static char *format; @@ -796,6 +800,7 @@ _pjGetPageHeaderString(PrintJob *pJob, PrintStringTypeEnum type) * App-specific print data holder allocate function. * */ +#if 0 && defined(PRINTING_SUPPORTED) static void _pjFinishedPrintToFile( Display *display, XPContext context, @@ -824,6 +829,7 @@ static void _pjFinishedPrintToFile( } PrintJobDestroy(pJob); } +#endif /* PRINTING_SUPPORTED */ /* @@ -887,7 +893,7 @@ _pjPrintCB (Widget widget, XtPointer client_data, XtPointer call_data) static void _pjPdmSetupCB(Widget print_setup, XtPointer client_data, XtPointer call_data) { -#if defined(PRINTING_SUPPORTED) +#if 0 && defined(PRINTING_SUPPORTED) char *pname = "_pjPdmSetupCB"; PrintJob *pJob = (PrintJob *) client_data; DtPrintSetupCallbackStruct @@ -920,7 +926,7 @@ _pjPdmSetupCB(Widget print_setup, XtPointer client_data, XtPointer call_data) static void _pjPdmNotificationCB (Widget widget, XtPointer client_data, XtPointer call_data) { -#if defined(PRINTING_SUPPORTED) +#if 0 && defined(PRINTING_SUPPORTED) PrintJob *pJob = (PrintJob*) client_data; XmPrintShellCallbackStruct *pscbs = (XmPrintShellCallbackStruct*)call_data; char *message = NULL; @@ -959,7 +965,7 @@ _pjPrintOnePageCB( XtPointer call_data ) { -#if defined(PRINTING_SUPPORTED) +#if 0 && defined(PRINTING_SUPPORTED) PrintJob *pJob = (PrintJob *) client_data; XmPrintShellCallbackStruct *pscbs = (XmPrintShellCallbackStruct*)call_data; diff --git a/cde/programs/dtpad/printOutput.c b/cde/programs/dtpad/printOutput.c index ca61c386..aa12771f 100644 --- a/cde/programs/dtpad/printOutput.c +++ b/cde/programs/dtpad/printOutput.c @@ -72,7 +72,9 @@ #include #include #include +#if 0 && defined(PRINTING_SUPPORTED) #include +#endif /* PRINTING_SUPPORTED */ #include #include
diff --git a/cde/programs/dtpdm/JobBox.c b/cde/programs/dtpdm/JobBox.c index 22c64873..7487a8c4 100644 --- a/cde/programs/dtpdm/JobBox.c +++ b/cde/programs/dtpdm/JobBox.c @@ -235,14 +235,16 @@ static void PdmJobBoxGetAttr(PdmSetupBox* me, PdmXp* pdm_xp) { PdmJobBoxData* data = (PdmJobBoxData*)me->subclass_data; - PdmOidList* job_attrs_supported; - const char* strval; + PdmOidList* job_attrs_supported = NULL; + const char* strval = NULL; /* * job attributes supported */ +#if 0 && defined(PRINTING_SUPPORTED) strval = PdmXpGetStringValue(pdm_xp, XPPrinterAttr, pdmoid_att_job_attributes_supported); +#endif /* PRINTING_SUPPORTED */ job_attrs_supported = PdmOidListNew(strval); /* * job options @@ -251,9 +253,11 @@ PdmJobBoxGetAttr(PdmSetupBox* me, PdmXp* pdm_xp) pdmoid_att_xp_spooler_command_options)) { data->job_options_supported = True; +#if 0 && defined(PRINTING_SUPPORTED) data->job_options = PdmXpGetStringValue(pdm_xp, XPJobAttr, pdmoid_att_xp_spooler_command_options); +#endif /* PRINTING_SUPPORTED */ } /* * job name (banner) @@ -261,16 +265,20 @@ PdmJobBoxGetAttr(PdmSetupBox* me, PdmXp* pdm_xp) if(PdmOidListHasOid(job_attrs_supported, pdmoid_att_job_name)) { data->job_name_supported = True; +#if 0 && defined(PRINTING_SUPPORTED) data->job_name = PdmXpGetStringValue(pdm_xp, XPJobAttr, pdmoid_att_job_name); +#endif /* PRINTING_SUPPORTED */ } /* * notification profile (send mail) */ if(PdmOidListHasOid(job_attrs_supported, pdmoid_att_notification_profile)) { +#if 0 && defined(PRINTING_SUPPORTED) strval = PdmXpGetStringValue(pdm_xp, XPJobAttr, pdmoid_att_notification_profile); +#endif /* PRINTING_SUPPORTED */ data->notification_profile = PdmOidNotifyParse(strval); if(data->notification_profile != PDMOID_NOTIFY_UNSUPPORTED) data->notification_profile_supported = True; @@ -301,15 +309,19 @@ PdmJobBoxSetAttr(PdmSetupBox* me, PdmXp* pdm_xp) { String value; XtVaGetValues(data->job_options_text, XmNvalue, &value, NULL); +#if 0 && defined(PRINTING_SUPPORTED) PdmXpSetStringValue(pdm_xp, XPJobAttr, pdmoid_att_xp_spooler_command_options, value); +#endif /* PRINTING_SUPPORTED */ XtFree(value); } if(data->job_name_supported) { String value; XtVaGetValues(data->job_name_text, XmNvalue, &value, NULL); +#if 0 && defined(PRINTING_SUPPORTED) PdmXpSetStringValue(pdm_xp, XPJobAttr, pdmoid_att_job_name, value); +#endif /* PRINTING_SUPPORTED */ XtFree(value); } if(data->notification_profile_supported) @@ -317,11 +329,13 @@ PdmJobBoxSetAttr(PdmSetupBox* me, PdmXp* pdm_xp) Boolean set; set = XmToggleButtonGadgetGetState(data->notify_toggle); +#if 0 && defined(PRINTING_SUPPORTED) PdmXpSetStringValue(pdm_xp, XPJobAttr, pdmoid_att_notification_profile, PdmOidNotifyString(set ? PDMOID_NOTIFY_EMAIL : PDMOID_NOTIFY_NONE)); +#endif /* PRINTING_SUPPORTED */ } } diff --git a/cde/programs/dtpdm/MainWindow.c b/cde/programs/dtpdm/MainWindow.c index de877775..cacb12d7 100644 --- a/cde/programs/dtpdm/MainWindow.c +++ b/cde/programs/dtpdm/MainWindow.c @@ -289,12 +289,14 @@ PdmMainWinGetAttributes(PdmMainWin* me) /* * get attributes for the main window */ +#if 0 && defined(PRINTING_SUPPORTED) me->printer_descriptor = PdmXpGetStringValue(me->pdm_xp, XPPrinterAttr, pdmoid_att_descriptor); me->printer_name = PdmXpGetStringValue(me->pdm_xp, XPPrinterAttr, pdmoid_att_printer_name); +#endif /* PRINTING_SUPPORTED */ /* * call the get attributes proc for each setup box child */ diff --git a/cde/programs/dtpdm/PdmXp.c b/cde/programs/dtpdm/PdmXp.c index bb55c297..3cd65d5c 100644 --- a/cde/programs/dtpdm/PdmXp.c +++ b/cde/programs/dtpdm/PdmXp.c @@ -50,7 +50,9 @@ typedef enum { */ static const char* PdmXpGetQualifier(PdmXp* me); static char* PdmXpBuildResourceName(PdmXp* me, PdmOid id_att); +#if 0 && defined(PRINTING_SUPPORTED) static XrmDatabase PdmXpLoadPool(PdmXp* me, XPAttributes type); +#endif /* PRINTING_SUPPORTED */ /* @@ -129,6 +131,7 @@ PdmXpOpen(PdmXp* me, /* * check to see if the display is a print server */ +#if 0 && defined(PRINTING_SUPPORTED) if(XpQueryExtension(me->display, &event_base, &error_base)) { /* @@ -142,9 +145,12 @@ PdmXpOpen(PdmXp* me, } else { +#endif /* PRINTING_SUPPORTED */ XCloseDisplay(me->display); me->display = (Display*)NULL; +#if 0 && defined(PRINTING_SUPPORTED) } +#endif /* PRINTING_SUPPORTED */ } return me->display; @@ -180,7 +186,9 @@ PdmXpClose(PdmXp* me) } XCloseDisplay(me->display); me->display = NULL; +#if 0 && defined(PRINTING_SUPPORTED) me->context = (XPContext)NULL; +#endif /* PRINTING_SUPPORTED */ } } @@ -197,6 +205,7 @@ PdmXpClose(PdmXp* me) * * */ +#if 0 && defined(PRINTING_SUPPORTED) static XrmDatabase PdmXpLoadPool(PdmXp* me, XPAttributes type) { @@ -248,6 +257,7 @@ PdmXpLoadPool(PdmXp* me, XPAttributes type) return me->pool[i]; } +#endif /* PRINTING_SUPPORTED */ /* * ------------------------------------------------------------------------ @@ -266,6 +276,7 @@ PdmXpGetQualifier(PdmXp* me) { if(me->qualifier == (char*)NULL) { +#if 0 && defined(PRINTING_SUPPORTED) if(PdmXpLoadPool(me, XPPrinterAttr) != (XrmDatabase)NULL) { char* str_type; @@ -278,6 +289,7 @@ PdmXpGetQualifier(PdmXp* me) me->qualifier_len = strlen(me->qualifier); } } +#endif /* PRINTING_SUPPORTED */ } return me->qualifier; } @@ -341,6 +353,7 @@ PdmXpBuildResourceName(PdmXp* me, PdmOid id_att) * pdmoid_none if the attribute value is not found. * */ +#if 0 && defined(PRINTING_SUPPORTED) PdmOid PdmXpGetValue(PdmXp* me, XPAttributes type, @@ -352,6 +365,7 @@ PdmXpGetValue(PdmXp* me, return PdmOidFromString(value); } +#endif /* PRINTING_SUPPORTED */ /* * ------------------------------------------------------------------------ @@ -367,6 +381,7 @@ PdmXpGetValue(PdmXp* me, * representation type is not a string. * */ +#if 0 && defined(PRINTING_SUPPORTED) const char* PdmXpGetStringValue(PdmXp* me, XPAttributes type, @@ -395,6 +410,7 @@ PdmXpGetStringValue(PdmXp* me, else return (const char*)NULL; } +#endif /* PRINTING_SUPPORTED */ /* * ------------------------------------------------------------------------ @@ -409,6 +425,7 @@ PdmXpGetStringValue(PdmXp* me, * * */ +#if 0 && defined(PRINTING_SUPPORTED) void PdmXpSetValue(PdmXp* me, XPAttributes type, @@ -417,6 +434,7 @@ PdmXpSetValue(PdmXp* me, { PdmXpSetStringValue(me, type, id_att, PdmOidString(id_val)); } +#endif /* PRINTING_SUPPORTED */ /* * ------------------------------------------------------------------------ @@ -431,6 +449,7 @@ PdmXpSetValue(PdmXp* me, * * */ +#if 0 && defined(PRINTING_SUPPORTED) void PdmXpSetStringValue(PdmXp* me, XPAttributes type, @@ -449,6 +468,8 @@ PdmXpSetStringValue(PdmXp* me, XrmPutStringResource(&pool, res_name, (char*)str_val); XtFree(res_name); } +#endif /* PRINTING_SUPPORTED */ + /* * ------------------------------------------------------------------------ @@ -466,6 +487,7 @@ PdmXpSetStringValue(PdmXp* me, void PdmXpUpdateAttributes(PdmXp* me) { +#if 0 && defined(PRINTING_SUPPORTED) char fname[L_tmpnam]; if(tmpnam(fname)) @@ -541,4 +563,5 @@ PdmXpUpdateAttributes(PdmXp* me) } XtFree(data); } +#endif /* PRINTING_SUPPORTED */ } diff --git a/cde/programs/dtpdm/PdmXp.h b/cde/programs/dtpdm/PdmXp.h index a30e7245..0664aba5 100644 --- a/cde/programs/dtpdm/PdmXp.h +++ b/cde/programs/dtpdm/PdmXp.h @@ -36,7 +36,9 @@ #ifndef _PdmXp_h #define _PdmXp_h +#if 0 && defined(PRINTING_SUPPORTED) #include +#endif /* PRINTING_SUPPORTED */ #include "PdmOid.h" @@ -51,7 +53,9 @@ typedef struct _PdmXp * print server connection info */ Display* display; +#if 0 && defined(PRINTING_SUPPORTED) XPContext context; +#endif /* PRINTING_SUPPORTED */ /* * printing attribute pools */ @@ -73,6 +77,7 @@ extern Display* PdmXpOpen(PdmXp* me, char* context_str); extern void PdmXpClose(PdmXp* me); extern void PdmXpDelete(PdmXp* me); +#if 0 && defined(PRINTING_SUPPORTED) extern PdmOid PdmXpGetValue(PdmXp* me, XPAttributes type, PdmOid id_att); @@ -87,6 +92,7 @@ extern void PdmXpSetStringValue(PdmXp* me, XPAttributes type, PdmOid id_att, const char* str_val); +#endif /* PRINTING_SUPPORTED */ extern void PdmXpUpdateAttributes(PdmXp* me); diff --git a/cde/programs/dtpdm/PrinterBox.c b/cde/programs/dtpdm/PrinterBox.c index 19921810..6c418c09 100644 --- a/cde/programs/dtpdm/PrinterBox.c +++ b/cde/programs/dtpdm/PrinterBox.c @@ -530,7 +530,8 @@ PdmPrinterBoxGetAttr(PdmSetupBox* me, PdmXp* pdm_xp) PdmPrinterBoxData* data = (PdmPrinterBoxData*)me->subclass_data; const char* strval; PdmOidMediumSS* medium_ss_supported; - PdmOidTrayMediumList* input_trays_medium; + PdmOidTrayMediumList* input_trays_medium = NULL; +#if 0 && defined(PRINTING_SUPPORTED) /* * printer model description */ @@ -542,19 +543,23 @@ PdmPrinterBoxGetAttr(PdmSetupBox* me, PdmXp* pdm_xp) strval = PdmXpGetStringValue(pdm_xp, XPDocAttr, pdmoid_att_document_format); data->document_format = PdmOidDocumentFormatParse(strval); +#endif /* PRINTING_SUPPORTED */ if((char*)NULL == data->document_format) { /* * document format not specified, try to obtain * document-formats-supported, and obtain up the default from it */ +#if 0 && defined(PRINTING_SUPPORTED) strval = PdmXpGetStringValue(pdm_xp, XPPrinterAttr, pdmoid_att_document_formats_supported); data->document_format = PdmOidDocumentFormatDefault(strval); +#endif /* PRINTING_SUPPORTED */ } /* * document attributes supported */ +#if 0 && defined(PRINTING_SUPPORTED) strval = PdmXpGetStringValue(pdm_xp, XPPrinterAttr, pdmoid_att_document_attributes_supported); data->document_attrs_supported = PdmOidListNew(strval); @@ -612,6 +617,7 @@ PdmPrinterBoxGetAttr(PdmSetupBox* me, PdmXp* pdm_xp) */ PdmOidMediumSSDelete(medium_ss_supported); PdmOidTrayMediumListDelete(input_trays_medium); +#endif /* PRINTING_SUPPORTED */ } /* @@ -630,6 +636,7 @@ PdmPrinterBoxGetAttr(PdmSetupBox* me, PdmXp* pdm_xp) static void PdmPrinterBoxSetAttr(PdmSetupBox* me, PdmXp* pdm_xp) { +#if 0 && defined(PRINTING_SUPPORTED) PdmPrinterBoxData* data = (PdmPrinterBoxData*)me->subclass_data; /* * orientation @@ -651,6 +658,7 @@ PdmPrinterBoxSetAttr(PdmSetupBox* me, PdmXp* pdm_xp) */ PdmXpSetValue(pdm_xp, XPDocAttr, pdmoid_att_default_input_tray, TrayCtlGetTray(data->tray_ctl)); +#endif /* PRINTING_SUPPORTED */ } /* diff --git a/cde/programs/dtpdmd/Imakefile b/cde/programs/dtpdmd/Imakefile index 84344d5b..8dc7eb5f 100644 --- a/cde/programs/dtpdmd/Imakefile +++ b/cde/programs/dtpdmd/Imakefile @@ -24,8 +24,8 @@ XCOMM DEFINES = -DCDE_INSTALLATION_TOP='"'$(CDE_INSTALLATION_TOP)'"' INCLUDES = -I. - DEPLIBS = $(DEPXTOOLLIB) $(DEPXPLIB) $(DEPXAUTHLIB) $(DEPXLIB) -LOCAL_LIBRARIES = $(XTOOLLIB) $(XPLIB) $(XAUTHLIB) $(XLIB) + DEPLIBS = $(DEPXTOOLLIB) $(DEPXAUTHLIB) $(DEPXLIB) +LOCAL_LIBRARIES = $(XTOOLLIB) $(XAUTHLIB) $(XLIB) SYS_LIBRARIES = DtClientSysLibs SRCS = dispatch.c dtpdmd.c mailbox.c \ diff --git a/cde/programs/dtpdmd/dtpdmdP.h b/cde/programs/dtpdmd/dtpdmdP.h index 608e3db3..410061cf 100644 --- a/cde/programs/dtpdmd/dtpdmdP.h +++ b/cde/programs/dtpdmd/dtpdmdP.h @@ -44,7 +44,9 @@ #include "X11/Xlibint.h" #include "X11/Intrinsic.h" #include "X11/Xatom.h" +#if 0 && defined(PRINTING_SUPPORTED) #include +#endif /* PRINTING_SUPPORTED */ #include @@ -72,7 +74,9 @@ typedef struct char *print_display_str; /* Print Server Connection Info */ Window print_window; +#if 0 && defined(PRINTING_SUPPORTED) XPContext print_context; +#endif /* PRINTING_SUPPORTED */ char *locale_hint; Display *selection_display; /* Selection & Property Connection */ diff --git a/cde/programs/dtpdmd/manager.c b/cde/programs/dtpdmd/manager.c index 1893f5d1..ae0fbd9e 100644 --- a/cde/programs/dtpdmd/manager.c +++ b/cde/programs/dtpdmd/manager.c @@ -246,7 +246,9 @@ void mgr_initialize( XEvent *report, XpPdmServiceRec *rec ) rec->video_window = strtol(list[1], (char **)NULL, 16); rec->print_display_str = xpstrdup( list[2] ); rec->print_window = strtol(list[3], (char **)NULL, 16); +#if 0 && defined(PRINTING_SUPPORTED) rec->print_context = strtol(list[4], (char **)NULL, 16); +#endif /* PRINTING_SUPPORTED */ rec->locale_hint = xpstrdup( list[5] ); XFreeStringList( list ); @@ -533,6 +535,7 @@ void mgr_fetch_pdm( XpPdmServiceRec *rec ) if ( setjmp( xio_quickie_jmp_buf ) == 0 ) { XSetIOErrorHandler( xio_quickie_handler ); +#if 0 && defined(PRINTING_SUPPORTED) if ( rec->seldpy_as_printdpy ) { tptr1 = XpGetOneAttribute( rec->selection_display, rec->print_context, @@ -547,6 +550,7 @@ void mgr_fetch_pdm( XpPdmServiceRec *rec ) XCloseDisplay( tdpy ); } } +#endif /* PRINTING_SUPPORTED */ XSetIOErrorHandler( NULL ); } @@ -627,9 +631,11 @@ void mgr_fetch_pdm( XpPdmServiceRec *rec ) sprintf( tstr, "0x%lx", rec->print_window ); xp_add_argv( &(rec->pdm_exec_argvs), xpstrdup(tstr) ); +#if 0 && defined(PRINTING_SUPPORTED) xp_add_argv( &(rec->pdm_exec_argvs), xpstrdup("-pcontext") ); sprintf( tstr, "0x%lx", rec->print_context ); xp_add_argv( &(rec->pdm_exec_argvs), xpstrdup(tstr) ); +#endif /* PRINTING_SUPPORTED */ } /******************************************************************** diff --git a/cde/programs/dtprintinfo/Imakefile b/cde/programs/dtprintinfo/Imakefile index 749f0a23..56d3ef1d 100644 --- a/cde/programs/dtprintinfo/Imakefile +++ b/cde/programs/dtprintinfo/Imakefile @@ -29,18 +29,18 @@ INCLUDES = -I. -I./UI -I./libUI -I./util -I./libUI/MotifUI \ DEPLIBS = ./libUI/MotifUI/libMotifUI.a ./util/libUtil.a \ ./UI/libDtPrintinfo.a ./objects/PrintObj/libPrintObj.a \ $(DEPDTHELPLIB) $(DEPDTWIDGETLIB) $(DEPDTSVCLIB) $(DEPTTLIB) \ - $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXPLIB) $(DEPXLIB) + $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB) #ifdef SunArchitecture LOCAL_LIBRARIES = ./UI/libDtPrintinfo.a ./util/libUtil.a \ ./libUI/MotifUI/libMotifUI.a ./objects/PrintObj/libPrintObj.a \ $(DTWIDGETLIB) $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) \ - $(XPLIB) $(XLIB) + $(XLIB) #else LOCAL_LIBRARIES = ./UI/libDtPrintinfo.a ./util/libUtil.a \ ./libUI/MotifUI/libMotifUI.a ./objects/PrintObj/libPrintObj.a \ $(DTHELPLIB) $(DTWIDGETLIB) $(DTSVCLIB) $(TTLIB) $(XMLIB) \ - $(XTOOLLIB) $(XPLIB) $(XLIB) + $(XTOOLLIB) $(XLIB) #endif /* SunArchitecture */ SYS_LIBRARIES = DtClientSysLibs DtClientExtraLibs diff --git a/cde/programs/dtscreen/Imakefile b/cde/programs/dtscreen/Imakefile index 33800065..f4ac14c9 100644 --- a/cde/programs/dtscreen/Imakefile +++ b/cde/programs/dtscreen/Imakefile @@ -2,8 +2,8 @@ XCOMM $XConsortium: Imakefile /main/10 1996/10/09 14:06:18 drk $ INCLUDES = -I. - DEPLIBS = $(DEPDTSVCLIB) $(DEPTTLIB) $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXPLIB) $(DEPXLIB) -LOCAL_LIBRARIES = $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) + DEPLIBS = $(DEPDTSVCLIB) $(DEPTTLIB) $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB) +LOCAL_LIBRARIES = $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XLIB) SYS_LIBRARIES = -lm $(DYNLIBSYSLIB) $(REGEXSYSLIB) diff --git a/cde/programs/dtsession/Imakefile b/cde/programs/dtsession/Imakefile index a7fb034a..4718e9da 100644 --- a/cde/programs/dtsession/Imakefile +++ b/cde/programs/dtsession/Imakefile @@ -74,12 +74,12 @@ SYS_LIBRARIES = -lelf -lm -ldl -lgen #if defined(LinuxArchitecture) EXTRA_DEFINES = -D${PROGRAMS} $(XINOPT) -DUSE_X11SSEXT -SYS_LIBRARIES = $(XPLIB) $(XINLIB) -lXss -ldl -lcrypt -lm +SYS_LIBRARIES = $(XINLIB) -lXss -ldl -lcrypt -lm #endif #if defined(FreeBSDArchitecture) || defined(NetBSDArchitecture) EXTRA_DEFINES = -D${PROGRAMS} $(XINOPT) -DUSE_X11SSEXT -SYS_LIBRARIES = $(XPLIB) $(XINLIB) -lXss -lcrypt -lm +SYS_LIBRARIES = $(XINLIB) -lXss -lcrypt -lm #endif PROGRAMS=dtsession diff --git a/cde/programs/dtterm/Imakefile b/cde/programs/dtterm/Imakefile index af4afe06..4c5f45a0 100644 --- a/cde/programs/dtterm/Imakefile +++ b/cde/programs/dtterm/Imakefile @@ -44,9 +44,9 @@ UTILLIB = -lutil * paths to the library. */ DEPLIBS = $(DEPDTTERMLIB) $(DEPARCHLIBS) $(DEPXINPUTLIB) $(DEPHELPLIB) \ - $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXPLIB) $(DEPXLIB) $(DEPUTILLIB) + $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB) $(DEPUTILLIB) LOCAL_LIBRARIES = $(DTTERMLIB) $(USE_XHPLIB) $(XINPUTLIB) $(HELPLIB) \ - $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(UTILLIB) + $(XMLIB) $(XTOOLLIB) $(XLIB) $(UTILLIB) SYS_LIBRARIES = DtClientSysLibs INCLUDES = -I. -I$(DTTERMSRC)/TermPrim -I$(DTTERMSRC)/Term -I$(DTTERMSRC)/TermView diff --git a/cde/programs/dtudcexch/Imakefile b/cde/programs/dtudcexch/Imakefile index 6afcac0b..0443cf6a 100644 --- a/cde/programs/dtudcexch/Imakefile +++ b/cde/programs/dtudcexch/Imakefile @@ -31,11 +31,11 @@ UDC_INC_PATH7 = -I$(FONTEDT_PATH1)/dtgpftobdf DEFINES = $(OPT2) DEPLIBS = $(DEPDTSVCLIB) $(DEPTTLIB) $(DEPXMLIB) $(DEPXTOOLLIB) \ - $(DEPXPLIB) $(DEPXLIB) \ + $(DEPXLIB) \ $(FONTEDT_PATH1)/libfuty/liboakfuty.a \ $(FONTEDT_PATH1)/libfal/libfal.a -LOCAL_LIBRARIES = $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) \ +LOCAL_LIBRARIES = $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XLIB) \ $(FONTEDT_PATH1)/libfuty/liboakfuty.a \ $(FONTEDT_PATH1)/libfal/libfal.a diff --git a/cde/programs/dtudcfonted/Imakefile b/cde/programs/dtudcfonted/Imakefile index 6d3c5cac..36befed1 100644 --- a/cde/programs/dtudcfonted/Imakefile +++ b/cde/programs/dtudcfonted/Imakefile @@ -29,8 +29,8 @@ DEFINES = $(OPT2) $(UDC_INC_PATH5)\ $(UDC_INC_PATH6) - DEPLIBS = $(DEPDTSVCLIB) $(DEPTTLIB) $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXPLIB) $(DEPXLIB) -LOCAL_LIBRARIES = $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) ./libfuty/liboakfuty.a ./libfal/libfal.a + DEPLIBS = $(DEPDTSVCLIB) $(DEPTTLIB) $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB) +LOCAL_LIBRARIES = $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XLIB) ./libfuty/liboakfuty.a ./libfal/libfal.a SRCS = comsub.c cpyw.c mtfgui.c ufont.c util.c\ diff --git a/cde/programs/util/dttypes/Imakefile b/cde/programs/util/dttypes/Imakefile index 166fac6b..de6a33dd 100644 --- a/cde/programs/util/dttypes/Imakefile +++ b/cde/programs/util/dttypes/Imakefile @@ -2,8 +2,8 @@ XCOMM $XConsortium: Imakefile /main/8 1996/10/09 14:11:13 drk $ INCLUDES = -I. -DEPLIBS = $(DEPDTSVCLIB) $(DEPTTLIB) $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXPLIB) $(DEPXLIB) -LOCAL_LIBRARIES = $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) +DEPLIBS = $(DEPDTSVCLIB) $(DEPTTLIB) $(DEPXMLIB) $(DEPXTOOLLIB) $(DEPXLIB) +LOCAL_LIBRARIES = $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XLIB) SYS_LIBRARIES = -lm -- 2.25.1