dtmail: resolve 'deference before null check' errors related to if(!NULL) checks...

[oweals/cde.git] / cde / programs / dtmail / dtmailpr / Imakefile

diff --git a/cde/programs/dtmail/dtmailpr/Imakefile b/cde/programs/dtmail/dtmailpr/Imakefile
index 064ed1b76c6f324f9dc5ed97ebf4540fcdfb9a16..929d49fe89d56059bb4f0402b5a973169bb61b7d 100644 (file)
--- a/cde/programs/dtmail/dtmailpr/Imakefile
+++ b/cde/programs/dtmail/dtmailpr/Imakefile
@@ -1,10 +1,11 @@
 XCOMM $TOG: Imakefile /main/15 1998/08/05 13:24:40 mgreess $
 
 #define CplusplusSource        YES
-DEPEND_DEFINES = $(CXXDEPENDINCLUDES)
+DEPEND_DEFINES = $(CXXDEPENDINCLUDES) $(DEPENDDEFINES)
 EXTRA_LOAD_FLAGS = ExtraLoadFlags $(UNSHARED_CXXLIB)
 
-INCLUDES = -I. -I../include -I../../dtcompat -I../../../. -I$(CDELIBSRC)
+INCLUDES = -I. -I../include -I../../dtcompat -I../../../. \
+          -I$(CDELIBSRC) $(STD_INCLUDES)
 
 #ifndef DtMailDefines
 # define DtMailDefines
@@ -35,15 +36,11 @@ EXTRA_CCOPTIONS     +=      -DSPRO_V2
 # endif  /* USE_SPRO_V3 */
 
 EXTRA_C++OPTIONS =     +p +w $(SPRO_V3_OPTIONS)
-MT_LIBS                =       -i $(C++_LIB)  -lm -lw -lc
+MT_LIBS                =       $(C++_LIB)  -lm -lw -lc
 
-SYS_LIBRARIES  =       -lintl -lnsl $(MT_LIBS) -lC
+SYS_LIBRARIES  =       -lintl -lnsl $(MT_LIBS)
 #endif /* SunArchitecture */
 
-#if defined(LinuxDistribution)
-CXXEXTRA_DEFINES = -fpermissive
-#endif
- 
 SRCS = main.C message.C mailbox.C utils.C
 OBJS = main.o message.o mailbox.o utils.o