mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS ooo11rc2 (1.3.2); FILE MERGED

Browse Source 
2003/07/16 14:05:44 mh 1.3.2.4: resync before reintegration, resolve conflict, #i10000#
2003/07/15 16:50:00 hjs 1.3.2.3: #i10000# remove dependency to vcl
2003/07/15 09:13:03 mh 1.3.2.2: add: FREEBSD, #i16266#
2003/07/14 14:50:07 fa 1.3.2.1: Disable crashrep for OS X since we need different stack walking code.

http://www.openoffice.org/project/www/issues/show_bug.cgi?id=16678

Dan
fa@ooo
This commit is contained in:
Jens-Heiner Rechtien
2003-07-16 16:39:33 +00:00
parent 87c7cc0bb1
commit 1d70f64dda
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
crashrep/source/unx/makefile.mk
View File

@@ -2,9 +2,9 @@
# #
# $RCSfile: makefile.mk,v $ # $RCSfile: makefile.mk,v $
# #
# $Revision: 1.6 $ # $Revision: 1.7 $
# #
# last change: $Author: vg $ $Date: 2003-07-15 14:31:53 $ # last change: $Author: hr $ $Date: 2003-07-16 17:39:33 $
# #
# 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
@@ -76,6 +76,13 @@ LIBSALCPPRT=$(0)
.INCLUDE : settings.mk .INCLUDE : settings.mk
# ------------------------------------------------------------------ # ------------------------------------------------------------------
.IF "$(OS)"=="MACOSX"
dummy:
@echo "Nothing to build for OS $(OS)"
.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. # or a non-pro build is done.
@@ -100,6 +107,7 @@ APP1STDLIBS+=-lsocket
.ENDIF .ENDIF
# Build statically linked version for special builds and non-pros # Build statically linked version for special builds and non-pros
.IF "$(ENABLE_CRASHDUMP)" == "STATIC" || "$(PRODUCT)" != "FULL" .IF "$(ENABLE_CRASHDUMP)" == "STATIC" || "$(PRODUCT)" != "FULL"
@@ -117,6 +125,10 @@ APP2STDLIBS+=-lsocket
ALL: ALLTAR $(BIN)$/crash_dump.res.01 ALL: ALLTAR $(BIN)$/crash_dump.res.01
.ENDIF # "$(ENABLE_CRASHDUMP)" != "" || "$(PRODUCT)" != "FULL"
.ENDIF # "$(OS)"=="MACOSX"
# --- Targets ------------------------------------------------------ # --- Targets ------------------------------------------------------
.INCLUDE : target.mk .INCLUDE : target.mk
@@ -126,5 +138,4 @@ $(OBJ)$/main.obj: $(INCCOM)$/_version.h
$(BIN)$/crash_dump.res.01: ..$/all$/crashrep.lng $(BIN)$/crash_dump.res.01: ..$/all$/crashrep.lng
$(BIN)$/unxcrashres ..$/all$/crashrep.lng $(BIN)$/crash_dump.res $(BIN)$/unxcrashres ..$/all$/crashrep.lng $(BIN)$/crash_dump.res
.ENDIF
# Building crash_report # Building crash_report