From 2e843dafbefa6f6300da296e2adc76a8888c0487 Mon Sep 17 00:00:00 2001 From: helge Date: Thu, 15 Sep 2005 09:31:36 +0000 Subject: [PATCH] added WEPrototype to make process git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1107 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-appserver/ChangeLog | 4 ++++ sope-appserver/GNUmakefile | 3 ++- sope-appserver/WEPrototype/ChangeLog | 5 +++++ sope-appserver/WEPrototype/GNUmakefile | 1 + sope-appserver/WEPrototype/GNUmakefile.postamble | 10 ++++++++++ sope-appserver/WEPrototype/GNUmakefile.preamble | 10 ---------- sope-appserver/WEPrototype/Version | 2 +- 7 files changed, 23 insertions(+), 12 deletions(-) diff --git a/sope-appserver/ChangeLog b/sope-appserver/ChangeLog index 0396b200..47a34b96 100644 --- a/sope-appserver/ChangeLog +++ b/sope-appserver/ChangeLog @@ -1,3 +1,7 @@ +2005-09-15 Helge Hess + + * GNUmakefile: added WEPrototype to makefile + 2005-08-26 Helge Hess * all makefiles: add common.h as the precompiled header file diff --git a/sope-appserver/GNUmakefile b/sope-appserver/GNUmakefile index 72af647d..0efc433f 100644 --- a/sope-appserver/GNUmakefile +++ b/sope-appserver/GNUmakefile @@ -12,7 +12,8 @@ SUBPROJECTS += \ WOExtensions \ WOXML \ SoOFS \ - NGXmlRpc + NGXmlRpc \ + WEPrototype ifeq ($(frameworks),yes) diff --git a/sope-appserver/WEPrototype/ChangeLog b/sope-appserver/WEPrototype/ChangeLog index 73c9b986..c14ab15e 100644 --- a/sope-appserver/WEPrototype/ChangeLog +++ b/sope-appserver/WEPrototype/ChangeLog @@ -1,3 +1,8 @@ +2005-09-15 Helge Hess + + * GNUmakefile.preamble, GNUmakefile.postamble: moved targets from + pre- to postamble (v4.5.5) + 2005-07-22 Helge Hess * WEPrototypeScriptAction.m: improved check of if-none-match header diff --git a/sope-appserver/WEPrototype/GNUmakefile b/sope-appserver/WEPrototype/GNUmakefile index 7e719771..f160fdec 100644 --- a/sope-appserver/WEPrototype/GNUmakefile +++ b/sope-appserver/WEPrototype/GNUmakefile @@ -20,6 +20,7 @@ BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/WOxElemBuilders-$(MAJOR FHS_MANPAGES += doc/*.3 libWEPrototype_PCH_FILE = common.h +WEPrototype_PCH_FILE = common.h libWEPrototype_HEADER_FILES_DIR = . libWEPrototype_HEADER_FILES_INSTALL_DIR = /WEPrototype diff --git a/sope-appserver/WEPrototype/GNUmakefile.postamble b/sope-appserver/WEPrototype/GNUmakefile.postamble index 8b6d0d94..b20edf76 100644 --- a/sope-appserver/WEPrototype/GNUmakefile.postamble +++ b/sope-appserver/WEPrototype/GNUmakefile.postamble @@ -8,3 +8,13 @@ WEPrototypeScriptAction.m : WEPrototypeScript.jsm before-all :: WEPrototypeScript.jsm + +ifneq ($(GNUSTEP_BUILD_DIR),) +after-WEPrototype-all :: + @(cp bundle-info.plist \ + $(GNUSTEP_BUILD_DIR)/$(BUNDLE_NAME)$(BUNDLE_EXTENSION)) +else +after-WEPrototype-all :: + @(cd $(BUNDLE_NAME)$(BUNDLE_EXTENSION);\ + cp ../bundle-info.plist .) +endif diff --git a/sope-appserver/WEPrototype/GNUmakefile.preamble b/sope-appserver/WEPrototype/GNUmakefile.preamble index 433444d7..0fc772c2 100644 --- a/sope-appserver/WEPrototype/GNUmakefile.preamble +++ b/sope-appserver/WEPrototype/GNUmakefile.preamble @@ -16,16 +16,6 @@ ADDITIONAL_INCLUDE_DIRS += \ -I../../sope-xml -ifneq ($(GNUSTEP_BUILD_DIR),) -after-WEPrototype-all :: - @(cp bundle-info.plist \ - $(GNUSTEP_BUILD_DIR)/$(BUNDLE_NAME)$(BUNDLE_EXTENSION)) -else -after-WEPrototype-all :: - @(cd $(BUNDLE_NAME)$(BUNDLE_EXTENSION);\ - cp ../bundle-info.plist .) -endif - libWEPrototype_SOVERSION=$(MAJOR_VERSION).$(MINOR_VERSION) libWEPrototype_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBMINOR_VERSION) diff --git a/sope-appserver/WEPrototype/Version b/sope-appserver/WEPrototype/Version index c6652eb6..9d336640 100644 --- a/sope-appserver/WEPrototype/Version +++ b/sope-appserver/WEPrototype/Version @@ -1,5 +1,5 @@ # version file -SUBMINOR_VERSION:=4 +SUBMINOR_VERSION:=5 # v4.5.1 requires libNGObjWeb v4.5.170 -- 2.39.5