Merge branch 'master' into cde-next

[oweals/cde.git] / cde / lib / DtHelp / Imakefile

diff --git a/cde/lib/DtHelp/Imakefile b/cde/lib/DtHelp/Imakefile
index a15cb8cb344fc0aa7b9b53370a10362633c157b7..f30ca5b23110ecdb6821f58e8cf799ed46ca016f 100644 (file)
--- a/cde/lib/DtHelp/Imakefile
+++ b/cde/lib/DtHelp/Imakefile
@@ -13,8 +13,15 @@ XCOMM $XConsortium: Imakefile /main/25 1996/11/22 11:17:34 drk $
 #define IHaveSubdirs
 #define PassCDebugFlags        /**/
 
+#if defined(LinuxArchitecture) || defined(BSDArchitecture) || \
+    defined(SunArchitecture)
+SUBDIRS = il
+DONES = il/DONE
+#else
 SUBDIRS = il jpeg
 DONES = il/DONE jpeg/DONE
+#endif
+
 EXTRALIBRARYDEPS = $(DONES)
 
 MakeSubdirs($(SUBDIRS))
@@ -28,7 +35,8 @@ BIT_ORDER_DEFINES = -DLSB_BIT_ORDER
 #endif
 
 INCLUDES = -I. -I./il -I./jpeg
-DEFINES = -DDTLIB -DXK_MISCELLANY $(LOCAL_DEFINES) \
+DEPEND_DEFINES = $(DEPENDDEFINES)
+DEFINES = -DDTLIB $(LOCAL_DEFINES) \
          -DCDE_INSTALLATION_TOP='"$(CDE_INSTALLATION_TOP)"' \
          -DCDE_CONFIGURATION_TOP='"$(CDE_CONFIGURATION_TOP)"' \
          -DCDE_USER_TOP='"$(CDE_USER_TOP)"' \
@@ -70,7 +78,7 @@ SRCS1 = \
         HyperText.c     JpegUtils.c     Messages.c \
         PathArea.c      Print.c         Resize.c \
         SetList.c       VolSelect.c     XInterface.c \
-        XUICreate.c     XbmUtils.c      version.c
+        XUICreate.c     XbmUtils.c
 
 OBJS1 = \
         Actions.o       AsciiSpc.o      Callbacks.o \
@@ -83,7 +91,7 @@ OBJS1 = \
         HyperText.o     JpegUtils.o     Messages.o \
         PathArea.o      Print.o         Resize.o \
         SetList.o       VolSelect.o     XInterface.o \
-        XUICreate.o     XbmUtils.o      version.o
+        XUICreate.o     XbmUtils.o
 
 SRCS2 = \
         Access.c        AccessCCDF.c    AccessSDL.c \
@@ -146,7 +154,12 @@ JPEG_OBJS = \
         jpeg/jdinput.o      jpeg/jerror.o       jpeg/jutils.o
 
 SRCS = $(SRCS1) $(SRCS2) $(CVSRCS) $(LCXSRCS)
+#if defined(LinuxArchitecture) || defined(BSDArchitecture) || \
+    defined(SunArchitecture)
+OBJS = $(OBJS1) $(OBJS2) $(CVOBJS) $(LCXOBJS) $(IL_OBJS)
+#else
 OBJS = $(OBJS1) $(OBJS2) $(CVOBJS) $(LCXOBJS) $(IL_OBJS) $(JPEG_OBJS)
+#endif
 
 #include <Library.tmpl>
 
@@ -162,7 +175,7 @@ SpecialLibObjectRule(Canvas.o,,+O1)
 #endif
 
 
-LCX_FILES = AIX.lcx CDE.lcx HP-UX.lcx SunOS.lcx
+LCX_FILES = AIX.lcx CDE.lcx HP-UX.lcx SunOS.lcx Linux.lcx
 LCX_DEST = misc/dtlcx
 InstallMultiple($(LCX_FILES),$(LCX_DEST))