nsgml: Resolve symbol collision when building with SunStudio 12.1

[oweals/cde.git] / cde / programs / dtfile / Imakefile

diff --git a/cde/programs/dtfile/Imakefile b/cde/programs/dtfile/Imakefile
index 0d0febc2f2f3b4191a6258a1d139f97d3a2981a7..bfb3fc6847cde7388aa3a1980fd8f6d7ce4591df 100644 (file)
--- a/cde/programs/dtfile/Imakefile
+++ b/cde/programs/dtfile/Imakefile
@@ -8,31 +8,43 @@ MakeSubdirs($(SUBDIRS))
 ForceSubdirs($(SUBDIRS))
 DependSubdirs($(SUBDIRS))
 
+#if CDE_USEXINERAMA
+XINOPT = -DUSE_XINERAMA
+XINLIB = -lDtXinerama -lXinerama
+#endif
 
-DEFINES = -DMULTIBYTE -DXK_MISCELLANY -DSHAPE -D_ILS_MACROS -DSUN_PERF \
+DEPEND_DEFINES = $(DEPENDDEFINES)
+DEFINES = -DMULTIBYTE -DSHAPE -D_ILS_MACROS -DSUN_PERF \
        -DCDE_INSTALLATION_TOP=\"$(CDE_INSTALLATION_TOP)\" \
-       -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\"
+       -DCDE_CONFIGURATION_TOP=\"$(CDE_CONFIGURATION_TOP)\" \
+       -DKORNSHELL=\"$(KORNSHELL)\" $(XINOPT)
 
-INCLUDES = -I./dtcopy
+INCLUDES = -I./dtcopy $(TIRPCINC)
 
 DEPLIBS = DepDtClientLibs
-LOCAL_LIBRARIES = DtClientLibs
+LOCAL_LIBRARIES = DtClientLibs $(XINLIB)
 SYS_LIBRARIES = DtClientSysLibs DtClientExtraLibs
 
 #ifdef AlphaArchitecture
 EXTRA_DEFINES = -D_TOOLTALK
 #endif
 
+#ifdef OpenBSDArchitecture
+EXTRA_DEFINES = -DFILE_MAP_OPTIMIZE
+#endif
+
 #if defined (SunArchitecture)
 EXTRA_CCOPTIONS = -xF
 #endif
 
 #if defined(LinuxArchitecture)
 EXTRA_INCLUDES = -I/usr/include/freetype2
+EXTRA_DEFINES = -DFILE_MAP_OPTIMIZE
 #endif
 
-#if defined(OpenBSDArchitecture) || defined(FreeBSDArchitecture)
+#if defined(BSDArchitecture)
 EXTRA_INCLUDES = -I$(XPROJECTROOT)/include/freetype2
+EXTRA_DEFINES = -DFILE_MAP_OPTIMIZE
 #endif
 
 SRCS =  ChangeDir.c     ChangeDirP.c    Command.c       Common.c \