Monotone-Parent: 03f4ed2c67c156f85f5fd5dae8c1f0bcdab5bb2f

Monotone-Revision: f4d1aaac3bdf07ab4ee67974f65577c30c1bb0fe Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2007-10-11T22:10:14 Monotone-Branch: ca.inverse.sogo
2007-10-11 22:10:14 +00:00 · 2007-10-11 22:10:14 +00:00 · cb0d2b7051
parent 0074cf3924
commit cb0d2b7051
13 changed files with 38 additions and 0 deletions
--- 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)

--- 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	\
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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