summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2003-07-16 16:39:33 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2003-07-16 16:39:33 +0000
commit1d70f64dda200a428d7e46fd56e3ab6c1e8ad7bc (patch)
tree47ff6dd069d4a7b46372bd31eb4f47f80c693344
parent87c7cc0bb11466818c76d7df3e7a5620106cdac3 (diff)
INTEGRATION: CWS ooo11rc2 (1.3.2); FILE MERGED
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
-rwxr-xr-xcrashrep/source/unx/makefile.mk17
1 files changed, 14 insertions, 3 deletions
diff --git a/crashrep/source/unx/makefile.mk b/crashrep/source/unx/makefile.mk
index ee870f6017b2..4c30a4cdad20 100755
--- a/crashrep/source/unx/makefile.mk
+++ b/crashrep/source/unx/makefile.mk
@@ -2,9 +2,9 @@
#
# $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
# either of the following licenses
@@ -76,6 +76,13 @@ LIBSALCPPRT=$(0)
.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
# or a non-pro build is done.
@@ -100,6 +107,7 @@ APP1STDLIBS+=-lsocket
.ENDIF
+
# Build statically linked version for special builds and non-pros
.IF "$(ENABLE_CRASHDUMP)" == "STATIC" || "$(PRODUCT)" != "FULL"
@@ -117,6 +125,10 @@ APP2STDLIBS+=-lsocket
ALL: ALLTAR $(BIN)$/crash_dump.res.01
+.ENDIF # "$(ENABLE_CRASHDUMP)" != "" || "$(PRODUCT)" != "FULL"
+
+.ENDIF # "$(OS)"=="MACOSX"
+
# --- Targets ------------------------------------------------------
.INCLUDE : target.mk
@@ -126,5 +138,4 @@ $(OBJ)$/main.obj: $(INCCOM)$/_version.h
$(BIN)$/crash_dump.res.01: ..$/all$/crashrep.lng
$(BIN)$/unxcrashres ..$/all$/crashrep.lng $(BIN)$/crash_dump.res
-.ENDIF
# Building crash_report