diff options
| author | oisin <oisin@openoffice.org> | 2001-01-23 16:56:11 +0000 |
|---|---|---|
| committer | oisin <oisin@openoffice.org> | 2001-01-23 16:56:11 +0000 |
| commit | c436789dfa548ea9fee276dee44e6af461077716 (patch) | |
| tree | 53eb171fcd8dc502b3fd77769cf335fcd8761a87 | |
| parent | f487a3c584a54a48c45b755fa66fb9e84a9ace30 (diff) | |
Reverted to revision 1.5
| -rw-r--r-- | vcl/util/makefile.mk | 44 |
1 files changed, 8 insertions, 36 deletions
diff --git a/vcl/util/makefile.mk b/vcl/util/makefile.mk index 86c4a52844cb..95c6694c0b22 100644 --- a/vcl/util/makefile.mk +++ b/vcl/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.7 $ # -# last change: $Author: oisin $ $Date: 2001-01-19 14:54:05 $ +# last change: $Author: oisin $ $Date: 2001-01-23 17:56:11 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -559,48 +559,20 @@ $(MISC)$/$(SHL2TARGET).def: $(MISC)$/$(SHL1TARGET).flt \ .IF "$(GUI)"=="UNX" -.IF "$(USE_XPRINT)"=="FALSE" -.ELSE -CFLAGS+=-D_USE_PRINT_EXTENSION_=1 -.ENDIF - -# Solaris .IF "$(OS)"=="SOLARIS" - -.IF "$(PSPRINT)"=="" -.IF "$(USE_XPRINT)"=="FALSE" +.IF "$(PSPRINT)" == "" SHL1STDLIBS += -lxp$(UPD)$(DLLPOSTFIX) -lXm -lXt -lX11 -.ENDIF -.ENDIF - -.IF "$(USE_XPRINT)" != "FALSE" -SHL1STDLIBS += -lXp -lX11 -.ENDIF - -.IF "$(PSPRINT)"!="" +.ELSE SHL1STDLIBS += -lXm -lXt -lX11 .ENDIF - -# MacOSX .ELIF "$(OS)"=="MACOSX" SHL1STDLIBS += - -# Others .ELSE -.IF "$(PSPRINT)"=="" -.IF "$(USE_XPRINT)"=="FALSE" -SHL1STDLIBS += -lxp$(UPD)$(DLLPOSTFIX) -lXm -lXt -lX11 -.ENDIF -.ENDIF - -.IF "$(USE_XPRINT)" != "FALSE" -SHL1STDLIBS += -lXp -lX11 -.ENDIF - -.IF "$(PSPRINT)"!="" -SHL1STDLIBS += -lXm -lXt -lX11 +.IF "$(PSPRINT)" == "" +SHL1STDLIBS += -lxp$(UPD)$(DLLPOSTFIX) -lXaw -lXt -lX11 +.ELSE +SHL1STDLIBS += -lXaw -lXt -lX11 .ENDIF - .ENDIF .IF "$(OS)"=="LINUX" || "$(OS)"=="SOLARIS" |