From af25232d1f7c4d1a23e32a65649b664eb8d81996 Mon Sep 17 00:00:00 2001 From: helge Date: Tue, 16 Aug 2005 13:40:56 +0000 Subject: [PATCH] added OSX framework support git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1033 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-gdl1/GDLAccess/ChangeLog | 5 ++ sope-gdl1/GDLAccess/GNUmakefile | 28 ++++++--- sope-gdl1/GDLAccess/GNUmakefile.preamble | 54 ++++++++++++----- sope-gdl1/GDLAccess/Version | 2 +- sope-gdl1/GDLContentStore/ChangeLog | 5 ++ sope-gdl1/GDLContentStore/GNUmakefile | 27 +++++++-- .../GDLContentStore/GNUmakefile.preamble | 54 ++++++++++++++--- sope-gdl1/GDLContentStore/Version | 2 +- sope-gdl1/PostgreSQL/ChangeLog | 4 ++ sope-gdl1/PostgreSQL/GNUmakefile.preamble | 59 ++++++++++++------- sope-gdl1/PostgreSQL/Version | 2 +- sope-gdl1/SQLite3/ChangeLog | 4 ++ sope-gdl1/SQLite3/GNUmakefile.preamble | 49 ++++++++------- sope-gdl1/SQLite3/Version | 2 +- sope-ical/NGiCal/GNUmakefile.preamble | 1 + sope-ldap/NGLdap/ChangeLog | 5 ++ sope-ldap/NGLdap/GNUmakefile | 19 ++++++ sope-ldap/NGLdap/GNUmakefile.preamble | 54 ++++++++++------- sope-ldap/NGLdap/Version | 2 +- 19 files changed, 273 insertions(+), 105 deletions(-) diff --git a/sope-gdl1/GDLAccess/ChangeLog b/sope-gdl1/GDLAccess/ChangeLog index e375d5d4..0221c714 100644 --- a/sope-gdl1/GDLAccess/ChangeLog +++ b/sope-gdl1/GDLAccess/ChangeLog @@ -1,3 +1,8 @@ +2005-08-16 Helge Hess + + * GNUmakefile, GNUmakefile.preamble: added OSX framework compilation + (v4.5.54) + 2005-08-05 Helge Hess * EOAdaptorContext.m, common.h: do not include NSUtilities.h on Cocoa diff --git a/sope-gdl1/GDLAccess/GNUmakefile b/sope-gdl1/GDLAccess/GNUmakefile index 6db00a8e..eeb778f0 100644 --- a/sope-gdl1/GDLAccess/GNUmakefile +++ b/sope-gdl1/GDLAccess/GNUmakefile @@ -7,7 +7,13 @@ include ../common.make GNUSTEP_INSTALLATION_DIR = ${GNUSTEP_LOCAL_ROOT} +ifneq ($(frameworks),yes) LIBRARY_NAME = libGDLAccess +else +FRAMEWORK_NAME = GDLAccess +endif + + libGDLAccess_SOVERSION=$(MAJOR_VERSION).$(MINOR_VERSION) libGDLAccess_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBMINOR_VERSION) @@ -108,22 +114,30 @@ endif libGDLAccess_HEADER_FILES_DIR = . libGDLAccess_HEADER_FILES_INSTALL_DIR = /GDLAccess + # adaptor load test TOOL_NAME = load-EOAdaptor connect-EOAdaptor -load-EOAdaptor_OBJC_FILES = load-EOAdaptor.m -load-EOAdaptor_LIB_DIRS += -L./$(GNUSTEP_OBJ_DIR) -load-EOAdaptor_TOOL_LIBS += -lGDLAccess -lEOControl - +load-EOAdaptor_OBJC_FILES = load-EOAdaptor.m connect-EOAdaptor_OBJC_FILES = connect-EOAdaptor.m -connect-EOAdaptor_LIB_DIRS += -L./$(GNUSTEP_OBJ_DIR) -connect-EOAdaptor_TOOL_LIBS += -lGDLAccess -lEOControl +# framework support + +GDLAccess_HEADER_FILES = $(libGDLAccess_HEADER_FILES) +GDLAccess_OBJC_FILES = $(libGDLAccess_OBJC_FILES) +GDLAccess_SUBPROJECTS = $(libGDLAccess_SUBPROJECTS) + + +# building + -include GNUmakefile.preamble +ifneq ($(frameworks),yes) include $(GNUSTEP_MAKEFILES)/library.make -include $(GNUSTEP_MAKEFILES)/aggregate.make +else +include $(GNUSTEP_MAKEFILES)/framework.make +endif include $(GNUSTEP_MAKEFILES)/tool.make -include GNUmakefile.postamble include fhs.make diff --git a/sope-gdl1/GDLAccess/GNUmakefile.preamble b/sope-gdl1/GDLAccess/GNUmakefile.preamble index deda0f6e..b8b6232b 100644 --- a/sope-gdl1/GDLAccess/GNUmakefile.preamble +++ b/sope-gdl1/GDLAccess/GNUmakefile.preamble @@ -1,36 +1,58 @@ -# $Id: GNUmakefile.preamble 1 2004-08-20 10:38:46Z znek $ +# compilation settings + +SOPE_ROOT=../.. + +ADDITIONAL_CPPFLAGS += -Wall ADDITIONAL_CPPFLAGS += \ - -Wall -DCOMPILE_FOR_GSTEP_MAKE=1 \ - \ -DGDL_MAJOR_VERSION=$(MAJOR_VERSION) \ -DGDL_MINOR_VERSION=$(MINOR_VERSION) \ - -DGDL_SUBMINOR_VERSION=$(SUBMINOR_VERSION) \ - \ + -DGDL_SUBMINOR_VERSION=$(SUBMINOR_VERSION) + +ADDITIONAL_CPPFLAGS += \ -DSOPE_MAJOR_VERSION=$(SOPE_MAJOR_VERSION) \ -DSOPE_MINOR_VERSION=$(SOPE_MINOR_VERSION) \ -DSOPE_SUBMINOR_VERSION=$(SOPE_SUBMINOR_VERSION) ADDITIONAL_INCLUDE_DIRS += \ -I. -I.. \ - -IFoundationExt \ - -I../../sope-core/ \ - -I../../sope-core/NGExtensions/ + -I./FoundationExt \ + -I$(SOPE_ROOT)/sope-core/ \ + -I$(SOPE_ROOT)/sope-core/NGExtensions/ + + +# dependencies + +libGDLAccess_LIBRARIES_DEPEND_UPON += -lEOControl +GDLAccess_LIBRARIES_DEPEND_UPON += -framework EOControl +ifneq ($(frameworks),yes) +ADDITIONAL_TOOL_LIBS += -lGDLAccess -lEOControl +else +ADDITIONAL_TOOL_LIBS += -framework GDLAccess -framework EOControl +endif -libGDLAccess_LIBRARIES_DEPEND_UPON += \ - -lEOControl -ifneq ($(GNUSTEP_BUILD_DIR),) -RELBUILD_DIR_SOPE=$(GNUSTEP_BUILD_DIR)/../.. -RELBUILD_DIR_Core=$(RELBUILD_DIR_SOPE)/sope-core +# library/framework search pathes +DEP_DIRS = . $(SOPE_ROOT)/sope-core/EOControl + +ifneq ($(frameworks),yes) ADDITIONAL_LIB_DIRS += \ - -L$(RELBUILD_DIR_Core)/EOControl/$(GNUSTEP_OBJ_DIR_NAME) \ - -L$(GNUSTEP_BUILD_DIR)/$(GNUSTEP_OBJ_DIR_NAME) + $(foreach dir,$(DEP_DIRS),\ + -L$(GNUSTEP_BUILD_DIR)/$(dir)/$(GNUSTEP_OBJ_DIR_NAME)) else ADDITIONAL_LIB_DIRS += \ - -L../../sope-core/EOControl/$(GNUSTEP_OBJ_DIR) + $(foreach dir,$(DEP_DIRS),-F$(GNUSTEP_BUILD_DIR)/$(dir)) endif SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib + + +# TODO: add prebinding address + +ifeq ($(FOUNDATION_LIB),apple) +#libGDLAccess_PREBIND_ADDR="0x??" +#libGDLAccess_LDFLAGS += -seg1addr $(libGDLAccess_PREBIND_ADDR) +#GDLAccess_LDFLAGS += -seg1addr $(libGDLAccess_PREBIND_ADDR) +endif diff --git a/sope-gdl1/GDLAccess/Version b/sope-gdl1/GDLAccess/Version index d124b50f..5a9103fb 100644 --- a/sope-gdl1/GDLAccess/Version +++ b/sope-gdl1/GDLAccess/Version @@ -1,3 +1,3 @@ # version file -SUBMINOR_VERSION:=53 +SUBMINOR_VERSION:=54 diff --git a/sope-gdl1/GDLContentStore/ChangeLog b/sope-gdl1/GDLContentStore/ChangeLog index a02ec312..e9a2e3cf 100644 --- a/sope-gdl1/GDLContentStore/ChangeLog +++ b/sope-gdl1/GDLContentStore/ChangeLog @@ -1,3 +1,8 @@ +2005-08-16 Helge Hess + + * GNUmakefile, GNUmakefile.preamble: added OSX framework compilation + (v4.5.35) + 2005-07-23 Sebastian Reitenbach * GNUmakefile.preamble: added OpenBSD linking flags (v4.5.34) diff --git a/sope-gdl1/GDLContentStore/GNUmakefile b/sope-gdl1/GDLContentStore/GNUmakefile index 527c0e55..1f1deb7f 100644 --- a/sope-gdl1/GDLContentStore/GNUmakefile +++ b/sope-gdl1/GDLContentStore/GNUmakefile @@ -7,7 +7,12 @@ include ./Version GNUSTEP_INSTALLATION_DIR = ${GNUSTEP_LOCAL_ROOT} +ifneq ($(frameworks),yes) LIBRARY_NAME = libGDLContentStore +else +FRAMEWORK_NAME = GDLContentStore +endif + libGDLContentStore_SOVERSION=$(MAJOR_VERSION).$(MINOR_VERSION) libGDLContentStore_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBMINOR_VERSION) @@ -44,14 +49,28 @@ libGDLContentStore_OBJC_FILES += \ GCSFieldExtractor.m \ GCSStringFormatter.m \ -gcs_ls_OBJC_FILES += gcs_ls.m -gcs_mkdir_OBJC_FILES += gcs_mkdir.m -gcs_cat_OBJC_FILES += gcs_cat.m -gcs_gensql_OBJC_FILES += gcs_gensql.m +gcs_ls_OBJC_FILES += gcs_ls.m +gcs_mkdir_OBJC_FILES += gcs_mkdir.m +gcs_cat_OBJC_FILES += gcs_cat.m +gcs_gensql_OBJC_FILES += gcs_gensql.m gcs_recreatequick_OBJC_FILES += gcs_recreatequick.m + +# framework support + +GDLContentStore_HEADER_FILES = $(libGDLContentStore_HEADER_FILES) +GDLContentStore_OBJC_FILES = $(libGDLContentStore_OBJC_FILES) +GDLContentStore_SUBPROJECTS = $(libGDLContentStore_SUBPROJECTS) + + +# building + -include GNUmakefile.preamble +ifneq ($(frameworks),yes) include $(GNUSTEP_MAKEFILES)/library.make +else +include $(GNUSTEP_MAKEFILES)/framework.make +endif include $(GNUSTEP_MAKEFILES)/tool.make -include GNUmakefile.postamble include fhs.make diff --git a/sope-gdl1/GDLContentStore/GNUmakefile.preamble b/sope-gdl1/GDLContentStore/GNUmakefile.preamble index 5ebdee60..5e5e6002 100644 --- a/sope-gdl1/GDLContentStore/GNUmakefile.preamble +++ b/sope-gdl1/GDLContentStore/GNUmakefile.preamble @@ -1,16 +1,35 @@ # compilation settings +SOPE_ROOT=../.. + +ADDITIONAL_CPPFLAGS += -Wall + +ADDITIONAL_INCLUDE_DIRS += -I. -I.. + + +# dependencies + libGDLContentStore_LIBRARIES_DEPEND_UPON += \ - -lGDLAccess \ - -lNGExtensions \ - -lEOControl \ - -lSaxObjC + -lGDLAccess \ + -lNGExtensions -lEOControl \ + -lDOM -lSaxObjC + +GDLContentStore_LIBRARIES_DEPEND_UPON += \ + -framework GDLAccess \ + -framework NGExtensions -framework EOControl \ + -framework DOM -framework SaxObjC +ifneq ($(frameworks),yes) GCS_TOOL_LIBS += \ - -lGDLContentStore \ - -lGDLAccess \ + -lGDLContentStore -lGDLAccess \ -lNGExtensions -lEOControl \ -lDOM -lSaxObjC +else +GCS_TOOL_LIBS += \ + -framework GDLContentStore -framework GDLAccess \ + -framework NGExtensions -framework EOControl \ + -framework DOM -framework SaxObjC +endif gcs_ls_TOOL_LIBS += $(GCS_TOOL_LIBS) gcs_mkdir_TOOL_LIBS += $(GCS_TOOL_LIBS) @@ -18,14 +37,31 @@ gcs_cat_TOOL_LIBS += $(GCS_TOOL_LIBS) gcs_recreatequick_TOOL_LIBS += $(GCS_TOOL_LIBS) gcs_gensql_TOOL_LIBS += $(GCS_TOOL_LIBS) -ADDITIONAL_INCLUDE_DIRS += -I. -I.. +# library/framework search pathes + +DEP_DIRS = \ + . \ + ../GDLAccess \ + $(SOPE_ROOT)/sope-core/NGExtensions \ + $(SOPE_ROOT)/sope-core/EOControl \ + $(SOPE_ROOT)/sope-xml/DOM \ + $(SOPE_ROOT)/sope-xml/SaxObjC + +ifneq ($(frameworks),yes) ADDITIONAL_LIB_DIRS += \ - -L./$(GNUSTEP_OBJ_DIR) \ - -L../GDLAccess/$(GNUSTEP_OBJ_DIR) + $(foreach dir,$(DEP_DIRS),\ + -L$(GNUSTEP_BUILD_DIR)/$(dir)/$(GNUSTEP_OBJ_DIR_NAME)) +else +ADDITIONAL_LIB_DIRS += \ + $(foreach dir,$(DEP_DIRS),-F$(GNUSTEP_BUILD_DIR)/$(dir)) +endif SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib + +# platform specific settings + ifeq ($(FOUNDATION_LIB),apple) libGDLContentStore_PREBIND_ADDR="0xC7700000" libGDLContentStore_LDFLAGS += -seg1addr $(libGDLContentStore_PREBIND_ADDR) diff --git a/sope-gdl1/GDLContentStore/Version b/sope-gdl1/GDLContentStore/Version index 003b64ee..7db0d139 100644 --- a/sope-gdl1/GDLContentStore/Version +++ b/sope-gdl1/GDLContentStore/Version @@ -2,7 +2,7 @@ MAJOR_VERSION:=4 MINOR_VERSION:=5 -SUBMINOR_VERSION:=34 +SUBMINOR_VERSION:=35 # v4.5.29 requires libNGExtensions v4.5.161 # v4.5.26 does not require libNGiCal anymore diff --git a/sope-gdl1/PostgreSQL/ChangeLog b/sope-gdl1/PostgreSQL/ChangeLog index d9995430..3b601793 100644 --- a/sope-gdl1/PostgreSQL/ChangeLog +++ b/sope-gdl1/PostgreSQL/ChangeLog @@ -1,3 +1,7 @@ +2005-08-16 Helge Hess + + * GNUmakefile.preamble: added OSX framework compilation (v4.5.45) + 2005-08-08 Helge Hess * removed CVS Id fields (v4.5.44) diff --git a/sope-gdl1/PostgreSQL/GNUmakefile.preamble b/sope-gdl1/PostgreSQL/GNUmakefile.preamble index d674a8d5..ba7e2e02 100644 --- a/sope-gdl1/PostgreSQL/GNUmakefile.preamble +++ b/sope-gdl1/PostgreSQL/GNUmakefile.preamble @@ -22,10 +22,14 @@ # If not, write to the Free Software Foundation, # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -PostgreSQL_BUNDLE_LIBS += -lpq -PostgreSQL_BUNDLE_LIBS += -lGDLAccess -lEOControl +SOPE_ROOT=../.. + +# PG config + +ADDITIONAL_INCLUDE_DIRS += -I$(shell pg_config --includedir) +ADDITIONAL_LIB_DIRS += -L$(shell pg_config --libdir) +PostgreSQL_BUNDLE_LIBS += -lpq -gdltest_TOOL_LIBS += -lGDLAccess # set compile flags and go @@ -33,36 +37,47 @@ ADDITIONAL_INCLUDE_DIRS += \ -I../GDLAccess -I.. ADDITIONAL_INCLUDE_DIRS += \ - -I.. -I../.. \ - -I../../sope-core/ \ - -I../../sope-core/NGExtensions + -I.. -I$(SOPE_ROOT) \ + -I$(SOPE_ROOT)/sope-core/ \ + -I$(SOPE_ROOT)/sope-core/NGExtensions +# TODO: is this required? ADDITIONAL_INCLUDE_DIRS += \ -I/usr/local/include -ADDITIONAL_INCLUDE_DIRS += -I$(shell pg_config --includedir) -ADDITIONAL_LIB_DIRS += -L$(shell pg_config --libdir) -ifneq ($(GNUSTEP_BUILD_DIR),) -RELBUILD_DIR_SOPE=$(GNUSTEP_BUILD_DIR)/../.. -RELBUILD_DIR_Core=$(RELBUILD_DIR_SOPE)/sope-core -RELBUILD_DIR_Gdl1=$(RELBUILD_DIR_SOPE)/sope-gdl1 +# dependencies +ifneq ($(frameworks),yes) +PostgreSQL_BUNDLE_LIBS += -lGDLAccess -lEOControl +gdltest_TOOL_LIBS += -lGDLAccess +else +PostgreSQL_BUNDLE_LIBS += -framework GDLAccess -framework EOControl +gdltest_TOOL_LIBS += -framework GDLAccess +endif + + + +# library/framework search pathes + +DEP_DIRS = \ + ../GDLAccess \ + $(SOPE_ROOT)/sope-core/EOControl + +ifneq ($(frameworks),yes) ADDITIONAL_LIB_DIRS += \ - -L$(RELBUILD_DIR_Core)/EOControl/$(GNUSTEP_OBJ_DIR_NAME) \ - -L$(RELBUILD_DIR_Gdl1)/GDLAccess/$(GNUSTEP_OBJ_DIR_NAME) \ - -L$(GNUSTEP_BUILD_DIR)/$(GNUSTEP_OBJ_DIR_NAME) + $(foreach dir,$(DEP_DIRS),\ + -L$(GNUSTEP_BUILD_DIR)/$(dir)/$(GNUSTEP_OBJ_DIR_NAME)) else ADDITIONAL_LIB_DIRS += \ - -L../GDLAccess/$(GNUSTEP_OBJ_DIR)\ - -L../../sope-core/EOControl/$(GNUSTEP_OBJ_DIR) + $(foreach dir,$(DEP_DIRS),-F$(GNUSTEP_BUILD_DIR)/$(dir)) endif - SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib -ifeq ($(FOUNDATION_LIB),apple) -PostgreSQL_BUNDLE_LIBS += -lssl -lcrypto -ADDITIONAL_INCLUDE_DIRS += -I/Library/PostgreSQL/include/ -endif +# TODO: not necessary? covered by pg_config? +#ifeq ($(FOUNDATION_LIB),apple) +#PostgreSQL_BUNDLE_LIBS += -lssl -lcrypto +#ADDITIONAL_INCLUDE_DIRS += -I/Library/PostgreSQL/include/ +#endif diff --git a/sope-gdl1/PostgreSQL/Version b/sope-gdl1/PostgreSQL/Version index e99e63fc..aab40918 100644 --- a/sope-gdl1/PostgreSQL/Version +++ b/sope-gdl1/PostgreSQL/Version @@ -1,5 +1,5 @@ # version file -SUBMINOR_VERSION:=44 +SUBMINOR_VERSION:=45 # v4.5.41 requires libGDLAccess v4.5.50 diff --git a/sope-gdl1/SQLite3/ChangeLog b/sope-gdl1/SQLite3/ChangeLog index 181d2ebb..72e80775 100644 --- a/sope-gdl1/SQLite3/ChangeLog +++ b/sope-gdl1/SQLite3/ChangeLog @@ -1,3 +1,7 @@ +2005-08-16 Helge Hess + + * GNUmakefile.preamble: added OSX framework compilation (v4.5.20) + 2005-08-08 Helge Hess * GNUmakefile.preamble: fixed pathes for inline-compilation (v4.5.19) diff --git a/sope-gdl1/SQLite3/GNUmakefile.preamble b/sope-gdl1/SQLite3/GNUmakefile.preamble index e2618dfe..bd7190fb 100644 --- a/sope-gdl1/SQLite3/GNUmakefile.preamble +++ b/sope-gdl1/SQLite3/GNUmakefile.preamble @@ -22,14 +22,12 @@ # If not, write to the Free Software Foundation, # 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -SQLite3_BUNDLE_LIBS += \ - -lGDLAccess \ - -lEOControl \ - -lsqlite3 +SOPE_ROOT=../.. + +# SQLite3 config + +SQLite3_BUNDLE_LIBS += -lsqlite3 -gdltest_TOOL_LIBS += \ - -lGDLAccess \ - -lNGExtensions # set compile flags and go @@ -38,25 +36,34 @@ ADDITIONAL_INCLUDE_DIRS += \ ADDITIONAL_INCLUDE_DIRS += \ -I.. -I../.. \ - -I../../sope-core/ \ - -I../../sope-core/NGExtensions + -I$(SOPE_ROOT)/sope-core/ \ + -I$(SOPE_ROOT)/sope-core/NGExtensions + + +# dependencies + +ifneq ($(frameworks),yes) +SQLite3_BUNDLE_LIBS += -lGDLAccess -lEOControl +gdltest_TOOL_LIBS += -lGDLAccess -lEOControl +else +SQLite3_BUNDLE_LIBS += -framework GDLAccess -framework EOControl +gdltest_TOOL_LIBS += -framework GDLAccess -framework EOControl +endif + +# library/framework search pathes -ifneq ($(GNUSTEP_BUILD_DIR),) -RELBUILD_DIR_SOPE=$(GNUSTEP_BUILD_DIR)/../.. -RELBUILD_DIR_Core=$(RELBUILD_DIR_SOPE)/sope-core -RELBUILD_DIR_Gdl1=$(RELBUILD_DIR_SOPE)/sope-gdl1 +DEP_DIRS = \ + ../GDLAccess \ + $(SOPE_ROOT)/sope-core/EOControl +ifneq ($(frameworks),yes) ADDITIONAL_LIB_DIRS += \ - -L$(RELBUILD_DIR_Core)/EOControl/$(GNUSTEP_OBJ_DIR_NAME) \ - -L$(RELBUILD_DIR_Gdl1)/GDLAccess/$(GNUSTEP_OBJ_DIR_NAME) \ - -L$(GNUSTEP_BUILD_DIR)/$(GNUSTEP_OBJ_DIR_NAME) + $(foreach dir,$(DEP_DIRS),\ + -L$(GNUSTEP_BUILD_DIR)/$(dir)/$(GNUSTEP_OBJ_DIR_NAME)) else ADDITIONAL_LIB_DIRS += \ - -L../GDLAccess/$(GNUSTEP_OBJ_DIR)\ - -L../../sope-core/EOControl/$(GNUSTEP_OBJ_DIR) + $(foreach dir,$(DEP_DIRS),-F$(GNUSTEP_BUILD_DIR)/$(dir)) endif -SYSTEM_LIB_DIR += \ - -L/usr/local/lib \ - -L/usr/lib +SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib diff --git a/sope-gdl1/SQLite3/Version b/sope-gdl1/SQLite3/Version index b6d35ff6..26ee2eeb 100644 --- a/sope-gdl1/SQLite3/Version +++ b/sope-gdl1/SQLite3/Version @@ -1,5 +1,5 @@ # Version file -SUBMINOR_VERSION:=19 +SUBMINOR_VERSION:=20 # v4.5.17 requires libGDLAccess v4.5.50 diff --git a/sope-ical/NGiCal/GNUmakefile.preamble b/sope-ical/NGiCal/GNUmakefile.preamble index 1d56597a..c7e2334c 100644 --- a/sope-ical/NGiCal/GNUmakefile.preamble +++ b/sope-ical/NGiCal/GNUmakefile.preamble @@ -53,4 +53,5 @@ SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib ifeq ($(FOUNDATION_LIB),apple) libNGiCal_PREBIND_ADDR="0xC1E00000" libNGiCal_LDFLAGS += -seg1addr $(libNGiCal_PREBIND_ADDR) +NGiCal_LDFLAGS += -seg1addr $(libNGiCal_PREBIND_ADDR) endif diff --git a/sope-ldap/NGLdap/ChangeLog b/sope-ldap/NGLdap/ChangeLog index 88926e93..7c9c7d8e 100644 --- a/sope-ldap/NGLdap/ChangeLog +++ b/sope-ldap/NGLdap/ChangeLog @@ -1,3 +1,8 @@ +2005-08-16 Helge Hess + + * GNUmakefile, GNUmakefile.preamble: added OSX framework compilation + (v4.5.24) + 2005-04-25 Helge Hess * fixed gcc 4.0 warnings (v4.5.23) diff --git a/sope-ldap/NGLdap/GNUmakefile b/sope-ldap/NGLdap/GNUmakefile index f65884e9..c42ae6ee 100644 --- a/sope-ldap/NGLdap/GNUmakefile +++ b/sope-ldap/NGLdap/GNUmakefile @@ -6,7 +6,12 @@ include ./Version GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_LOCAL_ROOT) +ifneq ($(frameworks),yes) LIBRARY_NAME = libNGLdap +else +FRAMEWORK_NAME = NGLdap +endif + libNGLdap_HEADER_FILES_DIR = . libNGLdap_HEADER_FILES_INSTALL_DIR = /NGLdap @@ -45,7 +50,21 @@ libNGLdap_OBJC_FILES = \ NGLdapGlobalID.m \ NGLdapFileManager.m \ + +# framework support + +NGLdap_HEADER_FILES = $(libNGLdap_HEADER_FILES) +NGLdap_OBJC_FILES = $(libNGLdap_OBJC_FILES) +NGLdap_SUBPROJECTS = $(libNGLdap_SUBPROJECTS) + + +# building + -include GNUmakefile.preamble +ifneq ($(frameworks),yes) include $(GNUSTEP_MAKEFILES)/library.make +else +include $(GNUSTEP_MAKEFILES)/framework.make +endif -include GNUmakefile.postamble -include fhs.make diff --git a/sope-ldap/NGLdap/GNUmakefile.preamble b/sope-ldap/NGLdap/GNUmakefile.preamble index d8ab652f..e8a9a2a2 100644 --- a/sope-ldap/NGLdap/GNUmakefile.preamble +++ b/sope-ldap/NGLdap/GNUmakefile.preamble @@ -6,15 +6,19 @@ ADDITIONAL_INCLUDE_DIRS += \ -I../../sope-core \ -I/usr/local/include -ifneq ($(FOUNDATION_LIB),apple) -ADDITIONAL_INCLUDE_DIRS += -I/usr/local/openldap/include -SYSTEM_LIB_DIR += -L/usr/local/openldap/lib -endif +ADDITIONAL_CPPFLAGS += -Wall -Wno-protocol +# dependencies libNGLdap_LIBRARIES_DEPEND_UPON += \ -lNGExtensions -lEOControl \ -lDOM -lSaxObjC +NGLdap_LIBRARIES_DEPEND_UPON += \ + -framework NGExtensions -framework EOControl \ + -framework DOM -framework SaxObjC + + +# OpenLDAP library dependencies ifeq ($(reentrant),yes) ADDITIONAL_CPPFLAGS += -D_REENTRANT=1 @@ -22,6 +26,10 @@ libNGLdap_LIBRARIES_DEPEND_UPON += -lldap_r -llber -lpthread else libNGLdap_LIBRARIES_DEPEND_UPON += -lldap -llber endif +NGLdap_LIBRARIES_DEPEND_UPON += $(libNGLdap_LIBRARIES_DEPEND_UPON) + + +# SASL/SSL dependencies ifneq ($(FOUNDATION_LIB),nx) @@ -32,41 +40,45 @@ ifneq ($(nossl),yes) libNGLdap_LIBRARIES_DEPEND_UPON += -lssl endif -else +else # is NeXT/Apple Foundation +# TODO: document whether Foundation includes required dependencies ADDITIONAL_LDFLAGS += -framework Foundation endif -ADDITIONAL_CPPFLAGS += -Wall -Wno-protocol +# library/framework search pathes -ifneq ($(GNUSTEP_BUILD_DIR),) -RELBUILD_DIR_SxCore=$(GNUSTEP_BUILD_DIR)/../../sope-core -RELBUILD_DIR_SxXml=$(GNUSTEP_BUILD_DIR)/../../sope-xml +DEP_DIRS = \ + $(SOPE_ROOT)/sope-core/NGStreams \ + $(SOPE_ROOT)/sope-core/NGExtensions \ + $(SOPE_ROOT)/sope-core/EOControl \ + $(SOPE_ROOT)/sope-xml/DOM \ + $(SOPE_ROOT)/sope-xml/SaxObjC +ifneq ($(frameworks),yes) ADDITIONAL_LIB_DIRS += \ - -L$(GNUSTEP_OBJ_DIR) \ - -L$(RELBUILD_DIR_SxCore)/NGStreams/$(GNUSTEP_OBJ_DIR_NAME) \ - -L$(RELBUILD_DIR_SxCore)/NGExtensions/$(GNUSTEP_OBJ_DIR_NAME) \ - -L$(RELBUILD_DIR_SxCore)/EOControl/$(GNUSTEP_OBJ_DIR_NAME) \ - -L$(RELBUILD_DIR_SxXml)/DOM/$(GNUSTEP_OBJ_DIR_NAME) \ - -L$(RELBUILD_DIR_SxXml)/SaxObjC/$(GNUSTEP_OBJ_DIR_NAME) + $(foreach dir,$(DEP_DIRS),\ + -L$(GNUSTEP_BUILD_DIR)/$(dir)/$(GNUSTEP_OBJ_DIR_NAME)) else ADDITIONAL_LIB_DIRS += \ - -L./$(GNUSTEP_OBJ_DIR) \ - -L../../sope-core/NGStreams/$(GNUSTEP_OBJ_DIR) \ - -L../../sope-core/NGExtensions/$(GNUSTEP_OBJ_DIR) \ - -L../../sope-xml/DOM/$(GNUSTEP_OBJ_DIR) \ - -L../../sope-xml/SaxObjC/$(GNUSTEP_OBJ_DIR) \ - -L../../sope-core/EOControl/$(GNUSTEP_OBJ_DIR) + $(foreach dir,$(DEP_DIRS),-F$(GNUSTEP_BUILD_DIR)/$(dir)) endif SYSTEM_LIB_DIR += -L/usr/local/lib + # Apple ifeq ($(FOUNDATION_LIB),apple) libNGLdap_PREBIND_ADDR="0xC1C00000" libNGLdap_LDFLAGS += -seg1addr $(libNGLdap_PREBIND_ADDR) +NGLdap_LDFLAGS += -seg1addr $(libNGLdap_PREBIND_ADDR) endif + +# only required on 10.2 and before? +#ifneq ($(FOUNDATION_LIB),apple) +#ADDITIONAL_INCLUDE_DIRS += -I/usr/local/openldap/include +#SYSTEM_LIB_DIR += -L/usr/local/openldap/lib +#endif diff --git a/sope-ldap/NGLdap/Version b/sope-ldap/NGLdap/Version index 9b70b742..19b1711d 100644 --- a/sope-ldap/NGLdap/Version +++ b/sope-ldap/NGLdap/Version @@ -2,4 +2,4 @@ MAJOR_VERSION=4 MINOR_VERSION=5 -SUBMINOR_VERSION:=23 +SUBMINOR_VERSION:=24 -- 2.39.5