projects
/
oweals
/
cde.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 4f66b89583c5b685eb893f4b4581f5152af68b73..bfb3fc6847cde7388aa3a1980fd8f6d7ce4591df 100644
(file)
--- a/
cde/programs/dtfile/Imakefile
+++ b/
cde/programs/dtfile/Imakefile
@@
-8,27
+8,43
@@
MakeSubdirs($(SUBDIRS))
ForceSubdirs($(SUBDIRS))
DependSubdirs($(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_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
DEPLIBS = DepDtClientLibs
-LOCAL_LIBRARIES = DtClientLibs
+LOCAL_LIBRARIES = DtClientLibs
$(XINLIB)
SYS_LIBRARIES = DtClientSysLibs DtClientExtraLibs
#ifdef AlphaArchitecture
EXTRA_DEFINES = -D_TOOLTALK
#endif
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
#if defined (SunArchitecture)
EXTRA_CCOPTIONS = -xF
#endif
#if defined(LinuxArchitecture)
EXTRA_INCLUDES = -I/usr/include/freetype2
+EXTRA_DEFINES = -DFILE_MAP_OPTIMIZE
+#endif
+
+#if defined(BSDArchitecture)
+EXTRA_INCLUDES = -I$(XPROJECTROOT)/include/freetype2
+EXTRA_DEFINES = -DFILE_MAP_OPTIMIZE
#endif
SRCS = ChangeDir.c ChangeDirP.c Command.c Common.c \
#endif
SRCS = ChangeDir.c ChangeDirP.c Command.c Common.c \