summaryrefslogtreecommitdiff
path: root/scp2/macros/makefile.mk
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2008-03-18 12:23:33 +0000
committerVladimir Glazounov <vg@openoffice.org>2008-03-18 12:23:33 +0000
commit65611adcb2f1f4acfa934794f505aceec7ebceec (patch)
treebe4d3b349a435f0a6a6f9aa1a9f5ad2c2ae55ca0 /scp2/macros/makefile.mk
parent476ea8100eedce3a93ed6ec5b0f6c6b38df2e6f5 (diff)
INTEGRATION: CWS sb83 (1.11.2); FILE MERGED
2008/02/06 14:06:05 sb 1.11.2.2: #i84200# streamlined image set processing 2008/01/29 16:00:16 sb 1.11.2.1: #i85112# merged in cws_src680_native121
Diffstat (limited to 'scp2/macros/makefile.mk')
-rw-r--r--scp2/macros/makefile.mk14
1 files changed, 3 insertions, 11 deletions
diff --git a/scp2/macros/makefile.mk b/scp2/macros/makefile.mk
index a683b09d5f47..359f1b403aea 100644
--- a/scp2/macros/makefile.mk
+++ b/scp2/macros/makefile.mk
@@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.11 $
+# $Revision: 1.12 $
#
-# last change: $Author: obo $ $Date: 2008-01-04 17:06:09 $
+# last change: $Author: vg $ $Date: 2008-03-18 13:23:33 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@@ -48,18 +48,10 @@ TARGET=macros
COMPLETELANGISO_VAR:=$(uniq $(completelangiso) $(alllangiso))
.EXPORT : COMPLETELANGISO_VAR
-# used here to force expanding before export
-CUSTOM_IMAGE_SETS!:=$(CUSTOM_IMAGE_SETS)
-.EXPORT : CUSTOM_IMAGE_SETS
-
-ALLTAR : $(INCCOM)$/langmacros.inc $(INCCOM)$/images.inc
+ALLTAR : $(INCCOM)$/langmacros.inc
.PHONY $(INCCOM)$/langmacros.inc:
@echo ------------------------------
@echo Making: $@
@@-$(RENAME) $@ $@.tmp
$(PERL) macro.pl -o $@.tmp && $(RENAME:s/+//) $@.tmp $@
-
-.PHONY $(INCCOM)$/images.inc:
- @@-$(RENAME) $@ $@.tmp
- $(PERL) -w images.pl -o $@.tmp && $(RENAME:s/+//) $@.tmp $@