diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-06-12 09:46:48 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-06-12 09:46:48 +0000 |
| commit | 8aa22dbc9be880df269a75a200cc1cef832aca12 (patch) | |
| tree | 27b9bb92623db04213b0e895f142595350edcac9 | |
| parent | 66c1a4b023914c28be7faf5ed5f6196ea3e61780 (diff) | |
INTEGRATION: CWS mh11rc (1.32.14); FILE MERGED
2003/06/06 09:33:13 mh 1.32.14.1: join: from beta2
| -rw-r--r-- | desktop/util/makefile.mk | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/desktop/util/makefile.mk b/desktop/util/makefile.mk index a96b336a07ae..db874df74c8c 100644 --- a/desktop/util/makefile.mk +++ b/desktop/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.32 $ +# $Revision: 1.33 $ # -# last change: $Author: vg $ $Date: 2003-05-22 08:55:55 $ +# last change: $Author: vg $ $Date: 2003-06-12 10:46:48 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -101,7 +101,7 @@ RCFILES=verinfo.rc # --- Linken der Applikation --------------------------------------- -.IF "$(OS)" == "LINUX" +.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD" # #74158# linux needs sal/vos/tools at end of link list, solaris needs it first, # winXX is handled like solaris for now APP1_STDPRE= @@ -151,7 +151,7 @@ APP1OBJS += $(OBJ)$/icon_resource_sun.obj .ENDIF .IF "$(GUI)" == "UNX" -.IF "$(OS)" == "LINUX" +.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD" APP1STDLIBS+= -lXext -lSM -lICE .ENDIF .ENDIF @@ -232,16 +232,6 @@ APP5STDLIBS= \ $(TKLIB) \ $(SVTOOLLIB) -# $(APP1_STDPRE) \ -# $(SVLLIB) \ -# $(SVMEMLIB) \ -# $(VCLLIB) \ -# $(APP1_STDPOST) \ -# $(UNOTOOLSLIB) \ -# $(UCBHELPERLIB) \ -# $(COMPHELPERLIB) \ -# $(SALHELPERLIB) \ - APP5OBJS=$(TARGETOBJS) APP5OBJS += $(OBJ)$/copyright_ascii_ooo.obj |