+2005-08-16 Helge Hess <helge.hess@opengroupware.org>
+
+ * GNUmakefile, GNUmakefile.preamble: added OSX framework compilation
+ (v4.5.60)
+
2005-08-06 Helge Hess <helge.hess@opengroupware.org>
* iCalCalendar.m, NGVCardName.m: fixed gcc 4.0 warnings (v4.5.59)
include $(GNUSTEP_MAKEFILES)/common.make
include ./Version
+ifneq ($(frameworks),yes)
LIBRARY_NAME = libNGiCal
+else
+FRAMEWORK_NAME = NGiCal
+endif
+
libNGiCal_HEADER_FILES_DIR = .
libNGiCal_HEADER_FILES_INSTALL_DIR = /NGiCal
# IcalElements.m
# IcalResponse.m
+
+# framework support
+
+NGiCal_HEADER_FILES = $(libNGiCal_HEADER_FILES)
+NGiCal_OBJC_FILES = $(libNGiCal_OBJC_FILES)
+NGiCal_SUBPROJECTS = $(libNGiCal_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
# compilation settings
+SOPE_ROOT=../..
+
ADDITIONAL_CPPFLAGS += \
-Wall -DCOMPILE_FOR_GSTEP_MAKE=1 \
-DSOPE_MAJOR_VERSION=$(MAJOR_VERSION) \
ADDITIONAL_INCLUDE_DIRS += \
-I. -I.. \
- -I../../sope-core/NGExtensions/ \
- -I../../sope-core \
- -I../../sope-xml
+ -I$(SOPE_ROOT)/sope-core/NGExtensions/ \
+ -I$(SOPE_ROOT)/sope-core \
+ -I$(SOPE_ROOT)/sope-xml
+
+
+# dependencies
libNGiCal_LIBRARIES_DEPEND_UPON += \
-lNGExtensions \
-lEOControl \
+ -lDOM \
-lSaxObjC
-libNGiCal_LIBRARIES_DEPEND_UPON += \
- -lDOM
-
-ifneq ($(GNUSTEP_BUILD_DIR),)
-RELBUILD_DIR_SxCore=$(GNUSTEP_BUILD_DIR)/../../sope-core
-RELBUILD_DIR_SxXml=$(GNUSTEP_BUILD_DIR)/../../sope-xml
-
-libNGiCal_LIB_DIRS += \
- -L$(GNUSTEP_OBJ_DIR) \
- -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)
+NGiCal_LIBRARIES_DEPEND_UPON += \
+ -framework NGExtensions -framework EOControl \
+ -framework DOM -framework SaxObjC
+
+
+# library/framework search pathes
+
+DEP_DIRS = \
+ $(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 += \
+ $(foreach dir,$(DEP_DIRS),\
+ -L$(GNUSTEP_BUILD_DIR)/$(dir)/$(GNUSTEP_OBJ_DIR_NAME))
else
-libNGiCal_LIB_DIRS += \
- -L./$(GNUSTEP_OBJ_DIR) \
- -L../../sope-core/NGExtensions/$(GNUSTEP_OBJ_DIR) \
- -L../../sope-core/EOControl/$(GNUSTEP_OBJ_DIR) \
- -L../../sope-xml/DOM/$(GNUSTEP_OBJ_DIR) \
- -L../../sope-xml/SaxObjC/$(GNUSTEP_OBJ_DIR)
+ADDITIONAL_LIB_DIRS += \
+ $(foreach dir,$(DEP_DIRS),-F$(GNUSTEP_BUILD_DIR)/$(dir))
endif
+SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
# Apple
MAJOR_VERSION=4
MINOR_VERSION=5
-SUBMINOR_VERSION:=59
+SUBMINOR_VERSION:=60
# v4.5.40 requires NGExtensions v4.5.145
# v4.5.37 requires NGExtensions v4.5.140
+2005-08-16 Helge Hess <helge.hess@opengroupware.org>
+
+ * link tools against OSX frameworks if configured so
+
2005-05-06 Helge Hess <helge.hess@opengroupware.org>
* renamed ical3.m to icalds.m, ical2.m to icalparsetest
vcf2xml_OBJC_FILES = vcf2xml.m
vcfparsetest_OBJC_FILES = vcfparsetest.m
-icalparsetest_TOOL_LIBS += -lNGiCal -lSaxObjC
-icalds_TOOL_LIBS += -lNGiCal -lSaxObjC
-vcf2xml_TOOL_LIBS += -lSaxObjC
-vcfparsetest_TOOL_LIBS += -lNGiCal -lSaxObjC
-
-include GNUmakefile.preamble
include $(GNUSTEP_MAKEFILES)/tool.make
-include GNUmakefile.postamble
# compilation flags
+SOPE_ROOT=../..
SOPE_CORE="../../sope-core"
SOPE_XML="../../sope-xml"
-I$(SOPE_CORE)/NGStreams \
-I$(SOPE_CORE)/NGExtensions \
-ADDITIONAL_LIB_DIRS += \
- -L../NGiCal/$(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)
-SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
+# dependencies
+ifneq ($(frameworks),yes)
+icalparsetest_TOOL_LIBS += -lNGiCal
+icalds_TOOL_LIBS += -lNGiCal
+vcfparsetest_TOOL_LIBS += -lNGiCal
+
ADDITIONAL_TOOL_LIBS += \
-lNGStreams -lNGExtensions -lEOControl \
-lDOM -lSaxObjC
+else
+icalparsetest_TOOL_LIBS += -framework NGiCal
+icalds_TOOL_LIBS += -framework NGiCal
+vcfparsetest_TOOL_LIBS += -framework NGiCal
+
+ADDITIONAL_TOOL_LIBS += \
+ -framework NGStreams -framework NGExtensions -framework EOControl \
+ -framework DOM -framework SaxObjC
+endif
+
+
+# library/framework search pathes
+
+DEP_DIRS = \
+ ../NGiCal/ \
+ $(SOPE_ROOT)/sope-core/NGExtensions \
+ $(SOPE_ROOT)/sope-core/NGStreams \
+ $(SOPE_ROOT)/sope-core/EOControl \
+ $(SOPE_ROOT)/sope-xml/DOM \
+ $(SOPE_ROOT)/sope-xml/SaxObjC
+
+ifneq ($(frameworks),yes)
+ADDITIONAL_LIB_DIRS += \
+ $(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
+2005-08-16 Helge Hess <helge.hess@opengroupware.org>
+
+ * GNUmakefile.preamble: added support for OSX frameworks (v4.5.17)
+
2005-06-02 Helge Hess <helge.hess@skyrix.com>
* VSSaxDriver.m: transparently decode property values if
-I$(SOPE_ROOT)/sope-xml \
-I$(SOPE_ROOT)/sope-core/NGExtensions
-BUNDLE_LIBS += \
- -lSaxObjC
+# dependencies
+
+ifneq ($(frameworks),yes)
+BUNDLE_LIBS += -lSaxObjC
+else
+BUNDLE_LIBS += -framework SaxObjC
+endif
ADDITIONAL_BUNDLE_LIBS += $(BUNDLE_LIBS)
-ADDITIONAL_LIB_DIRS += \
- -L$(SOPE_OBJ_ROOT)/sope-xml/SaxObjC/$(GNUSTEP_OBJ_DIR_NAME)
+
+# library/framework search pathes
+
+DEP_DIRS = \
+ $(SOPE_ROOT)/sope-core/NGExtensions \
+ $(SOPE_ROOT)/sope-xml/SaxObjC
+
+ifneq ($(frameworks),yes)
+ADDITIONAL_LIB_DIRS += \
+ $(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
/*
- Copyright (C) 2003-2004 Max Berger
- Copyright (C) 2004-2005 OpenGroupware.org
-
- This file is part of versitSaxDriver, written for the OpenGroupware.org
- project (OGo).
-
- SOPE 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.
-
- SOPE 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.
+ Copyright (C) 2003-2004 Max Berger
+ Copyright (C) 2004-2005 OpenGroupware.org
- You should have received a copy of the GNU Lesser General Public
- License along with SOPE; see the file COPYING. If not, write to the
- Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA.
+ This file is part of versitSaxDriver, written for the OpenGroupware.org
+ project (OGo).
+
+ SOPE 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.
+
+ SOPE 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 SOPE; see the file COPYING. If not, write to the
+ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+ 02111-1307, USA.
*/
#include "VSSaxDriver.h"
# Version file
-SUBMINOR_VERSION:=16
+SUBMINOR_VERSION:=17
projects / sope / commitdiff