From cb0d2b7051d6af9c0fb4e3664d05a514dfc8ff40 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Thu, 11 Oct 2007 22:10:14 +0000 Subject: [PATCH] Monotone-Parent: 03f4ed2c67c156f85f5fd5dae8c1f0bcdab5bb2f Monotone-Revision: f4d1aaac3bdf07ab4ee67974f65577c30c1bb0fe Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2007-10-11T22:10:14 Monotone-Branch: ca.inverse.sogo --- Main/GNUmakefile | 3 +++ OGoContentStore/GNUmakefile | 3 +++ SoObjects/Appointments/GNUmakefile | 3 +++ SoObjects/Contacts/GNUmakefile | 3 +++ SoObjects/Mailer/GNUmakefile | 3 +++ SoObjects/SOGo/GNUmakefile | 2 ++ UI/Common/GNUmakefile | 3 +++ UI/Contacts/GNUmakefile | 3 +++ UI/MailPartViewers/GNUmakefile | 3 +++ UI/MailerUI/GNUmakefile | 3 +++ UI/MainUI/GNUmakefile | 3 +++ UI/PreferencesUI/GNUmakefile | 3 +++ UI/Scheduler/GNUmakefile | 3 +++ 13 files changed, 38 insertions(+) diff --git a/Main/GNUmakefile b/Main/GNUmakefile index 9526d647a..f8113691b 100644 --- a/Main/GNUmakefile +++ b/Main/GNUmakefile @@ -5,6 +5,9 @@ include $(GNUSTEP_MAKEFILES)/common.make include ../Version include ./Version +ADDITIONAL_INCLUDE_DIRS += -I../SOPE/sope-gdl1/ +ADDITIONAL_LIB_DIRS += -L../SOPE/sope-gdl1/GDLContentStore/obj/ + SOGOD = sogod-$(MAJOR_VERSION).$(MINOR_VERSION) TOOL_NAME = $(SOGOD) diff --git a/OGoContentStore/GNUmakefile b/OGoContentStore/GNUmakefile index d66c95f27..d74e26469 100644 --- a/OGoContentStore/GNUmakefile +++ b/OGoContentStore/GNUmakefile @@ -13,6 +13,9 @@ libOGoContentStore_HEADER_FILES_DIR = . libOGoContentStore_HEADER_FILES_INSTALL_DIR = /OGoContentStore # no headers, commented out: FHS_HEADER_DIRS = OGoContentStore +ADDITIONAL_INCLUDE_DIRS += -I../SOPE/sope-gdl1/ +ADDITIONAL_LIB_DIRS += -L../SOPE/sope-gdl1/GDLContentStore/obj/ + libOGoContentStore_OBJC_FILES += \ iCalEntityObject+OCS.m \ iCalRepeatableEntityObject+OCS.m \ diff --git a/SoObjects/Appointments/GNUmakefile b/SoObjects/Appointments/GNUmakefile index 0ae0a98f1..6b51f6b46 100644 --- a/SoObjects/Appointments/GNUmakefile +++ b/SoObjects/Appointments/GNUmakefile @@ -47,6 +47,9 @@ Appointments_COMPONENTS += \ SOGoAptMailGermanRemoval.wo \ SOGoAptMailGermanDeletion.wo \ +ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/sope-gdl1/ +ADDITIONAL_LIB_DIRS += -L../../SOPE/sope-gdl1/GDLContentStore/obj/ + -include GNUmakefile.preamble include $(GNUSTEP_MAKEFILES)/wobundle.make -include GNUmakefile.postamble diff --git a/SoObjects/Contacts/GNUmakefile b/SoObjects/Contacts/GNUmakefile index 3c1711c11..a979a373a 100644 --- a/SoObjects/Contacts/GNUmakefile +++ b/SoObjects/Contacts/GNUmakefile @@ -19,6 +19,9 @@ Contacts_RESOURCE_FILES += \ Version \ product.plist \ +ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/sope-gdl1/ +ADDITIONAL_LIB_DIRS += -L../../SOPE/sope-gdl1/GDLContentStore/obj/ + -include GNUmakefile.preamble include $(GNUSTEP_MAKEFILES)/bundle.make -include GNUmakefile.postamble diff --git a/SoObjects/Mailer/GNUmakefile b/SoObjects/Mailer/GNUmakefile index 2abb34c71..cc04cf258 100644 --- a/SoObjects/Mailer/GNUmakefile +++ b/SoObjects/Mailer/GNUmakefile @@ -41,6 +41,9 @@ Mailer_RESOURCE_FILES += \ SOGoMailFrenchForward.wo \ SOGoMailGermanForward.wo +ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/sope-gdl1/ +ADDITIONAL_LIB_DIRS += -L../../SOPE/sope-gdl1/GDLContentStore/obj/ + -include GNUmakefile.preamble include $(GNUSTEP_MAKEFILES)/wobundle.make -include GNUmakefile.postamble diff --git a/SoObjects/SOGo/GNUmakefile b/SoObjects/SOGo/GNUmakefile index d2b9d3568..2530959f5 100644 --- a/SoObjects/SOGo/GNUmakefile +++ b/SoObjects/SOGo/GNUmakefile @@ -87,6 +87,8 @@ agenor_emails4uid_OBJC_FILES += agenor_emails4uid.m agenor_defaults_OBJC_FILES += agenor_defaults.m ADDITIONAL_TOOL_LIBS += -Lobj -lSOGo$(LIBRARY_NAME_SUFFIX) +ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/sope-gdl1/ +ADDITIONAL_LIB_DIRS += -L../../SOPE/sope-gdl1/GDLContentStore/obj/ -include GNUmakefile.preamble include ../common.make diff --git a/UI/Common/GNUmakefile b/UI/Common/GNUmakefile index 80a1a5943..e25a1ae1d 100644 --- a/UI/Common/GNUmakefile +++ b/UI/Common/GNUmakefile @@ -39,6 +39,9 @@ CommonUI_LOCALIZED_RESOURCE_FILES += \ # make +ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/sope-gdl1/ +ADDITIONAL_LIB_DIRS += -L../../SOPE/sope-gdl1/GDLContentStore/obj/ + -include GNUmakefile.preamble include $(GNUSTEP_MAKEFILES)/bundle.make -include GNUmakefile.postamble diff --git a/UI/Contacts/GNUmakefile b/UI/Contacts/GNUmakefile index 34a2f8fc7..cb61ff5c5 100644 --- a/UI/Contacts/GNUmakefile +++ b/UI/Contacts/GNUmakefile @@ -33,6 +33,9 @@ ContactsUI_LOCALIZED_RESOURCE_FILES += \ # make +ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/sope-gdl1/ +ADDITIONAL_LIB_DIRS += -L../../SOPE/sope-gdl1/GDLContentStore/obj/ + -include GNUmakefile.preamble include $(GNUSTEP_MAKEFILES)/bundle.make -include GNUmakefile.postamble diff --git a/UI/MailPartViewers/GNUmakefile b/UI/MailPartViewers/GNUmakefile index ae6a49d24..dcfb3665e 100644 --- a/UI/MailPartViewers/GNUmakefile +++ b/UI/MailPartViewers/GNUmakefile @@ -40,6 +40,9 @@ MailPartViewers_LOCALIZED_RESOURCE_FILES += \ # make +ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/sope-gdl1/ +ADDITIONAL_LIB_DIRS += -L../../SOPE/sope-gdl1/GDLContentStore/obj/ + -include GNUmakefile.preamble include $(GNUSTEP_MAKEFILES)/bundle.make -include GNUmakefile.postamble diff --git a/UI/MailerUI/GNUmakefile b/UI/MailerUI/GNUmakefile index 7a7c36b49..ba2c9579f 100644 --- a/UI/MailerUI/GNUmakefile +++ b/UI/MailerUI/GNUmakefile @@ -50,6 +50,9 @@ MailerUI_LOCALIZED_RESOURCE_FILES += \ # make +ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/sope-gdl1/ +ADDITIONAL_LIB_DIRS += -L../../SOPE/sope-gdl1/GDLContentStore/obj/ + -include GNUmakefile.preamble include $(GNUSTEP_MAKEFILES)/bundle.make -include GNUmakefile.postamble diff --git a/UI/MainUI/GNUmakefile b/UI/MainUI/GNUmakefile index 83e84c180..5bad0b55e 100644 --- a/UI/MainUI/GNUmakefile +++ b/UI/MainUI/GNUmakefile @@ -26,6 +26,9 @@ MainUI_RESOURCE_FILES += \ MainUI_LOCALIZED_RESOURCE_FILES += \ Locale Localizable.strings +ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/sope-gdl1/ +ADDITIONAL_LIB_DIRS += -L../../SOPE/sope-gdl1/GDLContentStore/obj/ + -include GNUmakefile.preamble include $(GNUSTEP_MAKEFILES)/bundle.make -include GNUmakefile.postamble diff --git a/UI/PreferencesUI/GNUmakefile b/UI/PreferencesUI/GNUmakefile index 2f8eaba0d..e3e707975 100644 --- a/UI/PreferencesUI/GNUmakefile +++ b/UI/PreferencesUI/GNUmakefile @@ -24,6 +24,9 @@ PreferencesUI_RESOURCE_FILES += \ PreferencesUI_LOCALIZED_RESOURCE_FILES += \ Localizable.strings \ +ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/sope-gdl1/ +ADDITIONAL_LIB_DIRS += -L../../SOPE/sope-gdl1/GDLContentStore/obj/ + -include GNUmakefile.preamble include $(GNUSTEP_MAKEFILES)/bundle.make -include GNUmakefile.postamble diff --git a/UI/Scheduler/GNUmakefile b/UI/Scheduler/GNUmakefile index 8c65e344b..7ef2b6158 100644 --- a/UI/Scheduler/GNUmakefile +++ b/UI/Scheduler/GNUmakefile @@ -66,6 +66,9 @@ SchedulerUI_RESOURCE_FILES += \ # make +ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/sope-gdl1/ +ADDITIONAL_LIB_DIRS += -L../../SOPE/sope-gdl1/GDLContentStore/obj/ + -include GNUmakefile.preamble include $(GNUSTEP_MAKEFILES)/bundle.make -include GNUmakefile.postamble