summaryrefslogtreecommitdiff
path: root/desktop/source/splash
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2007-06-11 13:03:24 +0000
committerOliver Bolte <obo@openoffice.org>2007-06-11 13:03:24 +0000
commit1145f6cf5df6c80349757b8c36e6d7c72dcbbeaa (patch)
tree55c2c9be0a932559ba2f1bc5a50bb5526225304a /desktop/source/splash
parentc8d56d519d8c283d60a7a75b1395995bc5a52c3f (diff)
INTEGRATION: CWS oointroaboutbrand (1.9.214); FILE MERGED
2007/06/06 15:25:25 hjs 1.9.214.4: #i66426# comma seperated bitmaps in generated hxx 2007/04/02 14:22:28 hjs 1.9.214.3: #i66426# fix variable names 2007/03/27 10:44:04 cd 1.9.214.2: i66426# Don't use resource system to retrieve intro/about bitmap 2007/03/26 11:32:39 cd 1.9.214.1: i66426# Use more flexibel way to detect and use intro/about bitmaps
Diffstat (limited to 'desktop/source/splash')
-rw-r--r--desktop/source/splash/makefile.mk15
1 files changed, 13 insertions, 2 deletions
diff --git a/desktop/source/splash/makefile.mk b/desktop/source/splash/makefile.mk
index 6f960a15688e..c50907e817b5 100644
--- a/desktop/source/splash/makefile.mk
+++ b/desktop/source/splash/makefile.mk
@@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.9 $
+# $Revision: 1.10 $
#
-# last change: $Author: hr $ $Date: 2006-01-27 16:21:49 $
+# last change: $Author: obo $ $Date: 2007-06-11 14:03:24 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@@ -82,3 +82,14 @@ SHL1STDLIBS= \
.INCLUDE : target.mk
+$(SLO)$/splash.obj : $(INCCOM)$/introbmpnames.hxx
+
+.INCLUDE .IGNORE : $(MISC)$/intro_bmp_names.mk
+
+.IF "$(INTO_BITMAPS:f)"!="$(LASTTIME_INTRO_BITMAPS)"
+DO_PHONY=.PHONY
+.ENDIF # "$(INTRO_BITMAPS:f)"!="$(LASTTIME_INTRO_BITMAPS)"
+
+$(INCCOM)$/introbmpnames.hxx $(DO_PHONY):
+ echo const char INTRO_BITMAP_STRINGLIST[]=$(EMQ)"$(INTRO_BITMAPS:f:t",")$(EMQ)"$(EMQ); > $@
+ echo LASTTIME_INTRO_BITMAPS=$(INTRO_BITMAPS:f) > $(MISC)$/intro_bmp_names.mk