blob: 383a5ba2da1e9dff13389d384381aa05696eaf62 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
|
--- packimages/pack/makefile.mk.old 2010-11-11 16:35:27.000000000 +0100
+++ packimages/pack/makefile.mk 2011-02-18 19:17:04.000000000 +0100
@@ -34,18 +34,19 @@ TARGET=packimages
RSCCUSTOMIMG*=$(PRJ)
.INCLUDE: target.mk
+IMGSRC=$(SOLARVER)
IMAGES := $(COMMONBIN)$/images.zip
SORTED_LIST=$(RES)$/img$/sorted.lst
# Custom sets, at 24x24 & 16x16 fall-back to Tango preferentially
# (Tango fallbacks to Industrial for the missing icons)
CUSTOM_IMAGE_SETS=hicontrast crystal oxygen tango classic
CUSTOM_IMAGES+=$(foreach,i,$(CUSTOM_IMAGE_SETS) images_$i)
-CUSTOM_PREFERRED_FALLBACK_1*=-c $(SOLARSRC)$/ooo_custom_images$/tango
-CUSTOM_PREFERRED_FALLBACK_2*=-c $(SOLARSRC)$/ooo_custom_images$/industrial
+CUSTOM_PREFERRED_FALLBACK_1*=-c $(IMGSRC)$/ooo_custom_images$/tango
+CUSTOM_PREFERRED_FALLBACK_2*=-c $(IMGSRC)$/ooo_custom_images$/industrial
-CRYSTAL_TARBALL=$(SOLARSRC)$/external_images$/ooo_crystal_images-1.tar.gz
-OXYGEN_TARBALL=$(SOLARSRC)$/external_images$/ooo_oxygen_images-2009-06-17.tar.gz
-CLASSIC_TARBALL=$(SOLARSRC)$/ooo_custom_images$/classic/classic_images.tar.gz
+CRYSTAL_TARBALL=$(IMGSRC)$/external_images$/ooo_crystal_images-1.tar.gz
+OXYGEN_TARBALL=$(IMGSRC)$/external_images$/ooo_oxygen_images-2009-06-17.tar.gz
+CLASSIC_TARBALL=$(IMGSRC)$/ooo_custom_images$/classic/classic_images.tar.gz
ALLTAR : $(IMAGES) $(CUSTOM_IMAGES) $(COMMONBIN)$/images_brand.zip
@@ -58,14 +59,14 @@ $(SORTED_LIST) : image-sort.lst
$(RES)$/img$/commandimagelist.ilst .PHONY : $(SORTED_LIST)
@@-$(MKDIR) $(RES)$/img
#+-$(RM) $@ $@.$(INPATH)
- $(FIND) $(SOLARSRC)$/$(RSCDEFIMG)/res/commandimagelist -name "*.png" | sed "s#$(SOLARSRC)$/$(RSCDEFIMG)/res#%GLOBALRES%#" | $(PERL) $(SOLARENV)$/bin$/sort.pl > $@.$(INPATH)
+ $(FIND) $(IMGSRC)$/$(RSCDEFIMG)/res/commandimagelist -name "*.png" | sed "s#$(IMGSRC)$/$(RSCDEFIMG)/res#%GLOBALRES%#" | $(PERL) $(SOLARENV)$/bin$/sort.pl > $@.$(INPATH)
$(PERL) $(SOLARENV)$/bin$/diffmv.pl $@.$(INPATH) $@
$(COMMONBIN)$/images.zip .PHONY: $(RES)$/img$/commandimagelist.ilst
- $(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(SOLARSRC)$/$(RSCDEFIMG) -m $(SOLARSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -l $(SOLARCOMMONRESDIR)$/img -s $(SORTED_LIST) -l $(RES)$/img -o $@
+ $(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(IMGSRC)$/$(RSCDEFIMG) -m $(IMGSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -l $(SOLARCOMMONRESDIR)$/img -s $(SORTED_LIST) -l $(RES)$/img -o $@
images_% : $(RES)$/img$/commandimagelist.ilst
- $(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(SOLARSRC)$/$(RSCDEFIMG) -m $(SOLARSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -c $(SOLARSRC)$/ooo_custom_images$/$(@:s/images_//) -c $(MISC)$/$(@:s/images_//) $(CUSTOM_PREFERRED_FALLBACK_1) $(CUSTOM_PREFERRED_FALLBACK_2) -l $(SOLARCOMMONRESDIR)$/img -l $(RES)$/img -s $(SORTED_LIST) -o $(COMMONBIN)$/$@.zip
+ $(PERL) $(SOLARENV)$/bin$/packimages.pl -g $(IMGSRC)$/$(RSCDEFIMG) -m $(IMGSRC)$/$(RSCDEFIMG) -c $(RSCCUSTOMIMG) -c $(IMGSRC)$/ooo_custom_images$/$(@:s/images_//) -c $(MISC)$/$(@:s/images_//) $(CUSTOM_PREFERRED_FALLBACK_1) $(CUSTOM_PREFERRED_FALLBACK_2) -l $(SOLARCOMMONRESDIR)$/img -l $(RES)$/img -s $(SORTED_LIST) -o $(COMMONBIN)$/$@.zip
# make sure to have one to keep packing happy
$(COMMONBIN)$/images_brand.zip:
@@ -73,7 +74,7 @@ $(COMMONBIN)$/images_brand.zip:
# generate the HiContrast icon set
$(MISC)$/hicontrast.flag .PHONY :
- $(PERL) $(SOLARENV)$/bin$/hicontrast-to-theme.pl $(SOLARSRC)$/default_images $(MISC)$/hicontrast && $(TOUCH) $@
+ $(PERL) $(SOLARENV)$/bin$/hicontrast-to-theme.pl $(IMGSRC)$/default_images $(MISC)$/hicontrast && $(TOUCH) $@
# unpack the Crystal icon set
$(MISC)$/crystal.flag : $(CRYSTAL_TARBALL)
|
