[Libreoffice-commits] .: desktop/unx desktop/zipintro

[Michael Meeks]

 desktop/unx/source/makefile.mk |    4 +++-
 desktop/unx/source/start.c     |    2 +-
 desktop/zipintro/makefile.mk   |   20 +++++++++++++-------
 3 files changed, 17 insertions(+), 9 deletions(-)

New commits:
commit 0425269accf7f2891e0430ade82260431d1ec53c
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Tue Oct 12 16:26:07 2010 +0100

    Enable unx quickstart, and broffice flags

diff --git a/desktop/unx/source/makefile.mk b/desktop/unx/source/makefile.mk
index bd8eb75..494477a 100644
--- a/desktop/unx/source/makefile.mk
+++ b/desktop/unx/source/makefile.mk
@@ -41,6 +41,8 @@ dummy:
 
 STDLIB=
 
+CFLAGS+=$(LIBPNG_CFLAGS)
+
 OBJFILES= \
     $(OBJ)$/splashx.obj \
     $(OBJ)$/start.obj
@@ -50,7 +52,7 @@ APP1RPATH  = BRAND
 APP1OBJS   = $(OBJFILES)
 APP1LIBSALCPPRT=
 APP1CODETYPE = C
-APP1STDLIBS = $(SALLIB) -lX11 `pkg-config --libs libpng`
+APP1STDLIBS = $(SALLIB) -lX11 $(LIBPNG_LIBS)
 .IF "$(OS)"=="SOLARIS"
 APP1STDLIBS+= -lsocket
 .ENDIF
diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c
index fe94e90..450d63c 100644
--- a/desktop/unx/source/start.c
+++ b/desktop/unx/source/start.c
@@ -55,7 +55,7 @@
  */
 #define QSEND_AND_REPORT "-qsend-and-report"
 
-#define IMG_SUFFIX	     ".bmp"
+#define IMG_SUFFIX	     ".png"
 #define PIPEDEFAULTPATH      "/tmp"
 #define PIPEALTERNATEPATH    "/var/tmp"
 
diff --git a/desktop/zipintro/makefile.mk b/desktop/zipintro/makefile.mk
index 73bc37f..b2d089e 100644
--- a/desktop/zipintro/makefile.mk
+++ b/desktop/zipintro/makefile.mk
@@ -34,22 +34,28 @@ TARGET=zipintro
 
 ZIP1LIST= \
     $(null,$(INTRO_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand$/intro.png $(INTRO_BITMAPS)) \
-    $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand$/about.png $(ABOUT_BITMAPS)) \
-    $(MISC)$/$(RSCDEFIMG)$/brand$/intro-pt_BR.png  \
-    $(MISC)$/$(RSCDEFIMG)$/brand$/about-pt_BR.png
+    $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand$/about.png $(ABOUT_BITMAPS))
 ZIP2LIST= \
     $(null,$(INTRO_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand_dev$/intro.png $(INTRO_BITMAPS)) \
-    $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand_dev$/about.png $(ABOUT_BITMAPS)) \
-    $(MISC)$/$(RSCDEFIMG)$/brand_dev$/intro-pt_BR.png  \
-    $(MISC)$/$(RSCDEFIMG)$/brand_dev$/about-pt_BR.png
+    $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand_dev$/about.png $(ABOUT_BITMAPS))
 ZIP3LIST= \
     $(MISC)$/$(RSCDEFIMG)$/brand$/shell$/backing_left.png \
     $(MISC)$/$(RSCDEFIMG)$/brand$/shell$/backing_right.png \
     $(MISC)$/$(RSCDEFIMG)$/brand$/shell$/backing_space.png \
     $(MISC)$/$(RSCDEFIMG)$/brand$/shell$/backing_rtl_left.png \
-    $(MISC)$/$(RSCDEFIMG)$/brand$/shell$/backing_rtl_right.png \
+    $(MISC)$/$(RSCDEFIMG)$/brand$/shell$/backing_rtl_right.png
+
+.IF "$(ENABLE_BROFFICE)"=="TRUE"
+ZIP1LIST+= \
+    $(MISC)$/$(RSCDEFIMG)$/brand$/intro-pt_BR.png  \
+    $(MISC)$/$(RSCDEFIMG)$/brand$/about-pt_BR.png
+ZIP2LIST+= \
+    $(MISC)$/$(RSCDEFIMG)$/brand_dev$/intro-pt_BR.png  \
+    $(MISC)$/$(RSCDEFIMG)$/brand_dev$/about-pt_BR.png
+ZIP3LIST+= \
     $(MISC)$/$(RSCDEFIMG)$/brand$/shell$/backing_left-pt_BR.png \
     $(MISC)$/$(RSCDEFIMG)$/brand$/shell$/backing_right-pt_BR.png
+.ENDIF # ENABLE_BROFFICE
 
 ZIP1TARGET=brand
 ZIP1DEPS=$(ZIP1LIST)