diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2010-12-17 15:06:49 +0100 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2010-12-17 15:06:49 +0100 |
| commit | f9c2e642b5f20cc19200aae7158bf71e35c9332b (patch) | |
| tree | db4d95efe3ded66f4fa36009a8e9c738020ba093 | |
| parent | 0feae64efb6e6330ad2236d5eeb6d9678ea6fb98 (diff) | |
| parent | 73eb295ac2db907675372be4fd1a618f8cd09cea (diff) | |
CWS-TOOLING: integrate CWS ause128
| -rw-r--r-- | connectivity/prj/d.lst | 1 | ||||
| -rw-r--r-- | connectivity/source/drivers/hsqldb/makefile.mk | 1 | ||||
| -rw-r--r-- | desktop/test/deployment/locationtest/makefile.mk | 3 | ||||
| -rwxr-xr-x | desktop/test/deployment/update/updateinfocreation/build/makefile.mk | 3 | ||||
| -rw-r--r-- | sysui/desktop/macosx/makefile.mk | 3 |
5 files changed, 11 insertions, 0 deletions
diff --git a/connectivity/prj/d.lst b/connectivity/prj/d.lst index 01d82ba9177e..22bffa638254 100644 --- a/connectivity/prj/d.lst +++ b/connectivity/prj/d.lst @@ -2,6 +2,7 @@ ..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib +..\%__SRC%\lib\*.jnilib %_DEST%\lib%_EXT%\*.jnilib ..\%__SRC%\slb\connectivity*.* %_DEST%\lib%_EXT%\connectivity*.* ..\%__SRC%\lib\idbt* %_DEST%\lib%_EXT%\idbt* ..\source\cpool\*.xml %_DEST%\xml%_EXT%\*.xml diff --git a/connectivity/source/drivers/hsqldb/makefile.mk b/connectivity/source/drivers/hsqldb/makefile.mk index 5be6fa08cd7b..d0e22fde8970 100644 --- a/connectivity/source/drivers/hsqldb/makefile.mk +++ b/connectivity/source/drivers/hsqldb/makefile.mk @@ -103,6 +103,7 @@ SHL1STDLIBS=\ SHL1DEPN= +SHL1CREATEJNILIB=TRUE SHL1IMPLIB= i$(HSQLDB_TARGET) SHL1DEF= $(MISC)$/$(SHL1TARGET).def diff --git a/desktop/test/deployment/locationtest/makefile.mk b/desktop/test/deployment/locationtest/makefile.mk index 8fe189791961..24be56c28d7e 100644 --- a/desktop/test/deployment/locationtest/makefile.mk +++ b/desktop/test/deployment/locationtest/makefile.mk @@ -80,5 +80,8 @@ $(MISC)$/$(TARGET)_resort : manifest.xml $(JARTARGETN) $(MISC)$/$(ZIP1TARGET).cr $(COPY) description.xml $(MISC)$/$(TARGET)$/description.xml $(TOUCH) $@ +.IF "$(ZIP1TARGETN)"!="" $(ZIP1TARGETN) : $(MISC)$/$(TARGET)_resort $(MISC)$/$(ZIP1TARGET).createdir +.ENDIF # "$(ZIP1TARGETN)"!="" + diff --git a/desktop/test/deployment/update/updateinfocreation/build/makefile.mk b/desktop/test/deployment/update/updateinfocreation/build/makefile.mk index 6af3928279e0..b0479c942b4f 100755 --- a/desktop/test/deployment/update/updateinfocreation/build/makefile.mk +++ b/desktop/test/deployment/update/updateinfocreation/build/makefile.mk @@ -84,5 +84,8 @@ $(MISC)$/$(TARGET)_resort : manifest.xml $(JARTARGETN) $(MISC)$/$(ZIP1TARGET).cr $(GNUCOPY) -u description.xml $(MISC)$/$(TARGET)$/description.xml $(TOUCH) $@ +.IF "$(ZIP1TARGETN)"!="" $(ZIP1TARGETN) : $(MISC)$/$(TARGET)_resort $(MISC)$/$(ZIP1TARGET).createdir +.ENDIF # "$(ZIP1TARGETN)"!="" + diff --git a/sysui/desktop/macosx/makefile.mk b/sysui/desktop/macosx/makefile.mk index 059b3b87bb46..654ac5579df9 100644 --- a/sysui/desktop/macosx/makefile.mk +++ b/sysui/desktop/macosx/makefile.mk @@ -64,8 +64,11 @@ ULFDIR:=..$/share .INCLUDE : target.mk +.IF "$(ZIP1TARGETN)"!="" ZIP1TARGETN : Info.plist extract_icons_names.pl +.ENDIF # "$(ZIP1TARGETN)"!="" + ALLTAR : $(COMMONMISC)$/{PkgInfo Info.plist} $(COMMONBIN)$/InfoPlist_{$(alllangiso)}.zip $(COMMONMISC)$/PkgInfo : |