From a3f0349edcc2cb94431e0766d5855f8dbcc8ac56 Mon Sep 17 00:00:00 2001 From: helge Date: Fri, 20 Aug 2004 20:08:20 +0000 Subject: [PATCH] fixed sope-ldap for SOPE 3.3 directory layout git-svn-id: http://svn.opengroupware.org/SOPE/trunk@13 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-ldap/GNUmakefile | 1 + sope-ldap/NGLdap/ChangeLog | 2 ++ sope-ldap/NGLdap/GNUmakefile | 2 +- sope-ldap/NGLdap/GNUmakefile.preamble | 43 ++++++++++++-------------- sope-ldap/NGLdap/Version | 4 ++- sope-ldap/samples/GNUmakefile | 1 - sope-ldap/samples/GNUmakefile.preamble | 16 ++++++---- sope-ldap/samples/common.h | 27 ++++++++++++++++ 8 files changed, 64 insertions(+), 32 deletions(-) create mode 100644 sope-ldap/samples/common.h diff --git a/sope-ldap/GNUmakefile b/sope-ldap/GNUmakefile index 8b94c1fe..fe9775fc 100644 --- a/sope-ldap/GNUmakefile +++ b/sope-ldap/GNUmakefile @@ -5,5 +5,6 @@ VERSION=4.3.0 SUBPROJECTS = \ NGLdap \ + samples include $(GNUSTEP_MAKEFILES)/aggregate.make diff --git a/sope-ldap/NGLdap/ChangeLog b/sope-ldap/NGLdap/ChangeLog index 87217d57..866b1ce7 100644 --- a/sope-ldap/NGLdap/ChangeLog +++ b/sope-ldap/NGLdap/ChangeLog @@ -1,5 +1,7 @@ 2004-08-20 Helge Hess + * fixed for SOPE 3.3 directory layout (v4.3.19) + * moved to sope-ldap * moved to SOPE 4.3 (v4.3.18) diff --git a/sope-ldap/NGLdap/GNUmakefile b/sope-ldap/NGLdap/GNUmakefile index d50d1390..dc225ec6 100644 --- a/sope-ldap/NGLdap/GNUmakefile +++ b/sope-ldap/NGLdap/GNUmakefile @@ -1,6 +1,6 @@ # $Id$ -include ../common.make +include $(GNUSTEP_MAKEFILES)/common.make GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_LOCAL_ROOT) diff --git a/sope-ldap/NGLdap/GNUmakefile.preamble b/sope-ldap/NGLdap/GNUmakefile.preamble index 914d90b1..bf01cd36 100644 --- a/sope-ldap/NGLdap/GNUmakefile.preamble +++ b/sope-ldap/NGLdap/GNUmakefile.preamble @@ -1,4 +1,13 @@ -# $Id$ +# compiler flags + + +ADDITIONAL_INCLUDE_DIRS += \ + -I.. \ + -I../../sope-core/NGExtensions \ + -I../../sope-core \ + -I/usr/local/include \ + -I/usr/local/openldap/include + libNGLdap_LIBRARIES_DEPEND_UPON += \ -lNGExtensions -lEOControl \ @@ -22,29 +31,16 @@ endif else -libNGLdap_LIBRARIES_DEPEND_UPON += -lFoundationExt ADDITIONAL_LDFLAGS += -framework Foundation -ADDITIONAL_TOOL_LIBS += -lFoundationExt endif -ldap2dsml_TOOL_LIBS += -lSaxObjC +ADDITIONAL_CPPFLAGS += -Wall -Wno-protocol -ADDITIONAL_TOOL_LIBS += -lNGLdap -lNGExtensions -lEOControl -#ADDITIONAL_TOOL_LIBS = $(libNGLdap_LIBRARIES_DEPEND_UPON) - -ADDITIONAL_CPPFLAGS += -Wall -Wno-protocol - -ADDITIONAL_INCLUDE_DIRS += \ - -I.. \ - -I../NGStreams \ - -I../NGExtensions \ - -I/usr/local/include \ - -I/usr/local/openldap/include ifneq ($(GNUSTEP_BUILD_DIR),) -RELBUILD_DIR_SxCore=$(GNUSTEP_BUILD_DIR)/.. -RELBUILD_DIR_SxXml=$(GNUSTEP_BUILD_DIR)/../../skyrix-xml +RELBUILD_DIR_SxCore=$(GNUSTEP_BUILD_DIR)/../../sope-core +RELBUILD_DIR_SxXml=$(GNUSTEP_BUILD_DIR)/../../sope-xml ADDITIONAL_LIB_DIRS += \ -L$(GNUSTEP_OBJ_DIR) \ @@ -55,15 +51,16 @@ ADDITIONAL_LIB_DIRS += \ -L$(RELBUILD_DIR_SxXml)/SaxObjC/$(GNUSTEP_OBJ_DIR_NAME) else ADDITIONAL_LIB_DIRS += \ - -L./$(GNUSTEP_OBJ_DIR) \ - -L../NGStreams/$(GNUSTEP_OBJ_DIR) \ - -L../NGExtensions/$(GNUSTEP_OBJ_DIR) \ - -L../../skyrix-xml/SaxObjC/$(GNUSTEP_OBJ_DIR) \ - -L../EOControl/$(GNUSTEP_OBJ_DIR) + -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) endif ADDITIONAL_LIB_DIRS += \ - -L/usr/local/lib \ + -L/usr/local/lib \ -L/usr/local/openldap/lib # Apple diff --git a/sope-ldap/NGLdap/Version b/sope-ldap/NGLdap/Version index cd35ad0f..0a020cb6 100644 --- a/sope-ldap/NGLdap/Version +++ b/sope-ldap/NGLdap/Version @@ -1,3 +1,5 @@ # $Id$ -SUBMINOR_VERSION:=18 +MAJOR_VERSION=4 +MINOR_VERSION=3 +SUBMINOR_VERSION:=19 diff --git a/sope-ldap/samples/GNUmakefile b/sope-ldap/samples/GNUmakefile index a25605b5..67e844ed 100644 --- a/sope-ldap/samples/GNUmakefile +++ b/sope-ldap/samples/GNUmakefile @@ -6,7 +6,6 @@ TOOL_NAME = \ ldapls \ ldap2dsml \ ldapchkpwd \ - imapquota \ ldapls_OBJC_FILES = ldapls.m ldap2dsml_OBJC_FILES = ldap2dsml.m diff --git a/sope-ldap/samples/GNUmakefile.preamble b/sope-ldap/samples/GNUmakefile.preamble index ac2cfcb6..97276355 100644 --- a/sope-ldap/samples/GNUmakefile.preamble +++ b/sope-ldap/samples/GNUmakefile.preamble @@ -1,14 +1,18 @@ # $Id$ ADDITIONAL_INCLUDE_DIRS += \ - -I.. \ - -I../NGStreams \ - -I../NGExtensions \ + -I.. \ + -I../../sope-core/NGStreams \ + -I../../sope-core/NGExtensions \ + -I../../sope-core \ + -I../../sope-xml \ ADDITIONAL_LIB_DIRS += \ - -L../EOControl/$(GNUSTEP_OBJ_DIR) \ - -L../NGExtensions/$(GNUSTEP_OBJ_DIR) \ - -L../NGStreams/$(GNUSTEP_OBJ_DIR) \ + -L../../sope-core/EOControl/$(GNUSTEP_OBJ_DIR) \ + -L../../sope-core/NGExtensions/$(GNUSTEP_OBJ_DIR) \ + -L../../sope-core/NGStreams/$(GNUSTEP_OBJ_DIR) \ + -L../../sope-xml/DOM/$(GNUSTEP_OBJ_DIR) \ + -L../../sope-xml/SaxObjC/$(GNUSTEP_OBJ_DIR) \ -L../NGLdap/$(GNUSTEP_OBJ_DIR) \ ADDITIONAL_TOOL_LIBS += \ diff --git a/sope-ldap/samples/common.h b/sope-ldap/samples/common.h new file mode 100644 index 00000000..05fc4142 --- /dev/null +++ b/sope-ldap/samples/common.h @@ -0,0 +1,27 @@ +/* + Copyright (C) 2000-2004 SKYRIX Software AG + + This file is part of OpenGroupware.org. + + OGo is free software; you can redistribute it and/or modify it under + the terms of the GNU Lesser General Public License as published by the + Free Software Foundation; either version 2, or (at your option) any + later version. + + OGo is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with OGo; see the file COPYING. If not, write to the + Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. +*/ + +#import + +#if !LIB_FOUNDATION_LIBRARY +# include +# include +#endif -- 2.39.5