diff options
| author | Hennes Rohling <hro@openoffice.org> | 2003-06-11 11:16:11 +0000 |
|---|---|---|
| committer | Hennes Rohling <hro@openoffice.org> | 2003-06-11 11:16:11 +0000 |
| commit | e966d1e72ffd436aea7e321d4306eec5e5097327 (patch) | |
| tree | 077146349798b0104db37efc715699d76b23d777 | |
| parent | 4a9b6650c003c6073ad2fa5238f9761e5a44f4c6 (diff) | |
#i15200# For OOo gtk is linked statically
| -rwxr-xr-x | crashrep/source/unx/makefile.mk | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/crashrep/source/unx/makefile.mk b/crashrep/source/unx/makefile.mk index 46f9fbc81b23..c4cab8702e2a 100755 --- a/crashrep/source/unx/makefile.mk +++ b/crashrep/source/unx/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.1 $ +# $Revision: 1.2 $ # -# last change: $Author: hro $ $Date: 2003-06-06 11:21:58 $ +# last change: $Author: hro $ $Date: 2003-06-11 12:16:11 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -75,6 +75,12 @@ LIBSALCPPRT=$(0) .INCLUDE : settings.mk # ------------------------------------------------------------------ +.IF "$(ENABLE_STATIC_GTK)" == "FALSE" +GTKLINKFLAGS= +.ELSE +GTKLINKFLAGS=-Bstatic +.ENDIF + CFLAGS+=`pkg-config --cflags gtk+-2.0` OBJFILES=\ @@ -86,9 +92,9 @@ APP1NOSAL=TRUE APP1TARGET=$(TARGET) APP1OBJS=$(OBJFILES) .IF "$(COM)" == "GCC" -APP1STDLIBS=-Wl,-Bstatic `pkg-config --only-mod-libs --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff -Wl,-Bdynamic -lXext -lX11 -ldl -lnsl +APP1STDLIBS=-Wl,$(GTKLINKFLAGS) `pkg-config --only-mod-libs --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff -Wl,-Bdynamic -lXext -lX11 -ldl -lnsl .ELSE -APP1STDLIBS=-Bstatic `pkg-config --only-mod-libs --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff -Bdynamic -lXext -lX11 -ldl -lsocket -lnsl +APP1STDLIBS=$(GTKLINKFLAGS) `pkg-config --only-mod-libs --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff -Bdynamic -lXext -lX11 -ldl -lsocket -lnsl .ENDIF ALL: ALLTAR $(BIN)$/crash_dump.res.01 |