From 8f96f4f61d2c371031fb5375faeee87d8f874f7c Mon Sep 17 00:00:00 2001
From: Michael Meeks <michael.meeks@novell.com>
Date: Thu, 9 Jun 2011 17:43:30 +0100
Subject: disable splash build completely for Mac

---
 desktop/unx/source/makefile.mk | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'desktop/unx')

diff --git a/desktop/unx/source/makefile.mk b/desktop/unx/source/makefile.mk
index 4a590b9e12ee..2dea54a014b2 100755
--- a/desktop/unx/source/makefile.mk
+++ b/desktop/unx/source/makefile.mk
@@ -32,6 +32,12 @@ NO_DEFAULT_STL=TRUE
 
 .INCLUDE :  settings.mk
 
+.IF "$(OS)"=="MACOSX"
+dummy:
+    @echo "Not building oosplash.bin for Mac."
+
+.ELSE
+
 .IF "$(ENABLE_QUICKSTART_LIBPNG)"=="TRUE"
 CFLAGS+=-DENABLE_QUICKSTART_LIBPNG
 CFLAGS+=$(LIBPNG_CFLAGS)
@@ -42,13 +48,9 @@ STDLIB=
 OBJFILES= \
     $(OBJ)$/splashx.obj \
     $(OBJ)$/start.obj \
-    $(OBJ)$/args.obj
-
-.IF "$(OS)"!="MACOSX"
-OBJFILES += \
+    $(OBJ)$/args.obj \
     $(OBJ)$/pagein.obj \
     $(OBJ)$/file_image_unx.obj
-.ENDIF
 
 APP1TARGET = $(TARGET)
 APP1RPATH  = BRAND
@@ -63,6 +65,8 @@ APP1STDLIBS += $(LIBPNG_LIBS)
 APP1STDLIBS+= -lsocket
 .ENDIF
 
+.ENDIF
+
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :	target.mk
-- 
cgit