* make UI gnustep-make 2 compatible

git-svn-id: http://svn.opengroupware.org/SOGo/inverse/branches/1.0-gsmake2@1352 d1b88da0-ebda-0310-925b-ed51d893ca5b

diff --git a/UI/Common/GNUmakefile b/UI/Common/GNUmakefile
index d9530e53046ea98770ac84f3c230decc44d55c46..f4def785b958c8d61a7e3a5d65ab326801f2cc0a 100644 (file)
--- a/UI/Common/GNUmakefile
+++ b/UI/Common/GNUmakefile
@@ -41,4 +41,3 @@ ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/bundle.make
 -include GNUmakefile.postamble
-include ../../fhsbundle.make

diff --git a/UI/Contacts/GNUmakefile b/UI/Contacts/GNUmakefile
index fed68ded93fdafd01a7bfc9617f861759fd35ca8..b9d4b0eb762e7a4022c461b9e436926dcb0164fb 100644 (file)
--- a/UI/Contacts/GNUmakefile
+++ b/UI/Contacts/GNUmakefile
@@ -39,4 +39,3 @@ ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/bundle.make
 -include GNUmakefile.postamble
-include ../../fhsbundle.make

diff --git a/UI/GNUmakefile b/UI/GNUmakefile
index 3570614b019dcfa7c8b28dfa9220e77ef0145ff9..417b9df1fbbd0c5b1cd8de1adb91e1afcc55a284 100644 (file)
--- a/UI/GNUmakefile
+++ b/UI/GNUmakefile
@@ -13,6 +13,7 @@ SUBPROJECTS += \
        MainUI          \
        PreferencesUI   \
        Scheduler       \
-       Templates
+       Templates       \
+       WebServerResources
 
 include $(GNUSTEP_MAKEFILES)/aggregate.make

diff --git a/UI/MailPartViewers/GNUmakefile b/UI/MailPartViewers/GNUmakefile
index 8bbcc1c8769329b9a6fdbb21085c562e598707d2..43db3f799882013c97453954219b5f8f8a315f8b 100644 (file)
--- a/UI/MailPartViewers/GNUmakefile
+++ b/UI/MailPartViewers/GNUmakefile
@@ -46,4 +46,3 @@ ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/bundle.make
 -include GNUmakefile.postamble
-include ../../fhsbundle.make

diff --git a/UI/MailerUI/GNUmakefile b/UI/MailerUI/GNUmakefile
index 08c96e702214480dbe28690632b469d8a9ba8ad1..39cd51adec17dcc5efeab3de2847061403dd793e 100644 (file)
--- a/UI/MailerUI/GNUmakefile
+++ b/UI/MailerUI/GNUmakefile
@@ -55,4 +55,3 @@ ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/bundle.make
 -include GNUmakefile.postamble
-include ../../fhsbundle.make

diff --git a/UI/MainUI/GNUmakefile b/UI/MainUI/GNUmakefile
index 6b0378895977d3835ddd6dfcf73ac35df123a995..6149ed2452fa1d6a8817426d2a92d7a13a9fc043 100644 (file)
--- a/UI/MainUI/GNUmakefile
+++ b/UI/MainUI/GNUmakefile
@@ -1,6 +1,6 @@
 # GNUstep makefile
 
--include ../common.make
+include ../common.make
 
 BUNDLE_NAME = MainUI
 
@@ -32,4 +32,3 @@ ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/bundle.make
 -include GNUmakefile.postamble
-include ../../fhsbundle.make

diff --git a/UI/PreferencesUI/GNUmakefile b/UI/PreferencesUI/GNUmakefile
index 2b34be9b571cf116cda370452b36db08cbaac7c9..fa7f428da1e848866401fd39de2fb02ad78180b7 100644 (file)
--- a/UI/PreferencesUI/GNUmakefile
+++ b/UI/PreferencesUI/GNUmakefile
@@ -30,6 +30,3 @@ ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/bundle.make
 -include GNUmakefile.postamble
-include ../../fhsbundle.make
-
-

diff --git a/UI/SOGoElements/GNUmakefile b/UI/SOGoElements/GNUmakefile
index b389d94fce0abdb7f57e92f3d10d57860616ed68..53cf58d9813f19896cdaf0db2c26f55141a9ee2e 100644 (file)
--- a/UI/SOGoElements/GNUmakefile
+++ b/UI/SOGoElements/GNUmakefile
@@ -1,13 +1,11 @@
 # GNUstep makefile
 
--include ../../config.make
+include ../../config.make
 include $(GNUSTEP_MAKEFILES)/common.make
 
-SOPE_VERSION = 4.7
-
 BUNDLE_NAME      = SOGoElements
 BUNDLE_EXTENSION = .wox
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/WOxElemBuilders-$(SOPE_VERSION)/
+BUNDLE_INSTALL_DIR = $(SOPE_WOXBUILDERS)
 
 SOGoElements_PRINCIPAL_CLASS = SOGoElementsBundle
 
@@ -21,4 +19,3 @@ SOGoElements_OBJC_FILES = \
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/bundle.make
 -include GNUmakefile.postamble
--include fhs.make

diff --git a/UI/SOGoUI/GNUmakefile b/UI/SOGoUI/GNUmakefile
index 4928232219dfd284c2a1a87fce993c4fc0fe7a99..aca9621e179ce6e147cbb2e4dc7966ec5d45a5d7 100644 (file)
--- a/UI/SOGoUI/GNUmakefile
+++ b/UI/SOGoUI/GNUmakefile
@@ -10,7 +10,8 @@ LIBRARY_NAME = libSOGoUI
 
 libSOGoUI_HEADER_FILES_DIR         = .
 libSOGoUI_HEADER_FILES_INSTALL_DIR = /SOGoUI
-FHS_HEADER_DIRS = SOGoUI
+libSOGoUI_INTERFACE_VERSION       = $(MAJOR_VERSION).$(MINOR_VERSION)
+libSOGoUI_INSTALL_DIR=$(SOGO_SYSLIBDIR)
 
 libSOGoUI_HEADER_FILES +=      \
        \
@@ -33,6 +34,8 @@ libSOGoUI_OBJC_FILES +=               \
 # make
 
 -include GNUmakefile.preamble
+ifneq ($(FHS_INSTALL_ROOT),)
+GNUSTEP_HEADERS=$(DESTDIR)$(FHS_INSTALL_ROOT)/include
+endif
 include $(GNUSTEP_MAKEFILES)/library.make
 -include GNUmakefile.postamble
--include ../../fhslib.make

diff --git a/UI/Scheduler/GNUmakefile b/UI/Scheduler/GNUmakefile
index 92f59324f634aaf4bf1d5fcf46bf0c890af25f5e..03d57ce85312b803a1b4c45100e0482824d600b0 100644 (file)
--- a/UI/Scheduler/GNUmakefile
+++ b/UI/Scheduler/GNUmakefile
@@ -73,4 +73,3 @@ ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/bundle.make
 -include GNUmakefile.postamble
-include ../../fhsbundle.make

diff --git a/UI/Templates/GNUmakefile b/UI/Templates/GNUmakefile
index 7a5acdd67a44d37aa3687861258f4de1d2d63938..101163e803a10bdca95a6ed95446cef9fc9c051f 100644 (file)
--- a/UI/Templates/GNUmakefile
+++ b/UI/Templates/GNUmakefile
@@ -1,5 +1,7 @@
 # GNUstep makefile
 
+include ../common.make
+
 XMLLINT = xmllint
 XMLLINT-BIN = $(shell which $(XMLLINT))
 ifeq ($(XMLLINT-BIN),)
@@ -10,6 +12,13 @@ all :: validate-wox
 endif
 
 WOXS = $(shell find . -name '*.wox' -type f)
+TEMPLATE_FILES = $(shell ls *wox)
+TEMPLATE_DIRS = ContactsUI \
+               MailPartViewers \
+               MailerUI        \
+               MainUI          \
+               PreferencesUI   \
+               SchedulerUI
 
 validate-wox:
        for wox in $(WOXS); \
@@ -17,6 +26,13 @@ validate-wox:
        done;
 
 install ::
+       mkdir -p ${SOGO_TEMPLATESDIR}
+       for TEMPLATE in $(TEMPLATE_FILES); do \
+               cp $$TEMPLATE ${SOGO_TEMPLATESDIR}; \
+       done;
+       for TEMPLATEDIR in $(TEMPLATE_DIRS); do \
+               cp -r $$TEMPLATEDIR ${SOGO_TEMPLATESDIR}; \
+       done;
 
 clean ::
 

diff --git a/UI/common.make b/UI/common.make
index 1efe9382778e9468bf2495a95a4bca0e062077eb..8472061986c30254dd6d985a36570a64784c2086 100644 (file)
--- a/UI/common.make
+++ b/UI/common.make
@@ -1,12 +1,12 @@
 # common make file for UI bundles
 
--include ../../config.make
+include ../../config.make
 include $(GNUSTEP_MAKEFILES)/common.make
 include ../../Version
-include ./Version
+-include ./Version
 
 BUNDLE_EXTENSION   = .SOGo
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/SOGo-$(MAJOR_VERSION).$(MINOR_VERSION)
+BUNDLE_INSTALL_DIR = $(SOGO_LIBDIR)
 
 ADDITIONAL_INCLUDE_DIRS += \
        -I..            \