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

Put private libraries in /usr/lib/sogo

Browse Source
This commit is contained in:
Jeroen Dekkers
2014-10-01 20:36:42 +02:00
parent 89284d558c
commit 6ded9e95b3
21 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
UI/AdministrationUI/GNUmakefile
View File

@@ -25,6 +25,7 @@ AdministrationUI_LOCALIZED_RESOURCE_FILES += \
ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/
ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
ADDITIONAL_LDFLAGS += -Wl,--rpath,$(SOGO_SYSLIBDIR)/sogo
-include GNUmakefile.preamble
include $(GNUSTEP_MAKEFILES)/bundle.make

1
UI/Common/GNUmakefile
View File

@@ -33,6 +33,7 @@ CommonUI_LOCALIZED_RESOURCE_FILES += \
ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/
ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
ADDITIONAL_LDFLAGS += -Wl,--rpath,$(SOGO_SYSLIBDIR)/sogo
-include GNUmakefile.preamble
include $(GNUSTEP_MAKEFILES)/bundle.make

1
UI/Contacts/GNUmakefile
View File

@@ -38,6 +38,7 @@ ContactsUI_LOCALIZED_RESOURCE_FILES += \
ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/
ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
ADDITIONAL_LDFLAGS += -Wl,--rpath,$(SOGO_SYSLIBDIR)/sogo
-include GNUmakefile.preamble
include $(GNUSTEP_MAKEFILES)/bundle.make

1
UI/MailPartViewers/GNUmakefile
View File

@@ -37,6 +37,7 @@ MailPartViewers_LOCALIZED_RESOURCE_FILES += \
ADDITIONAL_INCLUDE_DIRS += $(shell xml2-config --cflags)
ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/ -L../../SoObjects/Mailer/obj -L../../SoObjects/Appointments/obj
ADDITIONAL_LDFLAGS += -Wl,--rpath,$(SOGO_SYSLIBDIR)/sogo
-include GNUmakefile.preamble
include $(GNUSTEP_MAKEFILES)/bundle.make

1
UI/MailerUI/GNUmakefile
View File

@@ -46,6 +46,7 @@ MailerUI_LOCALIZED_RESOURCE_FILES += \
ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/
ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/ -L../MailPartViewers/obj/
ADDITIONAL_LDFLAGS += -Wl,--rpath,$(SOGO_SYSLIBDIR)/sogo
-include GNUmakefile.preamble
include $(GNUSTEP_MAKEFILES)/bundle.make

1
UI/MainUI/GNUmakefile
View File

@@ -32,6 +32,7 @@ MainUI_LOCALIZED_RESOURCE_FILES += \
ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/
ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
ADDITIONAL_LDFLAGS += -Wl,--rpath,$(SOGO_SYSLIBDIR)/sogo
-include GNUmakefile.preamble
include $(GNUSTEP_MAKEFILES)/bundle.make

1
UI/PreferencesUI/GNUmakefile
View File

@@ -28,6 +28,7 @@ PreferencesUI_LOCALIZED_RESOURCE_FILES += \
ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/
ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
ADDITIONAL_LDFLAGS += -Wl,--rpath,$(SOGO_SYSLIBDIR)/sogo
-include GNUmakefile.preamble
include $(GNUSTEP_MAKEFILES)/bundle.make

3
UI/SOGoUI/GNUmakefile
View File

@@ -11,6 +11,8 @@ libSOGoUI_HEADER_FILES_DIR = .
libSOGoUI_HEADER_FILES_INSTALL_DIR = /SOGoUI
libSOGoUI_INTERFACE_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION)
ADDITIONAL_LDFLAGS += -Wl,--rpath,$(SOGO_SYSLIBDIR)/sogo
libSOGoUI_HEADER_FILES += \
\
UIxJSClose.h \
@@ -32,5 +34,6 @@ libSOGoUI_OBJC_FILES += \
ifneq ($(FHS_INSTALL_ROOT),)
GNUSTEP_HEADERS=$(DESTDIR)$(FHS_INSTALL_ROOT)/include
endif
GNUSTEP_TARGET_LDIR=sogo
include $(GNUSTEP_MAKEFILES)/library.make
-include GNUmakefile.postamble

1
UI/Scheduler/GNUmakefile
View File

@@ -72,6 +72,7 @@ SchedulerUI_RESOURCE_FILES += \
ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/
ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
ADDITIONAL_LDFLAGS += -Wl,--rpath,$(SOGO_SYSLIBDIR)/sogo
-include GNUmakefile.preamble
include $(GNUSTEP_MAKEFILES)/bundle.make

4
UI/common.make
View File

@@ -20,13 +20,13 @@ ifeq ($(GNUSTEP_BUILD_DIR),)
ADDITIONAL_LIB_DIRS += \
-L../../SOPE/NGCards/$(GNUSTEP_OBJ_DIR) \
-L../SOGoUI/$(GNUSTEP_OBJ_DIR) \
-L../../SoObjects/SOGo/SOGo.framework/
-L../../SoObjects/SOGo/SOGo.framework/sogo/
else
RELBUILD_DIR_libNGCards = \
$(GNUSTEP_BUILD_DIR)/../../SOPE/NGCards/$(GNUSTEP_OBJ_DIR_NAME)
RELBUILD_DIR_libSOGo = \
$(GNUSTEP_BUILD_DIR)/../../SoObjects/SOGo/SOGo.framework/
$(GNUSTEP_BUILD_DIR)/../../SoObjects/SOGo/SOGo.framework/sogo/
RELBUILD_DIR_libSOGoUI = \
$(GNUSTEP_BUILD_DIR)/../SOGoUI/$(GNUSTEP_OBJ_DIR_NAME)