[ooo-build-commit] Branch 'ooo/master' - 2 commits - desktop/util

[Jan Holesovsky]

 desktop/util/makefile.mk |   15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

New commits:
commit 29f8921c500f42c61e049e9f5ef509c57a9e2ed8
Author: Oliver Bolte <obo at openoffice.org>
Date:   Thu Sep 24 11:58:01 2009 +0000

    #i10000# previous fix for linux only

diff --git a/desktop/util/makefile.mk b/desktop/util/makefile.mk
index 0338ea4..05f129b 100644
--- a/desktop/util/makefile.mk
+++ b/desktop/util/makefile.mk
@@ -181,10 +181,10 @@ APP5STDLIBS = \
     $(SALHELPERLIB) \
     $(VOSLIB)
 
-#.IF "$(OS)" == "LINUX"
+.IF "$(OS)" == "LINUX"
 APP5STDLIBS+= -lXext
 #APP5STDLIBS+= -lXext -lSM -lICE
-#.ENDIF # LINUX
+.ENDIF # LINUX
 
 APP5DEPN= $(APP1TARGETN) $(APP5RES) ooverinfo.rc
 APP5DEF=    $(MISCX)$/$(TARGET).def
commit b98951fc4733e10a3d89bda7eced69ab64925ce8
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date:   Thu Sep 24 10:03:21 2009 +0000

    #i10000# linux Xext missing symbol fix

diff --git a/desktop/util/makefile.mk b/desktop/util/makefile.mk
index 3712e49..0338ea4 100644
--- a/desktop/util/makefile.mk
+++ b/desktop/util/makefile.mk
@@ -119,11 +119,11 @@ APP1STDLIBS =  \
     $(VOSLIB)
 
 
-#.IF "$(GUI)" == "UNX"
-#.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
-#APP1STDLIBS+= -lXext -lSM -lICE
-#.ENDIF
-#.ENDIF
+.IF "$(GUI)" == "UNX"
+.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
+APP1STDLIBS+= -lXext 
+.ENDIF
+.ENDIF
 
 APP1DEPN= $(APP1RES) verinfo.rc
 
@@ -182,6 +182,7 @@ APP5STDLIBS = \
     $(VOSLIB)
 
 #.IF "$(OS)" == "LINUX"
+APP5STDLIBS+= -lXext
 #APP5STDLIBS+= -lXext -lSM -lICE
 #.ENDIF # LINUX