diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-08-18 14:45:10 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-08-18 14:45:10 +0000 |
| commit | 7778ade907776f81d35b952b696517fd92b75341 (patch) | |
| tree | fdedfab36cf9ee95224e0f68ac081507b6b01236 /crashrep | |
| parent | 80bee155e507385febb6d70d4715c9757f21a867 (diff) | |
INTEGRATION: CWS maccrashrep (1.18.16); FILE MERGED
2008/06/25 08:29:35 hro 1.18.16.1: #i90159# Enabled crash reporting for MacOsX
Diffstat (limited to 'crashrep')
| -rwxr-xr-x | crashrep/source/unx/makefile.mk | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/crashrep/source/unx/makefile.mk b/crashrep/source/unx/makefile.mk index 968d288e761a..54628be1f2f7 100755 --- a/crashrep/source/unx/makefile.mk +++ b/crashrep/source/unx/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.18 $ +# $Revision: 1.19 $ # # This file is part of OpenOffice.org. # @@ -45,13 +45,6 @@ LIBSALCPPRT=$(0) # ------------------------------------------------------------------ -.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. @@ -67,8 +60,10 @@ APP1TARGET=$(TARGET) APP1OBJS=$(OBJFILES) APP1RPATH=BRAND +.IF "$(OS)" != "MACOSX" APP1STDLIBS=$(DYNAMIC) -lXext -lX11 -.IF "$(OS)" != "FREEBSD" +.ENDIF +.IF "$(OS)" != "FREEBSD" && "$(OS)" != "MACOSX" APP1STDLIBS+=-ldl -lnsl .ENDIF .IF "$(OS)" == "SOLARIS" @@ -77,8 +72,6 @@ APP1STDLIBS+=-lsocket .ENDIF # "$(ENABLE_CRASHDUMP)" != "" || "$(PRODUCT)" == "" -.ENDIF # "$(OS)"=="MACOSX" - # --- Targets ------------------------------------------------------ .INCLUDE : target.mk |