added WEPrototype to make process

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1107 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/sope-appserver/ChangeLog b/sope-appserver/ChangeLog
index 0396b200b6cab23aecfbabe2623e0d4c3a32a095..47a34b96648515db882f106874f0061ce793473c 100644 (file)
--- a/sope-appserver/ChangeLog
+++ b/sope-appserver/ChangeLog
@@ -1,3 +1,7 @@
+2005-09-15  Helge Hess  <helge.hess@opengroupware.org>
+
+       * GNUmakefile: added WEPrototype to makefile
+
 2005-08-26  Helge Hess  <helge.hess@opengroupware.org>
 
        * all makefiles: add common.h as the precompiled header file

diff --git a/sope-appserver/GNUmakefile b/sope-appserver/GNUmakefile
index 72af647de2acc7f1eb0ae1026a0a71f1a54313cf..0efc433f13111f3c923aa8cfc29f3616660399a8 100644 (file)
--- 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 73c9b9860e85239c875f727f4c06169933182c02..c14ab15ea1d797cd41c53b089a306c0cef04342a 100644 (file)
--- a/sope-appserver/WEPrototype/ChangeLog
+++ b/sope-appserver/WEPrototype/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-15  Helge Hess  <helge.hess@opengroupware.org>
+
+       * GNUmakefile.preamble, GNUmakefile.postamble: moved targets from
+         pre- to postamble (v4.5.5)
+
 2005-07-22  Helge Hess  <helge.hess@opengroupware.org>
 
        * WEPrototypeScriptAction.m: improved check of if-none-match header

diff --git a/sope-appserver/WEPrototype/GNUmakefile b/sope-appserver/WEPrototype/GNUmakefile
index 7e71977102e7fe7fc3f762a682b610510e22cf82..f160fdece971305066ff742618f44e00dc04f168 100644 (file)
--- 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 8b6d0d941d5b65abaaa251576a49c94d09c7d311..b20edf76058f83f6b9bbd0f60bac99d450f7d96c 100644 (file)
--- 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 433444d7b0f455be5574c5e074e58626ae17be0c..0fc772c2c11c64bf0146e1b7a7738a515f8b737c 100644 (file)
--- 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 c6652eb6bf784058c10e087de8c566aeab482e73..9d336640957f0bf467c7848f3ef56d83cb4abbcc 100644 (file)
--- 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