diff options
| author | mb93783 <mb93783@v20z-so6> | 2009-11-05 16:44:22 +0100 |
|---|---|---|
| committer | mb93783 <mb93783@v20z-so6> | 2009-11-05 16:44:22 +0100 |
| commit | 6d475ddbc3936c80b51c8d8f31de95631989aa40 (patch) | |
| tree | a214b0f7c6f5d58cd9eeb6e19f66ee134f63606c /soltools | |
| parent | 40ca7ca4cc6ebed1e769a151b6eeb8af290ef591 (diff) | |
#i103496#: get rid of stlport dependency in soltools
Diffstat (limited to 'soltools')
| -rwxr-xr-x[-rw-r--r--] | soltools/adjustvisibility/makefile.mk | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | soltools/mkdepend/makefile.mk | 11 | ||||
| -rwxr-xr-x[-rw-r--r--] | soltools/util/makefile.pmk | 11 |
3 files changed, 23 insertions, 3 deletions
diff --git a/soltools/adjustvisibility/makefile.mk b/soltools/adjustvisibility/makefile.mk index a4963b2eb071..d87eb9a89f07 100644..100755 --- a/soltools/adjustvisibility/makefile.mk +++ b/soltools/adjustvisibility/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -53,6 +53,8 @@ DEPOBJFILES = $(APP1OBJ) APP1STDLIBS = -lelf APP1RPATH = NONE +APP1STDLIBS+=-lstlport + .ENDIF "$(OS)"=="SOLARIS" # --- Targets ------------------------------------------------------ diff --git a/soltools/mkdepend/makefile.mk b/soltools/mkdepend/makefile.mk index ca6f57ef1c7b..b8e3d85200b8 100644..100755 --- a/soltools/mkdepend/makefile.mk +++ b/soltools/mkdepend/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -65,6 +65,15 @@ APP1TARGET=makedepend APP1OBJS=$(OBJFILES) APP1RPATH=NONE +.IF "$(COM)"=="MSC" +APP1STDLIBS+=msvcprt.lib +.ENDIF # "$(COM)"=="MSC" + +.IF "$(OS)"=="SOLARIS" +APP1STDLIBS+=-lstlport +.ENDIF + + .INCLUDE : target.mk diff --git a/soltools/util/makefile.pmk b/soltools/util/makefile.pmk index ad80f13bf8b9..1d0c571ec497 100644..100755 --- a/soltools/util/makefile.pmk +++ b/soltools/util/makefile.pmk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite @@ -34,3 +34,12 @@ MAKEDEPEND=$(AUGMENT_LIBRARY_PATH) $(BIN)$/makedepend # find 'adjustvisibility' in own output tree ADJUSTVISIBILITY=$(AUGMENT_LIBRARY_PATH) $(BIN)$/adjustvisibility + +# avoid STLPort +NO_DEFAULT_STL=TRUE +SOLARINC!:=$(subst,/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(SOLARINC)) + +.IF "$(OS)"=="SOLARIS" +SOLARINC+=-I$(COMPATH)/prod/include/CC/stlport4 +SOLARLIB+=-L$(COMPATH)/prod/lib/stlport4 +.ENDIF |