PCH support

[sope] / sope-appserver / SoOFS / GNUmakefile

diff --git a/sope-appserver/SoOFS/GNUmakefile b/sope-appserver/SoOFS/GNUmakefile
index f8268f29365f56bede20b3ce915fb59830d6b5c5..65750aa6ba981d4d2105a68e9059c8d27c1be4bd 100644 (file)
--- a/sope-appserver/SoOFS/GNUmakefile
+++ b/sope-appserver/SoOFS/GNUmakefile
@@ -1,10 +1,21 @@
 # GNUstep makefile
 
+-include ../../config.make
 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_PCH_FILE = common.h
+libSoOFS_SOVERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
+libSoOFS_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBMINOR_VERSION)
 
 libSoOFS_HEADER_FILES_DIR         = .
 libSoOFS_HEADER_FILES_INSTALL_DIR = /SoOFS
@@ -48,24 +59,46 @@ libSoOFS_OBJC_FILES = \
        OFSChangeLog.m                  \
        OFSFolderDataSource.m           \
 
+
+ifeq ($(frameworks),yes)
+# framework support
+
+SoOFS_HEADER_FILES    = $(libSoOFS_HEADER_FILES)
+SoOFS_OBJC_FILES      = $(libSoOFS_OBJC_FILES) SoOFSProduct.m
+SoOFS_RESOURCE_FILES  = product.plist Version
+SoOFS_PRINCIPAL_CLASS = SoOFSProduct
+
+else
+
 # ----- SoCore product for SOPE core registrations
 
 BUNDLE_NAME      = SoOFS
 BUNDLE_EXTENSION = .sxp
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/SoProducts
+BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/SoProducts-$(MAJOR_VERSION).$(MINOR_VERSION)/
 
 SoOFS_OBJC_FILES       = SoOFSProduct.m
 SoOFS_RESOURCE_FILES   = product.plist Version
 SoOFS_PRINCIPAL_CLASS  = SoOFSProduct
 
+endif
+
+
 # ----- NGObjWeb tools
 
-TOOL_NAME = sope
+SOPED_NAME=sope-$(MAJOR_VERSION).$(MINOR_VERSION)
+
+TOOL_NAME = $(SOPED_NAME)
+
+$(SOPED_NAME)_OBJC_FILES = sope.m
 
-sope_OBJC_FILES = sope.m
 
 -include GNUmakefile.preamble
+ifneq ($(frameworks),yes)
 include $(GNUSTEP_MAKEFILES)/library.make
 include $(GNUSTEP_MAKEFILES)/bundle.make
+else
+include $(GNUSTEP_MAKEFILES)/framework.make
+endif
 include $(GNUSTEP_MAKEFILES)/tool.make
 -include GNUmakefile.postamble
+-include fhs.make