From 77dfe92b3c69317c8aaa2bbf00bd7b45446c0dec Mon Sep 17 00:00:00 2001 From: Jon Trulson Date: Tue, 29 Oct 2019 18:30:19 -0600 Subject: [PATCH] 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. --- cde/programs/dtmail/dtmail/DmxMessage.C | 2 +- cde/programs/dtmail/dtmail/Makefile.am | 3 ++- cde/programs/dtmail/dtmailpr/Makefile.am | 4 ++-- cde/programs/dtmail/dtmailpr/message.C | 2 +- cde/programs/dtmail/libDtMail/Common/Makefile.am | 8 ++------ cde/programs/dtmail/libDtMail/Common/Session.C | 2 +- cde/programs/dtmail/libDtMail/Makefile.am | 4 +++- cde/programs/dtmail/libDtMail/RFC/MIMEBodyPart.C | 2 +- cde/programs/dtmail/libDtMail/RFC/Makefile.am | 2 +- cde/programs/dtmail/libDtMail/RFC/RFCBodyPart.C | 2 +- cde/programs/dtmail/libDtMail/RFC/V3BodyPart.C | 2 +- 11 files changed, 16 insertions(+), 17 deletions(-) diff --git a/cde/programs/dtmail/dtmail/DmxMessage.C b/cde/programs/dtmail/dtmail/DmxMessage.C index 252022bc1..0f6d0f861 100644 --- a/cde/programs/dtmail/dtmail/DmxMessage.C +++ b/cde/programs/dtmail/dtmail/DmxMessage.C @@ -72,7 +72,7 @@ #include "Dmx.h" // For CHARSET -#include +#include
#include #include diff --git a/cde/programs/dtmail/dtmail/Makefile.am b/cde/programs/dtmail/dtmail/Makefile.am index da2e13719..3128f6bad 100644 --- 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 46b20a2d5..090dae2f6 100644 --- 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 059f6b10f..3fd945492 100644 --- a/cde/programs/dtmail/dtmailpr/message.C +++ b/cde/programs/dtmail/dtmailpr/message.C @@ -49,7 +49,7 @@ #include "dmx.hh" // For CHARSET -#include +#include
#include #include #include "utils/str_utils.h" diff --git a/cde/programs/dtmail/libDtMail/Common/Makefile.am b/cde/programs/dtmail/libDtMail/Common/Makefile.am index a78a3a29c..15270519a 100644 --- 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 f36916c50..404fcc67c 100644 --- a/cde/programs/dtmail/libDtMail/Common/Session.C +++ b/cde/programs/dtmail/libDtMail/Common/Session.C @@ -69,7 +69,7 @@ //------------------------------------- #include #include -#include +#include
#include #include #include diff --git a/cde/programs/dtmail/libDtMail/Makefile.am b/cde/programs/dtmail/libDtMail/Makefile.am index bfbb0e7e3..ed62c45f2 100644 --- 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 bcd888d08..7ec705808 100644 --- a/cde/programs/dtmail/libDtMail/RFC/MIMEBodyPart.C +++ b/cde/programs/dtmail/libDtMail/RFC/MIMEBodyPart.C @@ -57,7 +57,7 @@ // For CHARSET #include -#include +#include
#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 6322caa5d..8e185cf1c 100644 --- 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 ad180ee3d..6fa98bdfc 100644 --- a/cde/programs/dtmail/libDtMail/RFC/RFCBodyPart.C +++ b/cde/programs/dtmail/libDtMail/RFC/RFCBodyPart.C @@ -64,7 +64,7 @@ //------------------------------------- #include #include -#include +#include
#include #include #include diff --git a/cde/programs/dtmail/libDtMail/RFC/V3BodyPart.C b/cde/programs/dtmail/libDtMail/RFC/V3BodyPart.C index 940ed4024..e5a9e447d 100644 --- a/cde/programs/dtmail/libDtMail/RFC/V3BodyPart.C +++ b/cde/programs/dtmail/libDtMail/RFC/V3BodyPart.C @@ -58,7 +58,7 @@ // For CHARSET #include -#include +#include
V3BodyPart::V3BodyPart(DtMailEnv & error, DtMail::Message * parent,