[Libreoffice-commits] .: desktop/unx
Michael Meeks
michael at kemper.freedesktop.org
Thu Jun 9 09:45:02 PDT 2011
desktop/unx/source/makefile.mk | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
New commits:
commit 6314b7f47d3f2368401716e3799d5692bd6dcc4e
Author: Michael Meeks <michael.meeks at novell.com>
Date: Thu Jun 9 17:43:30 2011 +0100
disable splash build completely for Mac
diff --git a/desktop/unx/source/makefile.mk b/desktop/unx/source/makefile.mk
index 4a590b9..2dea54a 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
More information about the Libreoffice-commits
mailing list