diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-12-09 08:43:20 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-12-09 08:43:20 +0000 |
| commit | e3ee495f2b9b5e70f00bb54ea983a77ac0e28550 (patch) | |
| tree | 69dd97b8cd5c9a4a4a44bc2e2eab323776ac3cf4 /redland | |
| parent | fae8f0f1439964e4b3cbf1dae5bd91bf4924ebfd (diff) | |
CWS-TOOLING: integrate CWS os2port04
2008-11-27 13:22:38 +0100 ydario r264480 : #i96439#: fix build for unix platforms.
2008-11-26 18:32:42 +0100 ydario r264433 : #i96439#: os2 systemshell code (dummy code).
2008-11-26 16:33:48 +0100 ydario r264421 : #i96439#: vcl fix for pdf export of truetype fonts.
2008-11-26 15:04:44 +0100 ydario r264399 : #i96439#: build macros fix scripts, gcc specific flags.
2008-11-26 15:00:15 +0100 ydario r264398 : #i96439#: vcl source code updates.
2008-11-26 13:21:37 +0100 ydario r264378 : #i96439#: os2 build system fixes.
2008-11-26 13:20:27 +0100 ydario r264377 : #i96439#: configuration and build macros updates.
2008-11-26 13:16:35 +0100 ydario r264375 : #i96439#: new launcher code, build system updates.
2008-11-26 13:12:49 +0100 ydario r264373 : #i96439#: use OSL endian macro.
2008-11-26 12:54:50 +0100 ydario r264371 : #i96439#: os2 build system fixes.
2008-11-26 12:30:46 +0100 ydario r264367 : #i96439#: os2 build system fixes.
2008-11-26 12:09:33 +0100 ydario r264365 : #i96439#: _Export is a reserved keyword under gcc for os2.
2008-11-26 12:08:12 +0100 ydario r264364 : #i96439#: new libpath handling.
2008-11-26 11:57:51 +0100 ydario r264363 : #i96439#: use C call, generates proper stabs; fix rtti names.
Diffstat (limited to 'redland')
| -rw-r--r-- | redland/prj/d.lst | 1 | ||||
| -rw-r--r-- | redland/raptor/makefile.mk | 6 | ||||
| -rw-r--r-- | redland/rasqal/makefile.mk | 5 | ||||
| -rw-r--r-- | redland/redland/makefile.mk | 4 |
4 files changed, 16 insertions, 0 deletions
diff --git a/redland/prj/d.lst b/redland/prj/d.lst index a5cfec758ae8..1d82c72e7485 100644 --- a/redland/prj/d.lst +++ b/redland/prj/d.lst @@ -3,6 +3,7 @@ ..\%__SRC%\lib\lib*.so.* %_DEST%\lib%_EXT% ..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT% ..\%__SRC%\lib\*.lib %_DEST%\lib%_EXT% +..\%__SRC%\lib\*.a %_DEST%\lib%_EXT% ..\%__SRC%\lib\lib*.dll.a %_DEST%\lib%_EXT%\lib*.a ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT% ..\redlandversion.mk %_DEST%\inc%_EXT%\redlandversion.mk diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk index 8c929a9c2e14..4bd548ede802 100644 --- a/redland/raptor/makefile.mk +++ b/redland/raptor/makefile.mk @@ -70,6 +70,7 @@ BUILD_DIR=$(CONFIGURE_DIR) BUILD_ACTION=dmake BUILD_DIR=$(CONFIGURE_DIR)$/src .ENDIF + .ELSE # "WNT" .IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC" @@ -129,6 +130,11 @@ OUT2BIN+=src/raptor-config .ELSE # if we use dmake, this is done automagically .ENDIF + +.ELIF "$(GUI)"=="OS2" +OUT2LIB+=src$/.libs$/*.a +OUT2BIN+=src$/raptor-config + .ELSE OUT2LIB+=src$/.libs$/libraptor*.so* OUT2BIN+=src/raptor-config diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk index ddf6a5153ae8..df4b640e6962 100644 --- a/redland/rasqal/makefile.mk +++ b/redland/rasqal/makefile.mk @@ -129,6 +129,11 @@ OUT2BIN+=src/rasqal-config .ELSE # if we use dmake, this is done automagically .ENDIF + +.ELIF "$(OS)"=="OS2" +OUT2LIB+=src$/.libs$/*.a +OUT2BIN+=src$/rasqal-config + .ELSE OUT2LIB+=src$/.libs$/librasqal*.so* OUT2BIN+=src/rasqal-config diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk index af3b906d7804..21ac94b388d7 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -131,6 +131,10 @@ OUT2BIN+=librdf$/.libs$/*.dll .ELSE # if we use dmake, this is done automagically .ENDIF + +.ELIF "$(OS)"=="OS2" +OUT2LIB+=librdf$/.libs$/*.a + .ELSE OUT2LIB+=librdf$/.libs$/librdf*.so* .ENDIF |