X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=cde%2Fprograms%2Fdtfile%2FImakefile;h=bfb3fc6847cde7388aa3a1980fd8f6d7ce4591df;hb=671530082004aa880b3a0bfb7108bc30c6d97fab;hp=19a5063b498ea1c1c5987cda8137f88cde830647;hpb=0e302b6bbabc3469da5d9b990a91ea2f2d978718;p=oweals%2Fcde.git

diff --git a/cde/programs/dtfile/Imakefile b/cde/programs/dtfile/Imakefile
index 19a5063b..bfb3fc68 100644
--- a/cde/programs/dtfile/Imakefile
+++ b/cde/programs/dtfile/Imakefile
@@ -8,30 +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
 
-XCOMM On Linux once you link against a C++ library the whole program
-XCOMM has to be linked with the C++ linker
-#if defined(LinuxDistribution)
-CCLINK = $(CXX)
-EXTRA_DEFINES = -I/usr/include/freetype2
+#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 \