LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge of '03ab73ff63dcd41936ff772c87444389b1448a27' 

and '517c5f244ae9b2a903f799c27dc64452fa8c75ee'

Monotone-Parent: 03ab73ff63dcd41936ff772c87444389b1448a27
Monotone-Parent: 517c5f244ae9b2a903f799c27dc64452fa8c75ee
Monotone-Revision: 139a022c95578093f60b05265c6af3758cb8fbdf

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2010-01-25T17:08:35
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Francis Lachapelle 2010-01-25 17:08:35 +00:00
parent 1aa86a0858 b6844c3c89
commit 865b122da6
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
SOPE/GDLContentStore/GNUmakefile.preamble
View File

@ -12,23 +12,27 @@ ADDITIONAL_INCLUDE_DIRS += -I. -I..
libGDLContentStore_LIBRARIES_DEPEND_UPON += \
-lGDLAccess \
-lNGExtensions -lEOControl \
-lDOM -lSaxObjC
-lDOM -lSaxObjC \
-lgnustep-base
GDLContentStore_LIBRARIES_DEPEND_UPON += \
-framework GDLAccess \
-framework NGExtensions -framework EOControl \
-framework DOM -framework SaxObjC
-framework DOM -framework SaxObjC \
-framework Foundation
ifneq ($(frameworks),yes)
GCS_TOOL_LIBS += \
-lGDLContentStore -lGDLAccess \
-lNGExtensions -lEOControl \
-lDOM -lSaxObjC
-lDOM -lSaxObjC \
-lgnustep-base
else
GCS_TOOL_LIBS += \
-framework GDLContentStore -framework GDLAccess \
-framework NGExtensions -framework EOControl \
-framework DOM -framework SaxObjC
-framework DOM -framework SaxObjC \
-framework Foundation
endif
gcs_ls_TOOL_LIBS += $(GCS_TOOL_LIBS)

6
SOPE/NGCards/GNUmakefile.preamble
View File

@ -21,12 +21,12 @@ libNGCards_LIBRARIES_DEPEND_UPON += \
-lNGExtensions \
-lEOControl \
-lDOM \
-lSaxObjC
-lSaxObjC \
-lgnustep-base
NGCards_LIBRARIES_DEPEND_UPON += \
-framework NGExtensions -framework EOControl \
-framework DOM -framework SaxObjC
-framework DOM -framework SaxObjC -framework Foundation
# library/framework search pathes

2
SOPE/NGCards/versitCardsSaxDriver/GNUmakefile.preamble
View File

@ -1,5 +1,7 @@
# compilation settings
NEEDS_GUI=no
SOPE_ROOT=../..
SOPE_OBJ_ROOT=$(GNUSTEP_BUILD_DIR)/$(SOPE_ROOT)

2
UI/Contacts/Hungarian.lproj/Localizable.strings
View File

@ -181,7 +181,7 @@
"Export" = "Export";
"Import Cards" = "Import Cards";
"Select a vCard or LDIF file."" = "Select LDIF or vCard file.";
"Select a vCard or LDIF file." = "Select LDIF or vCard file.";
"Upload" = "Upload";
"Done" = "Done";
"An error occured while importing contacts." = "An error occured while importing contacts.";