diff options
| author | Kurt Zenker <kz@openoffice.org> | 2004-12-16 10:17:09 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2004-12-16 10:17:09 +0000 |
| commit | 069d40967d44b529d7665e9832fe5056904b1e25 (patch) | |
| tree | eb749185df42f1f4bcf5bb5ad4b5860c15c9649d | |
| parent | 8aa04e6b3e3d3d1a352edbcd0b9a832ae9abc943 (diff) | |
INTEGRATION: CWS change2gtk24 (1.11.30); FILE MERGED
2004/12/09 12:55:57 obo 1.11.30.2: #i10000# fixing link problem for SOLARIS
2004/12/03 16:27:27 obo 1.11.30.1: #i37457# change to gtk-2.4
| -rwxr-xr-x | crashrep/source/unx/makefile.mk | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/crashrep/source/unx/makefile.mk b/crashrep/source/unx/makefile.mk index dcd38443fb1f..87aa703d6a7f 100755 --- a/crashrep/source/unx/makefile.mk +++ b/crashrep/source/unx/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.11 $ +# $Revision: 1.12 $ # -# last change: $Author: hjs $ $Date: 2004-06-26 03:10:27 $ +# last change: $Author: kz $ $Date: 2004-12-16 11:17:09 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -59,6 +59,9 @@ LIBSALCPPRT=$(0) # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk +PKGCONFIG_MODULES=gtk+-2.0 +.INCLUDE: pkg_config.mk + # ------------------------------------------------------------------ .IF "$(OS)"=="MACOSX" @@ -68,13 +71,11 @@ dummy: .ELSE # "$(OS)"=="MACOSX" -# Only build crash reporter if either a product build with debug info +# Only build crash reporter if either a product build with debug info # or a non-pro build is done. .IF "$(ENABLE_CRASHDUMP)" != "" || "$(PRODUCT)" == "" -CFLAGS+=`pkg-config --cflags gtk+-2.0` - SOLARLIB!:=$(SOLARLIB:s/jre/jnore/) OBJFILES=\ @@ -86,15 +87,11 @@ APP1NOSAL=TRUE APP1TARGET=$(TARGET) APP1OBJS=$(OBJFILES) -APP1STDLIBS=`pkg-config --libs gtk+-2.0` $(DYNAMIC) -lXext -lX11 -ldl -lnsl +APP1STDLIBS=$(PKGCONFIG_LIBS) +APP1STDLIBS+=$(DYNAMIC) -lXext -lX11 -ldl -lnsl .IF "$(OS)" == "SOLARIS" APP1STDLIBS+=-lsocket .ENDIF -.IF "$(OS)" == "FREEBSD" -APP1STDLIBS=`pkg-config --libs gtk+-2.0` $(DYNAMIC) -lXext -lX11 -.ENDIF - - # Build statically linked version for special builds and non-pros @@ -102,20 +99,24 @@ APP1STDLIBS=`pkg-config --libs gtk+-2.0` $(DYNAMIC) -lXext -lX11 APP2NOSAL=TRUE APP2TARGET=$(TARGET2) APP2OBJS=$(OBJFILES) - +.IF "$(OS)"=="SOLARIS" +LINKFLAGSAPP!:=$(LINKFLAGSAPP:s/-z defs/-z nodefs/) +.ENDIF # "$(OS)"=="SOLARIS" +APP2STDLIBS=$(PKGCONFIG_LIBS) +APP2STDLIBS+=$(STATIC) .IF "$(SYSTEM_ZLIB)"=="YES" -APP2STDLIBS=$(STATIC) `pkg-config --only-mod-libs --libs gtk+-2.0` -lpng $(ZLIB3RDLIB) -ljpeg -ltiff $(DYNAMIC) -lXext -lX11 -ldl -lnsl +APP2STDLIBS+=-lpng $(ZLIB3RDLIB) -ljpeg -ltiff $(DYNAMIC) -lXext -lX11 -ldl -lnsl .ELSE -APP2STDLIBS=$(STATIC) `pkg-config --only-mod-libs --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff $(DYNAMIC) -lXext -lX11 -ldl -lnsl +APP2STDLIBS+=-lpng -lzlib -ljpeg -ltiff $(DYNAMIC) -lXext -lX11 -ldl -lnsl .ENDIF .IF "$(OS)" == "SOLARIS" APP2STDLIBS+=-lsocket .ENDIF .IF "$(OS)" == "FREEBSD" .IF "$(SYSTEM_ZLIB)"=="YES" -APP2STDLIBS=$(STATIC) `pkg-config --libs gtk+-2.0` -lpng $(ZLIB3RDLIB) -ljpeg -ltiff $(DYNAMIC) -lXext -lX11 +APP2STDLIBS+=-lpng $(ZLIB3RDLIB) -ljpeg -ltiff $(DYNAMIC) -lXext -lX11 .ELSE -APP2STDLIBS=$(STATIC) `pkg-config --libs gtk+-2.0` -lpng -lzlib -ljpeg -ltiff $(DYNAMIC) -lXext -lX11 +APP2STDLIBS+=-lpng -lzlib -ljpeg -ltiff $(DYNAMIC) -lXext -lX11 .ENDIF .ENDIF |