amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-04 04:48:52 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: 477096e64346a08b9df676fbdbdacd138f4438d2

Browse Source 
Monotone-Revision: 04f9117664f15747f42dc7c3201339443ed764da

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-01-31T17:14:04
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2007-01-31 17:14:04 +00:00
parent 0a069423f7
commit 164153c885
7 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
GNUmakefile
View File

@@ -4,6 +4,7 @@
include $(GNUSTEP_MAKEFILES)/common.make
SUBPROJECTS = \
SOPE/NGCards \
OGoContentStore \
SoObjects \
Main \
@@ -11,4 +12,3 @@ SUBPROJECTS = \
Protocols \
include $(GNUSTEP_MAKEFILES)/aggregate.make

3
Main/GNUmakefile.preamble
View File

@@ -11,7 +11,8 @@ ADDITIONAL_INCLUDE_DIRS += \
ADDITIONAL_LIB_DIRS += \
-L../SoObjects/SOGo/$(GNUSTEP_OBJ_DIR)/ \
-L../OGoContentStore/$(GNUSTEP_OBJ_DIR)/
-L../OGoContentStore/$(GNUSTEP_OBJ_DIR)/ \
-L../SOPE/NGCards/$(GNUSTEP_OBJ_DIR)/
SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib

4
OGoContentStore/GNUmakefile.preamble
View File

@@ -8,9 +8,9 @@ libOGoContentStore_LIBRARIES_DEPEND_UPON += \
-lEOControl \
-lSaxObjC
ADDITIONAL_INCLUDE_DIRS += -I. -I..
ADDITIONAL_INCLUDE_DIRS += -I. -I.. -I../SOPE
ADDITIONAL_LIB_DIRS += -L./$(GNUSTEP_OBJ_DIR)
ADDITIONAL_LIB_DIRS += -L./$(GNUSTEP_OBJ_DIR) -L../SOPE/NGCards/$(GNUSTEP_OBJ_DIR)/
SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib

6
Protocols/common.make
View File

@@ -12,14 +12,18 @@ ADDITIONAL_INCLUDE_DIRS += \
-I.. \
-I../.. \
-I../../.. \
-I../../SoObjects
-I../../SoObjects \
-I../../SOPE
RELBUILD_DIR_libNGCards = \
$(GNUSTEP_BUILD_DIR)/../../SOPE/NGCards/$(GNUSTEP_OBJ_DIR_NAME)
RELBUILD_DIR_libSOGo = \
$(GNUSTEP_BUILD_DIR)/../../SoObjects/SOGo/$(GNUSTEP_OBJ_DIR_NAME)
RELBUILD_DIR_libOGoContentStore = \
$(GNUSTEP_BUILD_DIR)/../../OGoContentStore/$(GNUSTEP_OBJ_DIR_NAME)
ADDITIONAL_LIB_DIRS += \
-L$(RELBUILD_DIR_libNGCards) \
-L$(RELBUILD_DIR_libSOGo) \
-L$(RELBUILD_DIR_libOGoContentStore)

2
SoObjects/GNUmakefile
View File

@@ -8,6 +8,6 @@ SUBPROJECTS = \
Appointments \
Contacts \
Mailer \
Sieve \
# Sieve \
include $(GNUSTEP_MAKEFILES)/aggregate.make

5
SoObjects/common.make
View File

@@ -10,14 +10,15 @@ BUNDLE_INSTALL_DIR = $(GNUSTEP_USER_ROOT)/Library/SOGo-$(MAJOR_VERSION).$(MINO
WOBUNDLE_EXTENSION = $(BUNDLE_EXTENSION)
WOBUNDLE_INSTALL_DIR = $(BUNDLE_INSTALL_DIR)
SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
# SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
ADDITIONAL_INCLUDE_DIRS += \
-I.. \
-I../..
ADDITIONAL_LIB_DIRS += \
-L../SOGo/$(GNUSTEP_OBJ_DIR)/ \
-L../SOGo/$(GNUSTEP_OBJ_DIR)/ \
-L../../SOGo/$(GNUSTEP_OBJ_DIR)/ \
-L../../OGoContentStore/$(GNUSTEP_OBJ_DIR)/
BUNDLE_LIBS += \

7
UI/common.make
View File

@@ -12,15 +12,19 @@ ADDITIONAL_INCLUDE_DIRS += \
-I.. \
-I../.. \
-I../../.. \
-I../../SoObjects
-I../../SoObjects \
-I../../SOPE
ifeq ($(GNUSTEP_BUILD_DIR),)
ADDITIONAL_LIB_DIRS += \
-L../../SOPE/NGCards/$(GNUSTEP_OBJ_DIR) \
-L../SOGoUI/$(GNUSTEP_OBJ_DIR) \
-L../../SoObjects/SOGo/$(GNUSTEP_OBJ_DIR)
else
RELBUILD_DIR_libNGCards = \
$(GNUSTEP_BUILD_DIR)/../../SOPE/NGCards/$(GNUSTEP_OBJ_DIR_NAME)
RELBUILD_DIR_libSOGo = \
$(GNUSTEP_BUILD_DIR)/../../SoObjects/SOGo/$(GNUSTEP_OBJ_DIR_NAME)
RELBUILD_DIR_libSOGoUI = \
@@ -29,6 +33,7 @@ RELBUILD_DIR_libOGoContentStore = \
$(GNUSTEP_BUILD_DIR)/../../OGoContentStore/$(GNUSTEP_OBJ_DIR_NAME)
ADDITIONAL_LIB_DIRS += \
-L$(RELBUILD_DIR_libNGCards) \
-L$(RELBUILD_DIR_libSOGo) \
-L$(RELBUILD_DIR_libSOGoUI) \
-L$(RELBUILD_DIR_libOGoContentStore)