From b43884c8d15d39afc121411ec3f5bd4c07b4673e Mon Sep 17 00:00:00 2001
From: Vladimir Glazounov <vg@openoffice.org>
Date: Wed, 2 Jul 2003 13:11:19 +0000
Subject: INTEGRATION: CWS ooo11rc (1.2.6); FILE MERGED 2003/06/30 15:45:58 hro
 1.2.6.2: #i15843# --only-mod-libs onyl for static gtk, replace jre path to
 search for libjpeg 2003/06/30 14:50:02 hro 1.2.6.1: #i15843# Fixed linker
 command line for non static gtk

---
 crashrep/source/unx/makefile.mk | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/crashrep/source/unx/makefile.mk b/crashrep/source/unx/makefile.mk
index c4cab8702e2a..468e883777c3 100755
--- a/crashrep/source/unx/makefile.mk
+++ b/crashrep/source/unx/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.2 $
+#   $Revision: 1.3 $
 #
-#   last change: $Author: hro $ $Date: 2003-06-11 12:16:11 $
+#   last change: $Author: vg $ $Date: 2003-07-02 14:11:19 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -76,13 +76,21 @@ LIBSALCPPRT=$(0)
 # ------------------------------------------------------------------
 
 .IF "$(ENABLE_STATIC_GTK)" == "FALSE"
+ONLYMODLIBS=
 GTKLINKFLAGS=
 .ELSE
+ONLYMODLIBS=--only-mod-libs
+.IF "$(COM)" == "GCC"
+GTKLINKFLAGS=-Wl,-Bstatic
+.ELSE
 GTKLINKFLAGS=-Bstatic
 .ENDIF
+.ENDIF
 
 CFLAGS+=`pkg-config --cflags gtk+-2.0`
 
+SOLARLIB!:=$(SOLARLIB:s/jre/jnore/)
+
 OBJFILES=\
     $(OBJ)$/interface.obj            \
     $(OBJ)$/res.obj                  \
@@ -92,9 +100,9 @@ APP1NOSAL=TRUE
 APP1TARGET=$(TARGET)
 APP1OBJS=$(OBJFILES)
 .IF "$(COM)" == "GCC"
-APP1STDLIBS=-Wl,$(GTKLINKFLAGS) `pkg-config --only-mod-libs --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff -Wl,-Bdynamic -lXext -lX11 -ldl -lnsl
+APP1STDLIBS=$(GTKLINKFLAGS) `pkg-config $(ONLYMODLIBS) --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff -Wl,-Bdynamic -lXext -lX11 -ldl -lnsl
 .ELSE
-APP1STDLIBS=$(GTKLINKFLAGS) `pkg-config --only-mod-libs --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff -Bdynamic -lXext -lX11 -ldl -lsocket -lnsl
+APP1STDLIBS=$(GTKLINKFLAGS) `pkg-config $(ONLYMODLIBS) --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff -Bdynamic -lXext -lX11 -ldl -lsocket -lnsl
 .ENDIF
 
 ALL: ALLTAR $(BIN)$/crash_dump.res.01
-- 
cgit v1.2.3