diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-09-10 12:27:30 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-09-10 12:27:30 +0000 |
| commit | 43a806927d33a585920b6781ba87f4eb7d3936bc (patch) | |
| tree | 90daf07e850b8eb1b222c10a78c9dc40c5362dd5 /vcl/util | |
| parent | 8053a4fe8ce35fc1fadf9537f0f765c86f732545 (diff) | |
#i10000# merge problems fixed
Diffstat (limited to 'vcl/util')
| -rw-r--r-- | vcl/util/makefile.mk | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/vcl/util/makefile.mk b/vcl/util/makefile.mk index 0f5791c7bff2..17fa51927c29 100644 --- a/vcl/util/makefile.mk +++ b/vcl/util/makefile.mk @@ -1,10 +1,10 @@ -##************************************************************************* +#************************************************************************* # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.60 $ +# $Revision: 1.61 $ # -# last change: $Author: hr $ $Date: 2004-09-09 11:28:46 $ +# last change: $Author: obo $ $Date: 2004-09-10 13:27:30 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -326,19 +326,7 @@ SHL2STDLIBS += -ldl -lnsl -lsocket SHL2STDLIBS+=$(LIBSN_LIBS) .ENDIF -# Solaris -.IF "$(OS)"=="SOLARIS" SHL2STDLIBS += -lXext -lSM -lICE -lX11 -# Others -.ELSE # "$(OS)"=="SOLARIS" -.IF "$(USE_XINERAMA)" != "NO" -.IF "$(XINERAMA_LINK)" == "dynamic" -SHL2STDLIBS += -lXinerama -.ELSE -.ENDIF # $(XINERAMA_LINK) -.ENDIF # $(USE_XINERAMA) -SHL2STDLIBS += -Wl,-Bstatic -l -.ENDIF # "$(OS)"=="SOLARIS" .ENDIF # "$(GUIBASE)"=="unx" |