From: wolfgang Date: Fri, 2 Nov 2007 17:04:46 +0000 (+0000) Subject: git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1221 d1b88da0-ebda-0310... X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8645905215e8402d064df9bf06c21c01fab4a175;p=scalable-opengroupware.org git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1221 d1b88da0-ebda-0310-925b-ed51d893ca5b --- diff --git a/Main/GNUmakefile b/Main/GNUmakefile index f8113691..53a8adcf 100644 --- a/Main/GNUmakefile +++ b/Main/GNUmakefile @@ -5,8 +5,8 @@ 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/ +ADDITIONAL_INCLUDE_DIRS += -I../SOPE/ +ADDITIONAL_LIB_DIRS += -L../SOPE/GDLContentStore/obj/ SOGOD = sogod-$(MAJOR_VERSION).$(MINOR_VERSION) TOOL_NAME = $(SOGOD) diff --git a/SoObjects/Appointments/GNUmakefile b/SoObjects/Appointments/GNUmakefile index 6b51f6b4..a6c0006d 100644 --- a/SoObjects/Appointments/GNUmakefile +++ b/SoObjects/Appointments/GNUmakefile @@ -47,8 +47,8 @@ Appointments_COMPONENTS += \ SOGoAptMailGermanRemoval.wo \ SOGoAptMailGermanDeletion.wo \ -ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/sope-gdl1/ -ADDITIONAL_LIB_DIRS += -L../../SOPE/sope-gdl1/GDLContentStore/obj/ +ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/ +ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/ -include GNUmakefile.preamble include $(GNUSTEP_MAKEFILES)/wobundle.make diff --git a/SoObjects/Contacts/GNUmakefile b/SoObjects/Contacts/GNUmakefile index a979a373..a68f8212 100644 --- a/SoObjects/Contacts/GNUmakefile +++ b/SoObjects/Contacts/GNUmakefile @@ -19,8 +19,8 @@ Contacts_RESOURCE_FILES += \ Version \ product.plist \ -ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/sope-gdl1/ -ADDITIONAL_LIB_DIRS += -L../../SOPE/sope-gdl1/GDLContentStore/obj/ +ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/ +ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/ -include GNUmakefile.preamble include $(GNUSTEP_MAKEFILES)/bundle.make diff --git a/SoObjects/Mailer/GNUmakefile b/SoObjects/Mailer/GNUmakefile index 6be6f8a4..907df787 100644 --- a/SoObjects/Mailer/GNUmakefile +++ b/SoObjects/Mailer/GNUmakefile @@ -48,8 +48,8 @@ Mailer_RESOURCE_FILES += \ SOGoMailFrenchReply.wo \ SOGoMailGermanReply.wo -ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/sope-gdl1/ -ADDITIONAL_LIB_DIRS += -L../../SOPE/sope-gdl1/GDLContentStore/obj/ +ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/ +ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/ -include GNUmakefile.preamble include $(GNUSTEP_MAKEFILES)/wobundle.make diff --git a/SoObjects/SOGo/GNUmakefile b/SoObjects/SOGo/GNUmakefile index 2530959f..7d15b89f 100644 --- a/SoObjects/SOGo/GNUmakefile +++ b/SoObjects/SOGo/GNUmakefile @@ -87,8 +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/ +ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/ +ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/ -include GNUmakefile.preamble include ../common.make diff --git a/UI/Common/GNUmakefile b/UI/Common/GNUmakefile index e25a1ae1..873df3e6 100644 --- a/UI/Common/GNUmakefile +++ b/UI/Common/GNUmakefile @@ -39,8 +39,8 @@ CommonUI_LOCALIZED_RESOURCE_FILES += \ # make -ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/sope-gdl1/ -ADDITIONAL_LIB_DIRS += -L../../SOPE/sope-gdl1/GDLContentStore/obj/ +ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/ +ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/ -include GNUmakefile.preamble include $(GNUSTEP_MAKEFILES)/bundle.make diff --git a/UI/Contacts/GNUmakefile b/UI/Contacts/GNUmakefile index cb61ff5c..fed68ded 100644 --- a/UI/Contacts/GNUmakefile +++ b/UI/Contacts/GNUmakefile @@ -33,8 +33,8 @@ ContactsUI_LOCALIZED_RESOURCE_FILES += \ # make -ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/sope-gdl1/ -ADDITIONAL_LIB_DIRS += -L../../SOPE/sope-gdl1/GDLContentStore/obj/ +ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/ +ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/ -include GNUmakefile.preamble include $(GNUSTEP_MAKEFILES)/bundle.make diff --git a/UI/MailPartViewers/GNUmakefile b/UI/MailPartViewers/GNUmakefile index dcfb3665..ffa92eb7 100644 --- a/UI/MailPartViewers/GNUmakefile +++ b/UI/MailPartViewers/GNUmakefile @@ -40,8 +40,8 @@ MailPartViewers_LOCALIZED_RESOURCE_FILES += \ # make -ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/sope-gdl1/ -ADDITIONAL_LIB_DIRS += -L../../SOPE/sope-gdl1/GDLContentStore/obj/ +ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/ +ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/ -include GNUmakefile.preamble include $(GNUSTEP_MAKEFILES)/bundle.make diff --git a/UI/MailerUI/GNUmakefile b/UI/MailerUI/GNUmakefile index ba2c9579..544e1b15 100644 --- a/UI/MailerUI/GNUmakefile +++ b/UI/MailerUI/GNUmakefile @@ -50,8 +50,8 @@ MailerUI_LOCALIZED_RESOURCE_FILES += \ # make -ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/sope-gdl1/ -ADDITIONAL_LIB_DIRS += -L../../SOPE/sope-gdl1/GDLContentStore/obj/ +ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/ +ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/ -include GNUmakefile.preamble include $(GNUSTEP_MAKEFILES)/bundle.make diff --git a/UI/MainUI/GNUmakefile b/UI/MainUI/GNUmakefile index 5bad0b55..6b037889 100644 --- a/UI/MainUI/GNUmakefile +++ b/UI/MainUI/GNUmakefile @@ -26,8 +26,8 @@ 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/ +ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/ +ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/ -include GNUmakefile.preamble include $(GNUSTEP_MAKEFILES)/bundle.make diff --git a/UI/PreferencesUI/GNUmakefile b/UI/PreferencesUI/GNUmakefile index e3e70797..2b34be9b 100644 --- a/UI/PreferencesUI/GNUmakefile +++ b/UI/PreferencesUI/GNUmakefile @@ -24,8 +24,8 @@ 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/ +ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/ +ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/ -include GNUmakefile.preamble include $(GNUSTEP_MAKEFILES)/bundle.make diff --git a/UI/Scheduler/GNUmakefile b/UI/Scheduler/GNUmakefile index 7ef2b615..aab7f028 100644 --- a/UI/Scheduler/GNUmakefile +++ b/UI/Scheduler/GNUmakefile @@ -66,8 +66,8 @@ SchedulerUI_RESOURCE_FILES += \ # make -ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/sope-gdl1/ -ADDITIONAL_LIB_DIRS += -L../../SOPE/sope-gdl1/GDLContentStore/obj/ +ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/ +ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/ -include GNUmakefile.preamble include $(GNUSTEP_MAKEFILES)/bundle.make