summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans-Joachim Lankenau <hjs@openoffice.org>2010-12-17 15:06:49 +0100
committerHans-Joachim Lankenau <hjs@openoffice.org>2010-12-17 15:06:49 +0100
commitf9b5a6bdc3296cbb41982a51f510c590349d83ad (patch)
tree21aac234f1ffefb7f9ac36db64cb356676e7245c
parentacab65899e11a8bf7d5427c21fb22df934ada338 (diff)
parent2482b356193c3a6ac933b9b98ee6721e8dec7106 (diff)
CWS-TOOLING: integrate CWS ause128
-rw-r--r--bridges/source/jni_uno/makefile.mk1
-rw-r--r--jurt/prj/d.lst1
-rw-r--r--jurt/source/pipe/makefile.mk1
3 files changed, 3 insertions, 0 deletions
diff --git a/bridges/source/jni_uno/makefile.mk b/bridges/source/jni_uno/makefile.mk
index da0942cdad29..1474a86cd741 100644
--- a/bridges/source/jni_uno/makefile.mk
+++ b/bridges/source/jni_uno/makefile.mk
@@ -67,6 +67,7 @@ SHL1STDLIBS= \
SHL1VERSIONMAP=$(TARGET).map
+SHL1CREATEJNILIB=TRUE
SHL1IMPLIB=i$(TARGET)
SHL1LIBS=$(SLB)$/$(TARGET).lib
SHL1DEF=$(MISC)$/$(SHL1TARGET).def
diff --git a/jurt/prj/d.lst b/jurt/prj/d.lst
index 848435f61138..74f5b60d7748 100644
--- a/jurt/prj/d.lst
+++ b/jurt/prj/d.lst
@@ -3,5 +3,6 @@
..\%__SRC%\bin\jpipx.dll %_DEST%\bin%_EXT%\jpipx.dll
..\%__SRC%\lib\libjpipe*.so %_DEST%\lib%_EXT%\libjpipe*.so
..\%__SRC%\lib\libjpipe*.dylib %_DEST%\lib%_EXT%\libjpipe*.dylib
+..\%__SRC%\lib\libjpipe*.jnilib %_DEST%\lib%_EXT%\libjpipe*.jnilib
..\%__SRC%\bin\jurt_src.zip %COMMON_DEST%\bin%_EXT%\jurt_src.zip
diff --git a/jurt/source/pipe/makefile.mk b/jurt/source/pipe/makefile.mk
index 5be6f1ebfd10..4a6dc59c89c2 100644
--- a/jurt/source/pipe/makefile.mk
+++ b/jurt/source/pipe/makefile.mk
@@ -41,6 +41,7 @@ SHL1TARGET = jpipe
.END
SHL1CODETYPE = C
+SHL1CREATEJNILIB=TRUE
SHL1IMPLIB = i$(SHL1TARGET)
SHL1OBJS = $(SLO)/com_sun_star_lib_connections_pipe_PipeConnection.obj
SHL1RPATH = URELIB