From f57ae3d81a455392d1ed353ee60dac2ddef463ea Mon Sep 17 00:00:00 2001 From: helge Date: Wed, 10 Aug 2005 00:09:04 +0000 Subject: [PATCH] prepared for OSX frameworks (not finished) git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1023 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-appserver/ChangeLog | 4 ++ sope-appserver/NGObjWeb/GNUmakefile | 25 +++++++- sope-appserver/NGObjWeb/GNUmakefile.preamble | 63 ++++++++++++------- sope-appserver/NGObjWeb/WOApplication.m | 2 +- sope-appserver/NGXmlRpc/GNUmakefile | 16 +++++ sope-appserver/NGXmlRpc/GNUmakefile.preamble | 6 +- sope-appserver/SoOFS/GNUmakefile | 19 ++++++ sope-appserver/WEExtensions/GNUmakefile | 24 ++++++- .../WEExtensions/GNUmakefile.preamble | 63 ++++++++++--------- sope-appserver/WEPrototype/GNUmakefile | 23 ++++++- sope-appserver/WOExtensions/GNUmakefile | 22 +++++++ sope-appserver/WOXML/GNUmakefile | 24 ++++++- 12 files changed, 232 insertions(+), 59 deletions(-) diff --git a/sope-appserver/ChangeLog b/sope-appserver/ChangeLog index a66aa879..599748db 100644 --- a/sope-appserver/ChangeLog +++ b/sope-appserver/ChangeLog @@ -1,3 +1,7 @@ +2005-08-10 Helge Hess + + * prepared for OSX frameworks + 2005-01-04 Marcus Mueller * sope-appserver.xcode: added SoOFS product diff --git a/sope-appserver/NGObjWeb/GNUmakefile b/sope-appserver/NGObjWeb/GNUmakefile index 0572a218..d97ce0e5 100644 --- a/sope-appserver/NGObjWeb/GNUmakefile +++ b/sope-appserver/NGObjWeb/GNUmakefile @@ -6,7 +6,13 @@ include ./Version GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_LOCAL_ROOT) -LIBRARY_NAME = libNGObjWeb +ifneq ($(frameworks),yes) +LIBRARY_NAME = libNGObjWeb +else +FRAMEWORK_NAME = NGObjWeb +endif + + ifeq ($(FHS_INSTALL_ROOT),) RESOURCES_DIR = $(GNUSTEP_RESOURCES)/NGObjWeb else @@ -142,6 +148,15 @@ ifeq ($(FOUNDATION_LIB),fd) NGObjWebCore_OBJC_FILES += WOServerDefaults.m endif + +# framework support + +NGObjWeb_HEADER_FILES_DIR = NGObjWeb +NGObjWeb_HEADER_FILES = $(libNGObjWeb_HEADER_FILES) +NGObjWeb_OBJC_FILES = $(libNGObjWeb_OBJC_FILES) +NGObjWeb_SUBPROJECTS = $(libNGObjWeb_SUBPROJECTS) + + # ----- SoCore product for SOPE core registrations BUNDLE_NAME = SoCore @@ -152,6 +167,7 @@ SoCore_OBJC_FILES = SoCoreProduct.m SoCore_RESOURCE_FILES = SoObjects/product.plist Version SoCore_PRINCIPAL_CLASS = SoCoreProduct + # ----- NGObjWeb tools TOOL_NAME = wod @@ -162,8 +178,15 @@ wod_OBJC_FILES += UnixSignalHandler.m endif wod_SUBPROJECTS = Templates Associations + +# building + -include GNUmakefile.preamble +ifneq ($(frameworks),yes) include $(GNUSTEP_MAKEFILES)/library.make +else +include $(GNUSTEP_MAKEFILES)/framework.make +endif include $(GNUSTEP_MAKEFILES)/bundle.make include $(GNUSTEP_MAKEFILES)/tool.make -include GNUmakefile.postamble diff --git a/sope-appserver/NGObjWeb/GNUmakefile.preamble b/sope-appserver/NGObjWeb/GNUmakefile.preamble index 3f67425d..76ce0045 100644 --- a/sope-appserver/NGObjWeb/GNUmakefile.preamble +++ b/sope-appserver/NGObjWeb/GNUmakefile.preamble @@ -1,5 +1,11 @@ # compilation settings +ifeq ($(FOUNDATION_LIB),apple) +NGObjWeb_INSTALL_DIR = /Library/Frameworks/ +endif + +SOPE_ROOT=../.. + ADDITIONAL_CPPFLAGS += \ -Wall -DCOMPILE_FOR_GSTEP_MAKE=1 \ -DSOPE_MAJOR_VERSION=$(MAJOR_VERSION) \ @@ -23,45 +29,53 @@ ADDITIONAL_INCLUDE_DIRS += \ -I$(SOPE_ROOT)/sope-mime -ifneq ($(GNUSTEP_BUILD_DIR),) -RELBUILD_DIR_SOPE=$(GNUSTEP_BUILD_DIR)/.. -RELBUILD_DIR_MIME=$(GNUSTEP_BUILD_DIR)/../../sope-mime -RELBUILD_DIR_SxCore=$(GNUSTEP_BUILD_DIR)/../../sope-core -RELBUILD_DIR_SxXml=$(GNUSTEP_BUILD_DIR)/../../sope-xml +# library/framework search pathes + +DEP_DIRS = \ + $(SOPE_ROOT)/sope-mime \ + $(SOPE_ROOT)/sope-core/NGStreams \ + $(SOPE_ROOT)/sope-core/NGExtensions \ + $(SOPE_ROOT)/sope-core/EOControl \ + $(SOPE_ROOT)/sope-xml/DOM \ + $(SOPE_ROOT)/sope-xml/XmlRpc \ + $(SOPE_ROOT)/sope-xml/SaxObjC +ifneq ($(frameworks),yes) ADDITIONAL_LIB_DIRS += \ - -L./$(GNUSTEP_OBJ_DIR) \ - -L$(GNUSTEP_BUILD_DIR)/$(GNUSTEP_OBJ_DIR_NAME) \ - -L$(RELBUILD_DIR_MIME)/$(GNUSTEP_OBJ_DIR_NAME) \ - -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)/XmlRpc/$(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 -libNGObjWeb_LIB_DIRS += \ - -L./$(GNUSTEP_OBJ_DIR) \ - -L$(SOPE_ROOT)/sope-mime/$(GNUSTEP_OBJ_DIR) \ - -L$(CORE_ROOT)/NGStreams/$(GNUSTEP_OBJ_DIR) \ - -L$(CORE_ROOT)/NGExtensions/$(GNUSTEP_OBJ_DIR) \ - -L$(CORE_ROOT)/EOControl/$(GNUSTEP_OBJ_DIR) \ - -L$(SOPE_ROOT)/sope-xml/XmlRpc/$(GNUSTEP_OBJ_DIR) \ - -L$(SOPE_ROOT)/sope-xml/DOM/$(GNUSTEP_OBJ_DIR) \ - -L$(SOPE_ROOT)/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 + +# dependencies + libNGObjWeb_LIBRARIES_DEPEND_UPON += \ -lNGMime -lNGStreams -lNGExtensions -lEOControl \ -lXmlRpc -lDOM -lSaxObjC +NGObjWeb_LIBRARIES_DEPEND_UPON += \ + -framework NGMime \ + -framework NGStreams -framework NGExtensions -framework EOControl \ + -framework XmlRpc -framework DOM -framework SaxObjC -wod_LIB_DIRS += $(libNGObjWeb_LIB_DIRS) +wod_LIB_DIRS += $(libNGObjWeb_LIB_DIRS) -F. +ifneq ($(frameworks),yes) wod_TOOL_LIBS += \ -lNGObjWeb \ -lNGMime -lNGStreams -lNGExtensions -lEOControl \ -lXmlRpc -lDOM -lSaxObjC +else +wod_TOOL_LIBS += \ + -framework NGObjWeb \ + -framework NGMime \ + -framework NGStreams -framework NGExtensions -framework EOControl \ + -framework XmlRpc -framework DOM -framework SaxObjC +endif + # platform specific settings @@ -78,6 +92,7 @@ endif ifeq ($(FOUNDATION_LIB),apple) libNGObjWeb_PREBIND_ADDR="0xC4900000" libNGObjWeb_LDFLAGS += -seg1addr $(libNGObjWeb_PREBIND_ADDR) +NGObjWeb_LDFLAGS += -seg1addr $(libNGObjWeb_PREBIND_ADDR) endif ifeq ($(FOUNDATION_LIB),nx) diff --git a/sope-appserver/NGObjWeb/WOApplication.m b/sope-appserver/NGObjWeb/WOApplication.m index a0e86416..baeac029 100644 --- a/sope-appserver/NGObjWeb/WOApplication.m +++ b/sope-appserver/NGObjWeb/WOApplication.m @@ -1203,7 +1203,7 @@ nbuckets, nindices, narrays, idxsize); [r setHeader:@"text/html" forKey:@"content-type"]; [r setHeader:@"no-cache" forKey:@"cache-control"]; - if(rapidTurnAroundPath != nil) { + if (rapidTurnAroundPath != nil) { NSURL *templateURL; templateURL = [[_exc userInfo] objectForKey:@"templateURL"]; diff --git a/sope-appserver/NGXmlRpc/GNUmakefile b/sope-appserver/NGXmlRpc/GNUmakefile index 1effd505..aede91dd 100644 --- a/sope-appserver/NGXmlRpc/GNUmakefile +++ b/sope-appserver/NGXmlRpc/GNUmakefile @@ -5,7 +5,11 @@ include $(GNUSTEP_MAKEFILES)/common.make include ../Version include ./Version +ifneq ($(frameworks),yes) LIBRARY_NAME = libNGXmlRpc +else +FRAMEWORK_NAME = NGXmlRpc +endif libNGXmlRpc_SOVERSION=$(MAJOR_VERSION).$(MINOR_VERSION) libNGXmlRpc_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBMINOR_VERSION) @@ -50,8 +54,20 @@ libNGXmlRpc_OBJC_FILES = \ NGXmlRpcAction+Registry.m \ +# framework support + +NGXmlRpc_HEADER_FILES = $(libNGXmlRpc_HEADER_FILES) +NGXmlRpc_OBJC_FILES = $(libNGXmlRpc_OBJC_FILES) + + +# 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-appserver/NGXmlRpc/GNUmakefile.preamble b/sope-appserver/NGXmlRpc/GNUmakefile.preamble index e366fdcc..7fd90095 100644 --- a/sope-appserver/NGXmlRpc/GNUmakefile.preamble +++ b/sope-appserver/NGXmlRpc/GNUmakefile.preamble @@ -1,8 +1,12 @@ -# $Id$ +# compilation settings SOPE_ROOT=../.. CORE_ROOT=$(SOPE_ROOT)/sope-core +ifeq ($(FOUNDATION_LIB),apple) +NGXmlRpc_INSTALL_DIR = /Library/Frameworks/ +endif + ADDITIONAL_CPPFLAGS += -Wall -DCOMPILE_FOR_GSTEP_MAKE=1 ADDITIONAL_OBJCFLAGS += -Wall -Wno-import -Wno-protocol diff --git a/sope-appserver/SoOFS/GNUmakefile b/sope-appserver/SoOFS/GNUmakefile index 54b720b8..a4639ff9 100644 --- a/sope-appserver/SoOFS/GNUmakefile +++ b/sope-appserver/SoOFS/GNUmakefile @@ -5,7 +5,13 @@ include $(GNUSTEP_MAKEFILES)/common.make include ../Version include ./Version +# TODO: clash between bundle and libname! +ifneq ($(frameworks),yes) LIBRARY_NAME = libSoOFS +else +FRAMEWORK_NAME = SoOFS +endif + libSoOFS_SOVERSION=$(MAJOR_VERSION).$(MINOR_VERSION) libSoOFS_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBMINOR_VERSION) @@ -52,6 +58,13 @@ libSoOFS_OBJC_FILES = \ OFSChangeLog.m \ OFSFolderDataSource.m \ + +# framework support + +SoOFS_HEADER_FILES = $(libSoOFS_HEADER_FILES) +SoOFS_OBJC_FILES = $(libSoOFS_OBJC_FILES) + + # ----- SoCore product for SOPE core registrations BUNDLE_NAME = SoOFS @@ -62,6 +75,7 @@ SoOFS_OBJC_FILES = SoOFSProduct.m SoOFS_RESOURCE_FILES = product.plist Version SoOFS_PRINCIPAL_CLASS = SoOFSProduct + # ----- NGObjWeb tools SOPED_NAME=sope-$(MAJOR_VERSION).$(MINOR_VERSION) @@ -70,8 +84,13 @@ TOOL_NAME = $(SOPED_NAME) $(SOPED_NAME)_OBJC_FILES = sope.m + -include GNUmakefile.preamble +ifneq ($(frameworks),yes) include $(GNUSTEP_MAKEFILES)/library.make +else +include $(GNUSTEP_MAKEFILES)/framework.make +endif include $(GNUSTEP_MAKEFILES)/bundle.make include $(GNUSTEP_MAKEFILES)/tool.make -include GNUmakefile.postamble diff --git a/sope-appserver/WEExtensions/GNUmakefile b/sope-appserver/WEExtensions/GNUmakefile index a441d891..26735c51 100644 --- a/sope-appserver/WEExtensions/GNUmakefile +++ b/sope-appserver/WEExtensions/GNUmakefile @@ -5,7 +5,13 @@ include $(GNUSTEP_MAKEFILES)/common.make include ../Version include ./Version -LIBRARY_NAME = libWEExtensions +ifneq ($(frameworks),yes) +LIBRARY_NAME = libWEExtensions +else +FRAMEWORK_NAME = WEExtensions +endif + + BUNDLE_NAME = WEExtensions BUNDLE_EXTENSION = .wox BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/WOxElemBuilders-$(MAJOR_VERSION).$(MINOR_VERSION)/ @@ -66,11 +72,27 @@ libWEExtensions_OBJC_FILES = \ libWEExtensions_SUBPROJECTS += \ WETableView + +# framework support + +WEExtensions_HEADER_FILES = $(libWEExtensions_HEADER_FILES) +WEExtensions_OBJC_FILES = $(libWEExtensions_OBJC_FILES) +WEExtensions_SUBPROJECTS = $(libWEExtensions_SUBPROJECTS) + +# bundle + WEExtensions_OBJC_FILES = WEExtensionsBundle.m WEExtensions_PRINCIPAL_CLASS = WEExtensionsBundle + +# building + -include GNUmakefile.preamble +ifneq ($(frameworks),yes) include $(GNUSTEP_MAKEFILES)/library.make include $(GNUSTEP_MAKEFILES)/bundle.make +else +include $(GNUSTEP_MAKEFILES)/framework.make +endif -include GNUmakefile.postamble -include fhs.make diff --git a/sope-appserver/WEExtensions/GNUmakefile.preamble b/sope-appserver/WEExtensions/GNUmakefile.preamble index c2c8efc6..edfcf4f2 100644 --- a/sope-appserver/WEExtensions/GNUmakefile.preamble +++ b/sope-appserver/WEExtensions/GNUmakefile.preamble @@ -1,13 +1,14 @@ # compiler flags +SOPE_ROOT=../.. ADDITIONAL_CPPFLAGS += -Wall ADDITIONAL_INCLUDE_DIRS += \ - -I.. -I../.. -I../NGObjWeb \ - -I../../sope-core/NGStreams \ - -I../../sope-core/NGExtensions \ - -I../../sope-core \ - -I../../sope-xml + -I.. -I$(SOPE_ROOT) -I../NGObjWeb \ + -I$(SOPE_ROOT)/sope-core/NGStreams \ + -I$(SOPE_ROOT)/sope-core/NGExtensions \ + -I$(SOPE_ROOT)/sope-core \ + -I$(SOPE_ROOT)/sope-xml ifneq ($(GNUSTEP_BUILD_DIR),) @@ -23,41 +24,47 @@ endif libWEExtensions_SOVERSION=$(MAJOR_VERSION).$(MINOR_VERSION) libWEExtensions_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBMINOR_VERSION) + +# dependencies + libWEExtensions_LIBRARIES_DEPEND_UPON += \ -lNGObjWeb \ -lNGMime \ -lNGStreams -lNGExtensions -lEOControl \ -lXmlRpc -lDOM -lSaxObjC -ifneq ($(GNUSTEP_BUILD_DIR),) -RELBUILD_DIR_APPSERVER=$(GNUSTEP_BUILD_DIR)/.. -RELBUILD_DIR_MIME=$(GNUSTEP_BUILD_DIR)/../../sope-mime -RELBUILD_DIR_SxCore=$(GNUSTEP_BUILD_DIR)/../../sope-core -RELBUILD_DIR_SxXml=$(GNUSTEP_BUILD_DIR)/../../sope-xml +WEExtensions_LIBRARIES_DEPEND_UPON += \ + -framework NGObjWeb \ + -framework NGMime \ + -framework NGStreams -framework NGExtensions -framework EOControl \ + -framework XmlRpc -framework DOM -framework SaxObjC + + +# library/framework search pathes +DEP_DIRS = \ + $(SOPE_ROOT)/sope-mime \ + $(SOPE_ROOT)/sope-core/NGStreams \ + $(SOPE_ROOT)/sope-core/NGExtensions \ + $(SOPE_ROOT)/sope-core/EOControl \ + $(SOPE_ROOT)/sope-xml/DOM \ + $(SOPE_ROOT)/sope-xml/XmlRpc \ + $(SOPE_ROOT)/sope-xml/SaxObjC + +ifneq ($(frameworks),yes) ADDITIONAL_LIB_DIRS += \ - -L$(GNUSTEP_OBJ_DIR) \ - -L$(RELBUILD_DIR_APPSERVER)/NGObjWeb/$(GNUSTEP_OBJ_DIR_NAME) \ - -L$(RELBUILD_DIR_MIME)/$(GNUSTEP_OBJ_DIR_NAME) \ - -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)/XmlRpc/$(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../NGObjWeb/$(GNUSTEP_OBJ_DIR) \ - -L../../sope-mime/$(GNUSTEP_OBJ_DIR) \ - -L../../sope-core/NGStreams/$(GNUSTEP_OBJ_DIR) \ - -L../../sope-core/NGExtensions/$(GNUSTEP_OBJ_DIR) \ - -L../../sope-core/EOControl/$(GNUSTEP_OBJ_DIR) \ - -L../../sope-xml/XmlRpc/$(GNUSTEP_OBJ_DIR) \ - -L../../sope-xml/DOM/$(GNUSTEP_OBJ_DIR) \ - -L../../sope-xml/SaxObjC/$(GNUSTEP_OBJ_DIR) + $(foreach dir,$(DEP_DIRS),-F$(GNUSTEP_BUILD_DIR)/$(dir)) endif +SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib + + +# bundle dependencies + WEExtensions_BUNDLE_LIBS += \ -lWEExtensions \ -lNGObjWeb \ diff --git a/sope-appserver/WEPrototype/GNUmakefile b/sope-appserver/WEPrototype/GNUmakefile index 7209794a..175f8d06 100644 --- a/sope-appserver/WEPrototype/GNUmakefile +++ b/sope-appserver/WEPrototype/GNUmakefile @@ -5,7 +5,14 @@ include $(GNUSTEP_MAKEFILES)/common.make include ../Version include ./Version -LIBRARY_NAME = libWEPrototype +ifneq ($(frameworks),yes) +LIBRARY_NAME = libWEPrototype +else +FRAMEWORK_NAME = WEPrototype +endif + + +# TODO: can we save the .wox with frameworks? BUNDLE_NAME = WEPrototype BUNDLE_EXTENSION = .wox BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/WOxElemBuilders-$(MAJOR_VERSION).$(MINOR_VERSION)/ @@ -25,8 +32,22 @@ libWEPrototype_OBJC_FILES = \ WEPrototype_OBJC_FILES = WEPrototypeBundle.m WEPrototype_PRINCIPAL_CLASS = WEPrototypeBundle +# framework support + +WEPrototype_HEADER_FILES_DIR = WEPrototype +WEPrototype_HEADER_FILES = $(libWEPrototype_HEADER_FILES) +WEPrototype_OBJC_FILES = $(libWEPrototype_OBJC_FILES) +WEPrototype_SUBPROJECTS = $(libWEPrototype_SUBPROJECTS) + + +# building + -include GNUmakefile.preamble +ifneq ($(frameworks),yes) include $(GNUSTEP_MAKEFILES)/library.make +else +include $(GNUSTEP_MAKEFILES)/framework.make +endif include $(GNUSTEP_MAKEFILES)/bundle.make -include GNUmakefile.postamble -include fhs.make diff --git a/sope-appserver/WOExtensions/GNUmakefile b/sope-appserver/WOExtensions/GNUmakefile index 77317100..c5569816 100644 --- a/sope-appserver/WOExtensions/GNUmakefile +++ b/sope-appserver/WOExtensions/GNUmakefile @@ -5,7 +5,14 @@ include $(GNUSTEP_MAKEFILES)/common.make include ../Version include ./Version +ifneq ($(frameworks),yes) LIBRARY_NAME = libWOExtensions +else +FRAMEWORK_NAME = WOExtensions +endif + + +# TODO: can we save the .wox with frameworks? BUNDLE_NAME = WOExtensions BUNDLE_EXTENSION = .wox BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/WOxElemBuilders-$(MAJOR_VERSION).$(MINOR_VERSION)/ @@ -41,8 +48,23 @@ libWOExtensions_OBJC_FILES = \ WOExtensions_OBJC_FILES += WOExtensionsBuilderModule.m WOExtensions_PRINCIPAL_CLASS = WOExtensionsBuilderModule + +# framework support + +WOExtensions_HEADER_FILES_DIR = WOExtensions +WOExtensions_HEADER_FILES = $(libWOExtensions_HEADER_FILES) +WOExtensions_OBJC_FILES = $(libWOExtensions_OBJC_FILES) +WOExtensions_SUBPROJECTS = $(libWOExtensions_SUBPROJECTS) + + +# building + -include GNUmakefile.preamble +ifneq ($(frameworks),yes) include $(GNUSTEP_MAKEFILES)/library.make +else +include $(GNUSTEP_MAKEFILES)/framework.make +endif include $(GNUSTEP_MAKEFILES)/bundle.make -include GNUmakefile.postamble -include fhs.make diff --git a/sope-appserver/WOXML/GNUmakefile b/sope-appserver/WOXML/GNUmakefile index 87ada9d4..7eb3f32b 100644 --- a/sope-appserver/WOXML/GNUmakefile +++ b/sope-appserver/WOXML/GNUmakefile @@ -5,7 +5,16 @@ include ../common.make include ../Version include ./Version +ifneq ($(frameworks),yes) LIBRARY_NAME = libWOXML +else +FRAMEWORK_NAME = WOXML +endif + + +libWOXML_HEADER_FILES_DIR = . +libWOXML_HEADER_FILES_INSTALL_DIR = /WOXML + libWOXML_HEADER_FILES += \ WOXML.h \ @@ -21,10 +30,21 @@ libWOXML_OBJC_FILES += \ WOXMLMappingProperty.m \ WOXMLSaxModelHandler.m \ -libWOXML_HEADER_FILES_DIR = . -libWOXML_HEADER_FILES_INSTALL_DIR = /WOXML +# framework support + +WOXML_HEADER_FILES_DIR = WOXML +WOXML_HEADER_FILES = $(libWOXML_HEADER_FILES) +WOXML_OBJC_FILES = $(libWOXML_OBJC_FILES) +WOXML_SUBPROJECTS = $(libWOXML_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 -- 2.39.5