From 78db38f87ccea3d15a1c2e6c718f94f81531a73b Mon Sep 17 00:00:00 2001
From: Vladimir Glazounov <vg@openoffice.org>
Date: Wed, 15 Mar 2006 08:30:14 +0000
Subject: [PATCH] INTEGRATION: CWS jsc3 (1.5.34); FILE MERGED 2006/02/22
 14:30:20 jsc 1.5.34.2: #i60930# ifdef linker for GCC 2006/02/20 15:00:36 jsc
 1.5.34.1: #i60930# cleanup link flags and libs

---
 odk/source/unoapploader/unx/makefile.mk | 26 ++++++++-----------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/odk/source/unoapploader/unx/makefile.mk b/odk/source/unoapploader/unx/makefile.mk
index 2fd779b343d3..3d8ad2036024 100644
--- a/odk/source/unoapploader/unx/makefile.mk
+++ b/odk/source/unoapploader/unx/makefile.mk
@@ -4,9 +4,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.5 $
+#   $Revision: 1.6 $
 #
-#   last change: $Author: rt $ $Date: 2005-09-07 20:19:41 $
+#   last change: $Author: vg $ $Date: 2006-03-15 09:30:14 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -47,24 +47,14 @@ LIBSALCPPRT=
 
 # --- Files --------------------------------------------------------
 
-.IF "$(OS)$(COMID)"=="SOLARISC52"
-LINK=cc
-LINKFLAGS=
-LINKFLAGSAPP=
-STDLIB= -lX11 -ldl -lc -lm
-.ENDIF          # "$(OS)$(COMID)"=="SOLARISC52"
-
 .IF "$(COM)"=="GCC"
-#LINK=gcc
 LINK=$(CC)
-LINKFLAGS=
-LINKFLAGSAPP=
-  .IF "$(OS)"=="FREEBSD"
-  STDLIB= -lX11 -lc -lm
-  .ELSE
-  STDLIB= -lX11 -ldl -lc -lm
-.ENDIF # "$(OS)"=="FREEBSD"
-.ENDIF          # "$(OS)$(COMID)"=="GCC"
+.ENDIF
+
+.IF "$(OS)"!="FREEBSD"
+STDLIB= -ldl
+.ENDIF
+
 
 APP1NOSAL=TRUE