git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1221 d1b88da0-ebda-0310...

diff --git a/Main/GNUmakefile b/Main/GNUmakefile
index f8113691beef38ac1ed56523571a2e3bfe226a82..53a8adcfe7f14e6878ffee2b54f17c664a51ddb4 100644 (file)
--- 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 6b51f6b46ff8ae625a10d89ebcb64691a9094599..a6c0006df45c134e49a0f5d23eb6e59752cb4012 100644 (file)
--- 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 a979a373a544ac6452db83cb0bb4a5d4d12a69ce..a68f8212ec3f88cfcb662fac3fbb8e592621ac8e 100644 (file)
--- 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 6be6f8a4f72925246341982b5d6a842328f69c9f..907df7878305cfe00b6b574fb40c541b4587844d 100644 (file)
--- 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 2530959f5011a6ccee3aaa94dfce6859c32fd657..7d15b89f568c14f8ec49321b5eb383ce2492d3ed 100644 (file)
--- 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 e25a1ae1d57537366a4958cd97e9bf7b607d9ec5..873df3e605c9082fee1cd1a01c8a25544e52976f 100644 (file)
--- 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 cb61ff5c5c881ff776639956a9e1d2d50c8c919c..fed68ded93fdafd01a7bfc9617f861759fd35ca8 100644 (file)
--- 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 dcfb3665ec05ef1489f9e222dce80da6ac8b6e8a..ffa92eb7eb2bcf230f8f7292e58339afc5ebbda7 100644 (file)
--- 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 ba2c9579f02aac666d662fe9607b8fdf21c7aed2..544e1b15821d0b0bb792db4976ba4ef5fc746374 100644 (file)
--- 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 5bad0b55e61ff1ddb30a511a654def3e6f92ec83..6b0378895977d3835ddd6dfcf73ac35df123a995 100644 (file)
--- 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 e3e70797548d286b4d9677846a8d35c10eadc9d9..2b34be9b571cf116cda370452b36db08cbaac7c9 100644 (file)
--- 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 7ef2b6158f445d3da695841a54ae2aae750d24e9..aab7f02884120cae44391e9f326f95fafe57bf96 100644 (file)
--- 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