dtmail: Make it build. There is more work to be done here.

Specifically, we should be able to have libDtMail subdir build all of
it's objects directly w/o intervening Makefile.am's and archive .a
libs.

diff --git a/cde/programs/dtmail/dtmail/DmxMessage.C b/cde/programs/dtmail/dtmail/DmxMessage.C
index 252022bc19b39a58cdd0ff6f4dfa530e91ae4f8d..0f6d0f8619db26d04ef44f97dfae0f17c11df0e4 100644 (file)
--- a/cde/programs/dtmail/dtmail/DmxMessage.C
+++ b/cde/programs/dtmail/dtmail/DmxMessage.C
@@ -72,7 +72,7 @@
 
 #include "Dmx.h"
 // For CHARSET
-#include <LocaleXlate.h>
+#include <Dt/LocaleXlate.h>
 #include <locale.h>
 #include <strings.h>
 

diff --git a/cde/programs/dtmail/dtmail/Makefile.am b/cde/programs/dtmail/dtmail/Makefile.am
index da2e137199dc0d9e4829079a851dc083227a6c9d..3128f6bad680d0530ad901bbc6a6f7fd88a542b7 100644 (file)
--- a/cde/programs/dtmail/dtmail/Makefile.am
+++ b/cde/programs/dtmail/dtmail/Makefile.am
@@ -7,7 +7,8 @@ dtmail_CXXFLAGS = -I../include -I../include/MotifApp -I../include/utils \
                  $(TIRPCINC) -I$(srcdir)/lib -I../../dthelp -DRELEASE_NOTES \
                  -DDTMAIL_TOOLTALK -DDTEDITOR
 
-dtmail_LDADD = ../libDtMail/libDtMail.a ../MotifApp/libMotifApp.a
+dtmail_LDADD = ../libDtMail/libDtMail.a ../MotifApp/libMotifApp.a -lXm \
+               @DTCLIENTLIBS@ $(XTOOLLIB) $(TIRPCLIB)
 
 # FIXME solaris....
 #if SOLARIS

diff --git a/cde/programs/dtmail/dtmailpr/Makefile.am b/cde/programs/dtmail/dtmailpr/Makefile.am
index 46b20a2d5ed3a514d30a1d669e240be1d381f1d8..090dae2f6454a4b16e2a9fe7bb806f10faa112ec 100644 (file)
--- a/cde/programs/dtmail/dtmailpr/Makefile.am
+++ b/cde/programs/dtmail/dtmailpr/Makefile.am
@@ -5,8 +5,8 @@ bin_PROGRAMS = dtmailpr
 dtmailpr_CXXFLAGS = -I../include -I../../dtcompat -I../../../. \
                    -I$(srcdir)/lib $(TIRPCINC)
 
-dtmailpr_LDADD = ../libDtMail/libDtMail.a $(LIBPRINT) $(LIBHELP) $(LIBWIDGET) \
-                $(LIBSVC) $(LIBTT) -lXm $(XTOOLLIB) ${X_LIBS}
+dtmailpr_LDADD = ../libDtMail/libDtMail.a @DTCLIENTLIBS@ \
+                -lXm @LIBXIN@ -lXinerama $(XTOOLLIB) ${X_LIBS} $(TIRPCLIB)
 
 if FREEBSD
 dtmailpr_LDADD += -liconv

diff --git a/cde/programs/dtmail/dtmailpr/message.C b/cde/programs/dtmail/dtmailpr/message.C
index 059f6b10f908a60aa2ebf2e872d029d3df7a65d8..3fd9454927a0f4ffa05515309c5d160abd4e21e7 100644 (file)
--- a/cde/programs/dtmail/dtmailpr/message.C
+++ b/cde/programs/dtmail/dtmailpr/message.C
@@ -49,7 +49,7 @@
 
 #include "dmx.hh"
 // For CHARSET
-#include <DtHelp/LocaleXlate.h>
+#include <Dt/LocaleXlate.h>
 #include <locale.h>
 #include <strings.h>
 #include "utils/str_utils.h"

diff --git a/cde/programs/dtmail/libDtMail/Common/Makefile.am b/cde/programs/dtmail/libDtMail/Common/Makefile.am
index a78a3a29c3186af024a0e4cdb47b2e8bd9ad8c1e..15270519a7eecb372beafad0a422caf2602dd29f 100644 (file)
--- a/cde/programs/dtmail/libDtMail/Common/Makefile.am
+++ b/cde/programs/dtmail/libDtMail/Common/Makefile.am
@@ -3,14 +3,10 @@ MAINTAINERCLEANFILES = Makefile.in
 noinst_LIBRARIES = libCommon.a
 
 libCommon_a_CXXFLAGS = -I../../include -I../../include/utils -I$(srcdir)/lib \
-                      $(TIRPCINC) -DDL_NOT_DYNAMIC
+                      $(TIRPCINC) -DDL_NOT_DYNAMIC -DUSE_SOCKSTREAM
 
 if SOLARIS
 libCommon_a_CXXFLAGS += -DMMAP_NORESERVE -DSPRO_V2
-# FIXME - i386 is NOT big endian...
-#if I386
-#libCommon_a_CXXFLAGS += -DBIG_ENDIAN
-#endif
 endif
 
 libCommon_a_SOURCES = APOPServer.C \
@@ -35,7 +31,7 @@ libCommon_a_SOURCES = APOPServer.C \
                      IO.C \
                      LanguagePortability.C \
                      ObjectKey.C \
-                     NotDynamic.C
+                     NotDynamic.C \
                      POP2Server.C \
                      POP3Server.C \
                      Process.C \

diff --git a/cde/programs/dtmail/libDtMail/Common/Session.C b/cde/programs/dtmail/libDtMail/Common/Session.C
index f36916c50905f793fc4babb11ac76095765605e4..404fcc67c3eb709be95ba91ad109525b81c8f320 100644 (file)
--- a/cde/programs/dtmail/libDtMail/Common/Session.C
+++ b/cde/programs/dtmail/libDtMail/Common/Session.C
@@ -69,7 +69,7 @@
 //-------------------------------------
 #include <locale.h>
 #include <time.h>
-#include <DtHelp/LocaleXlate.h>
+#include <Dt/LocaleXlate.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <limits.h>

diff --git a/cde/programs/dtmail/libDtMail/Makefile.am b/cde/programs/dtmail/libDtMail/Makefile.am
index bfbb0e7e31dc1d9893908095aa485fa4f9aa1473..ed62c45f2d5fa3291e3929a777ad0d757ca5aa4b 100644 (file)
--- a/cde/programs/dtmail/libDtMail/Makefile.am
+++ b/cde/programs/dtmail/libDtMail/Makefile.am
@@ -6,4 +6,6 @@ noinst_LIBRARIES = libDtMail.a
 
 libDtMail_a_SOURCES =
 
-libDtMail_a_LIBADD = Common/libCommon.a RFC/libRFC.a
+# Unfortunately, this does not work -
+# libDtMail_a_LIBADD = Common/libCommon.a RFC/libRFC.a
+libDtMail_a_LIBADD = Common/*.o RFC/*.o

diff --git a/cde/programs/dtmail/libDtMail/RFC/MIMEBodyPart.C b/cde/programs/dtmail/libDtMail/RFC/MIMEBodyPart.C
index bcd888d086e5165648b234630ea9fc0c2ffb9849..7ec7058089587eb3525589931bf8930c66a95544 100644 (file)
--- a/cde/programs/dtmail/libDtMail/RFC/MIMEBodyPart.C
+++ b/cde/programs/dtmail/libDtMail/RFC/MIMEBodyPart.C
@@ -57,7 +57,7 @@
 
 // For CHARSET
 #include <locale.h>
-#include <DtHelp/LocaleXlate.h>
+#include <Dt/LocaleXlate.h>
 #include "str_utils.h"
 
 MIMEBodyPart::MIMEBodyPart(DtMailEnv & error,

diff --git a/cde/programs/dtmail/libDtMail/RFC/Makefile.am b/cde/programs/dtmail/libDtMail/RFC/Makefile.am
index 6322caa5d0734b4f26374e4d40ba04ac564299ff..8e185cf1cb66d63651bb9e809c34d3f82f0b9f6f 100644 (file)
--- a/cde/programs/dtmail/libDtMail/RFC/Makefile.am
+++ b/cde/programs/dtmail/libDtMail/RFC/Makefile.am
@@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in
 noinst_LIBRARIES = libRFC.a
 
 libRFC_a_CXXFLAGS = -I../Common -I../../include -I../../include/utils \
-                   -I$(srcdir)/lib $(TIRPCINC) -DTTLOCK_OFF
+                   $(TIRPCINC) -DTTLOCK_OFF
 
 if SOLARIS
 libRFC_a_CXXFLAGS += -DMMAP_NORESERVE -DSPRO_V2

diff --git a/cde/programs/dtmail/libDtMail/RFC/RFCBodyPart.C b/cde/programs/dtmail/libDtMail/RFC/RFCBodyPart.C
index ad180ee3d6a6f200a50acb56e9099c9f1d0bb61b..6fa98bdfc3a6e6b63c58fdabb8c6dbb258532e07 100644 (file)
--- a/cde/programs/dtmail/libDtMail/RFC/RFCBodyPart.C
+++ b/cde/programs/dtmail/libDtMail/RFC/RFCBodyPart.C
@@ -64,7 +64,7 @@
 //-------------------------------------
 #include <locale.h>
 #include <time.h>
-#include <DtHelp/LocaleXlate.h>
+#include <Dt/LocaleXlate.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <limits.h>

diff --git a/cde/programs/dtmail/libDtMail/RFC/V3BodyPart.C b/cde/programs/dtmail/libDtMail/RFC/V3BodyPart.C
index 940ed40241f792b57375b64c367f968f3bcb6ae4..e5a9e447da7d6a1a9f6b6d8b4b0140a93ca76b20 100644 (file)
--- a/cde/programs/dtmail/libDtMail/RFC/V3BodyPart.C
+++ b/cde/programs/dtmail/libDtMail/RFC/V3BodyPart.C
@@ -58,7 +58,7 @@
 
 // For CHARSET
 #include <locale.h>
-#include <DtHelp/LocaleXlate.h>
+#include <Dt/LocaleXlate.h>
 
 V3BodyPart::V3BodyPart(DtMailEnv & error,
                       DtMail::Message * parent,