summaryrefslogtreecommitdiff
path: root/redland/raptor/makefile.mk
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2009-03-02 08:55:03 +0000
committerOliver Bolte <obo@openoffice.org>2009-03-02 08:55:03 +0000
commit737d42f25fb44d30223ef9be492537e67856169a (patch)
tree64b7f4c40f7b906e4a5de482b40c774fa0e7bb1b /redland/raptor/makefile.mk
parent2e1f095c12d3da6b738c6355daa57ca3b303909d (diff)
CWS-TOOLING: integrate CWS os2port05
2009-02-05 19:23:48 +0100 ydario r267438 : i98084: add quotes to paths, required to properly set libpath when installation directory has spaces in it. Fixes ticket:135. 2009-01-22 13:24:00 +0100 ydario r266715 : i98084: use native code to set readonly-hidden flags (see w32), fixes lock files set as readonly and not removable. 2009-01-22 13:22:45 +0100 ydario r266714 : i98084: fix build error with gcc432, requires os2 headers now. 2009-01-21 23:42:58 +0100 ydario r266707 : i98084: properly generates rtti names for unknown symbols, see ticket:138. 2009-01-21 23:41:27 +0100 ydario r266706 : i98084: if xmlsec is not built, certificate is not valid, fixes ticket:138. 2009-01-15 23:39:09 +0100 ydario r266396 : i98084: convert unicode to char for panic dialog messages. 2009-01-15 23:36:13 +0100 ydario r266395 : i98084: use dmake build system instead of configure scripts. 2009-01-15 23:32:05 +0100 ydario r266394 : i98084: add senddoc/open-url integration. changeset 865-866.
Diffstat (limited to 'redland/raptor/makefile.mk')
-rw-r--r--redland/raptor/makefile.mk10
1 files changed, 6 insertions, 4 deletions
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index e7c80b9b90ef..f51c915030a4 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -54,10 +54,13 @@ RAPTORVERSION=$(RAPTOR_MAJOR).4.17
TARFILE_NAME=raptor-$(RAPTORVERSION)
PATCH_FILES=..$/$(TARFILE_NAME).patch
-ADDITIONAL_FILES=src/makefile.mk
+ADDITIONAL_FILES=src/makefile.mk src/raptor_config.h
+.IF "$(OS)"=="OS2"
+BUILD_ACTION=dmake
+BUILD_DIR=$(CONFIGURE_DIR)$/src
-.IF "$(OS)"=="WNT"
+.ELIF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"
CONFIGURE_DIR=
CONFIGURE_ACTION=.$/configure
@@ -132,8 +135,7 @@ OUT2BIN+=src/raptor-config
.ENDIF
.ELIF "$(GUI)"=="OS2"
-OUT2LIB+=src$/.libs$/*.a
-OUT2BIN+=src$/raptor-config
+# if we use dmake, this is done automagically
.ELSE
OUT2LIB+=src$/.libs$/libraptor*.so*