From 5bfb8059fd740f9b1a5bbd943fe01e3e0be5af58 Mon Sep 17 00:00:00 2001 From: sreitenbach Date: Sun, 3 Feb 2008 13:52:52 +0000 Subject: [PATCH] * 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 --- UI/Common/GNUmakefile | 1 - UI/Contacts/GNUmakefile | 1 - UI/GNUmakefile | 3 ++- UI/MailPartViewers/GNUmakefile | 1 - UI/MailerUI/GNUmakefile | 1 - UI/MainUI/GNUmakefile | 3 +-- UI/PreferencesUI/GNUmakefile | 3 --- UI/SOGoElements/GNUmakefile | 7 ++----- UI/SOGoUI/GNUmakefile | 7 +++++-- UI/Scheduler/GNUmakefile | 1 - UI/Templates/GNUmakefile | 16 ++++++++++++++++ UI/common.make | 6 +++--- 12 files changed, 29 insertions(+), 21 deletions(-) diff --git a/UI/Common/GNUmakefile b/UI/Common/GNUmakefile index d9530e53..f4def785 100644 --- 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 fed68ded..b9d4b0eb 100644 --- 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 3570614b..417b9df1 100644 --- 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 8bbcc1c8..43db3f79 100644 --- 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 08c96e70..39cd51ad 100644 --- 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 6b037889..6149ed24 100644 --- 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 2b34be9b..fa7f428d 100644 --- 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 b389d94f..53cf58d9 100644 --- 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 49282322..aca9621e 100644 --- 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 92f59324..03d57ce8 100644 --- 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 7a5acdd6..101163e8 100644 --- 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 1efe9382..84720619 100644 --- 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.. \ -- 2.39.5