From 734c164ae02df4e2313003d143486eff67f42c5e Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Tue, 23 Jul 2013 09:25:24 -0400 Subject: [PATCH 1/2] Reverted broken patch in #2360 and tried to fix it cleanly --- UI/MailPartViewers/GNUmakefile | 22 ++-------------------- UI/MailerUI/GNUmakefile | 9 ++------- 2 files changed, 4 insertions(+), 27 deletions(-) diff --git a/UI/MailPartViewers/GNUmakefile b/UI/MailPartViewers/GNUmakefile index 509121b74..a094e92eb 100644 --- a/UI/MailPartViewers/GNUmakefile +++ b/UI/MailPartViewers/GNUmakefile @@ -25,25 +25,7 @@ MailPartViewers_OBJC_FILES += \ UIxMailPartMessageViewer.m \ UIxMailPartICalViewer.m \ \ - UIxMailPartICalActions.m \ - ../../SoObjects/Mailer/SOGoMailBodyPart.m \ - ../../SoObjects/Mailer/SOGoHTMLMailBodyPart.m \ - ../../SoObjects/Mailer/SOGoCalendarMailBodyPart.m \ - ../../SoObjects/Mailer/SOGoMailAccounts.m \ - ../../SoObjects/Mailer/SOGoMailBaseObject.m \ - ../../SoObjects/Mailer/SOGoMailAccount.m \ - ../../SoObjects/Mailer/SOGoMailNamespace.m \ - ../../SoObjects/Mailer/SOGoDraftsFolder.m \ - ../../SoObjects/Mailer/SOGoSentFolder.m \ - ../../SoObjects/Mailer/SOGoTrashFolder.m \ - ../../SoObjects/Mailer/SOGoMailFolder.m \ - ../../SoObjects/Mailer/SOGoDraftObject.m \ - ../../SoObjects/Mailer/SOGoMailObject.m \ - ../../SoObjects/Appointments/SOGoEMailAlarmsManager.m \ - ../../SoObjects/Appointments/SOGoAppointmentObject.m \ - ../../SoObjects/Appointments/SOGoComponentOccurence.m \ - ../../SoObjects/Appointments/SOGoAppointmentOccurence.m \ - ../../SoObjects/Appointments/SOGoCalendarComponent.m + UIxMailPartICalActions.m MailPartViewers_RESOURCE_FILES += \ product.plist \ @@ -54,7 +36,7 @@ MailPartViewers_LOCALIZED_RESOURCE_FILES += \ # make ADDITIONAL_INCLUDE_DIRS += $(shell xml2-config --cflags) -ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/ +ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/ -L../../SoObjects/Mailer/obj -L../../SoObjects/Appointments/obj -include GNUmakefile.preamble include $(GNUSTEP_MAKEFILES)/bundle.make diff --git a/UI/MailerUI/GNUmakefile b/UI/MailerUI/GNUmakefile index b1932214d..e354d983f 100644 --- a/UI/MailerUI/GNUmakefile +++ b/UI/MailerUI/GNUmakefile @@ -32,12 +32,7 @@ MailerUI_OBJC_FILES += \ UIxMailWindowCloser.m \ \ UIxMailUserRightsEditor.m \ - ../MailPartViewers/UIxMailRenderingContext.m \ - UIxMailUserDelegationEditor.m \ -# UIxMailEditorAction.m \ -# UIxMailReplyAction.m \ -# UIxMailForwardAction.m \ -# UIxFilterList.m \ + UIxMailUserDelegationEditor.m MailerUI_RESOURCE_FILES += \ product.plist \ @@ -49,7 +44,7 @@ MailerUI_LOCALIZED_RESOURCE_FILES += \ # make ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/ -ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/ +ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/ -L../MailPartViewers/obj/ -include GNUmakefile.preamble include $(GNUSTEP_MAKEFILES)/bundle.make From bd776152db4f05ba13a58795f2eae0fc98b4e9cb Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Tue, 23 Jul 2013 10:02:13 -0400 Subject: [PATCH 2/2] Update ChangeLog --- ChangeLog | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/ChangeLog b/ChangeLog index a0f39423b..8eda0e0db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +commit 734c164ae02df4e2313003d143486eff67f42c5e +Author: Ludovic Marcotte +Date: Tue Jul 23 09:25:24 2013 -0400 + + Reverted broken patch in #2360 and tried to fix it cleanly + +M UI/MailPartViewers/GNUmakefile +M UI/MailerUI/GNUmakefile + +commit 9f381e768dfd6548da4a88de370818ba6abb3314 +Author: Francis Lachapelle +Date: Tue Jul 23 08:38:09 2013 -0400 + + Update ChangeLog + +M ChangeLog + commit b531b6160c5ecc41f7160195da1b449dc87d01e3 Author: Ludovic Marcotte Date: Tue Jul 23 08:31:38 2013 -0400