diff options
author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2003-08-18 13:45:53 +0000 |
---|---|---|
committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2003-08-18 13:45:53 +0000 |
commit | 00a4d6b59ba8fcc7acf9c0adb796beddee7afe40 (patch) | |
tree | 3e5e6511361fb9c37128db35af29a52c09258b16 /dtrans/source/X11 | |
parent | 3c1af4c0b33c8fee39a9fd7ad8cce6df8ce1ae89 (diff) |
INTEGRATION: CWS geordi2q01 (1.8.8); FILE MERGED
2003/08/18 12:53:52 hr 1.8.8.1: #i18350#: join changes from CWS ooo11rc3
Diffstat (limited to 'dtrans/source/X11')
-rw-r--r-- | dtrans/source/X11/makefile.mk | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/dtrans/source/X11/makefile.mk b/dtrans/source/X11/makefile.mk index d0779a087303..65d9732c0e29 100644 --- a/dtrans/source/X11/makefile.mk +++ b/dtrans/source/X11/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.8 $ +# $Revision: 1.9 $ # -# last change: $Author: hr $ $Date: 2003-07-16 17:33:36 $ +# last change: $Author: hjs $ $Date: 2003-08-18 14:45:53 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -100,8 +100,13 @@ SLOFILES=\ SHL1TARGET= $(TARGET)$(UPD)$(DLLPOSTFIX) -SHL1STDLIBS= \ - $(CPPUHELPERLIB) \ +.IF "$(OS)"=="MACOSX" +SHL1STDLIBS= $(LIBSTLPORT) $(CPPUHELPERLIB) +.ELSE +SHL1STDLIBS= $(CPPUHELPERLIB) +.ENDIF + +SHL1STDLIBS+= \ $(CPPULIB) \ $(SALLIB) \ -lX11 |