Kaydet (Commit) e966d1e7 authored tarafından Hennes Rohling's avatar Hennes Rohling

#i15200# For OOo gtk is linked statically

üst 4a9b6650
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
# #
# $RCSfile: makefile.mk,v $ # $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 # The Contents of this file are made available subject to the terms of
# either of the following licenses # either of the following licenses
...@@ -75,6 +75,12 @@ LIBSALCPPRT=$(0) ...@@ -75,6 +75,12 @@ LIBSALCPPRT=$(0)
.INCLUDE : settings.mk .INCLUDE : settings.mk
# ------------------------------------------------------------------ # ------------------------------------------------------------------
.IF "$(ENABLE_STATIC_GTK)" == "FALSE"
GTKLINKFLAGS=
.ELSE
GTKLINKFLAGS=-Bstatic
.ENDIF
CFLAGS+=`pkg-config --cflags gtk+-2.0` CFLAGS+=`pkg-config --cflags gtk+-2.0`
OBJFILES=\ OBJFILES=\
...@@ -86,9 +92,9 @@ APP1NOSAL=TRUE ...@@ -86,9 +92,9 @@ APP1NOSAL=TRUE
APP1TARGET=$(TARGET) APP1TARGET=$(TARGET)
APP1OBJS=$(OBJFILES) APP1OBJS=$(OBJFILES)
.IF "$(COM)" == "GCC" .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 .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 .ENDIF
ALL: ALLTAR $(BIN)$/crash_dump.res.01 ALL: ALLTAR $(BIN)$/crash_dump.res.01
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment