diff --git a/cde/config/cf/lnxLib.tmpl b/cde/config/cf/lnxLib.tmpl index e44d87d80..1e4a24162 100644 --- a/cde/config/cf/lnxLib.tmpl +++ b/cde/config/cf/lnxLib.tmpl @@ -42,3 +42,6 @@ XMULIB = -lXmu $(XLIB) # define SharedCsaReqs -lXt #endif +#ifndef SharedDtHelpReqs +# define SharedDtHelpReqs -ljpeg +#endif diff --git a/cde/lib/DtHelp/Imakefile b/cde/lib/DtHelp/Imakefile index 3af280f55..3c2bcfe0a 100644 --- a/cde/lib/DtHelp/Imakefile +++ b/cde/lib/DtHelp/Imakefile @@ -13,8 +13,14 @@ XCOMM $XConsortium: Imakefile /main/25 1996/11/22 11:17:34 drk $ #define IHaveSubdirs #define PassCDebugFlags /**/ +#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || defined(OpenBSDArchitecture) SUBDIRS = il DONES = il/DONE +#else +SUBDIRS = il jpeg +DONES = il/DONE jpeg/DONE +#endif + EXTRALIBRARYDEPS = $(DONES) MakeSubdirs($(SUBDIRS)) @@ -149,7 +155,11 @@ JPEG_OBJS = \ jpeg/jdinput.o jpeg/jerror.o jpeg/jutils.o SRCS = $(SRCS1) $(SRCS2) $(CVSRCS) $(LCXSRCS) +#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || defined(OpenBSDArchitecture) OBJS = $(OBJS1) $(OBJS2) $(CVOBJS) $(LCXOBJS) $(IL_OBJS) +#else +OBJS = $(OBJS1) $(OBJS2) $(CVOBJS) $(LCXOBJS) $(IL_OBJS) $(JPEG_OBJS) +#endif #include