diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2010-10-08 20:28:10 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2010-10-11 15:19:41 +0100 |
| commit | f5c9bf7565d232b10d57bbd464f3d349c3e941a1 (patch) | |
| tree | 6cf994d9d52bc2028082029c29b2e4393dd5e85e | |
| parent | 8a13bd6eaff89f2719e0e230f4fc7c8fb446572f (diff) | |
simplify branding packaging
| -rw-r--r-- | desktop/zipintro/makefile.mk | 85 |
1 files changed, 9 insertions, 76 deletions
diff --git a/desktop/zipintro/makefile.mk b/desktop/zipintro/makefile.mk index fef106d1e09d..224cd86e69e4 100644 --- a/desktop/zipintro/makefile.mk +++ b/desktop/zipintro/makefile.mk @@ -29,99 +29,32 @@ PRJ=.. PRJNAME=desktop TARGET=zipintro -# --- Settings ----------------------------------------------------------- .INCLUDE : settings.mk -DEFAULT_FLAVOURS=dev dev_nologo nologo broffice dev_broffice nologo_broffice nologo_dev_broffice intro +DEFAULT_FLAVOURS=brand brand_dev ZIP1LIST= \ - $(null,$(INTRO_BITMAPS) $(MISC)$/ooo_custom_images$/dev$/introabout$/intro.png $(INTRO_BITMAPS)) \ - $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/about.png $(ABOUT_BITMAPS)) + $(null,$(INTRO_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand$/intro.png $(INTRO_BITMAPS)) \ + $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand$/about.png $(ABOUT_BITMAPS)) ZIP2LIST= \ - $(null,$(INTRO_BITMAPS) $(MISC)$/ooo_custom_images$/dev_nologo$/introabout$/intro.png $(INTRO_BITMAPS)) \ - $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/about.png $(ABOUT_BITMAPS)) -ZIP3LIST= \ - $(null,$(INTRO_BITMAPS) $(MISC)$/ooo_custom_images$/nologo$/introabout$/intro.png $(INTRO_BITMAPS)) \ - $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/about.png $(ABOUT_BITMAPS)) -ZIP4LIST= \ - $(null,$(INTRO_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/intro.png $(INTRO_BITMAPS)) \ - $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/introabout$/about.png $(ABOUT_BITMAPS)) -ZIP5LIST= \ - $(null,$(INTRO_BITMAPS) $(MISC)$/ooo_custom_images$/dev_broffice$/introabout$/intro.png $(INTRO_BITMAPS)) \ - $(null,$(ABOUT_BITMAPS) $(MISC)$/ooo_custom_images$/broffice$/introabout$/about.png $(ABOUT_BITMAPS)) -ZIP6LIST= \ - $(null,$(INTRO_BITMAPS) $(MISC)$/ooo_custom_images$/broffice$/introabout$/intro.png $(INTRO_BITMAPS)) \ - $(null,$(ABOUT_BITMAPS) $(MISC)$/ooo_custom_images$/broffice$/introabout$/about.png $(ABOUT_BITMAPS)) -ZIP7LIST= \ - $(null,$(INTRO_BITMAPS) $(MISC)$/ooo_custom_images$/nologo_broffice$/introabout$/intro.png $(INTRO_BITMAPS)) \ - $(null,$(ABOUT_BITMAPS) $(MISC)$/ooo_custom_images$/broffice$/introabout$/about.png $(ABOUT_BITMAPS)) -ZIP8LIST= \ - $(null,$(INTRO_BITMAPS) $(MISC)$/ooo_custom_images$/dev_nologo_broffice$/introabout$/intro.png $(INTRO_BITMAPS)) \ - $(null,$(ABOUT_BITMAPS) $(MISC)$/ooo_custom_images$/broffice$/introabout$/about.png $(ABOUT_BITMAPS)) + $(null,$(INTRO_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand_dev$/intro.png $(INTRO_BITMAPS)) \ + $(null,$(ABOUT_BITMAPS) $(MISC)$/$(RSCDEFIMG)$/brand_dev$/about.png $(ABOUT_BITMAPS)) -ZIP1TARGET=dev_intro +ZIP1TARGET=brand ZIP1DEPS=$(ZIP1LIST) - -ZIP2TARGET=dev_nologo_intro +ZIP2TARGET=brand_dev ZIP2DEPS=$(ZIP2LIST) -ZIP3TARGET=nologo_intro -ZIP3DEPS=$(ZIP3LIST) - -ZIP4TARGET=intro_intro -ZIP4DEPS=$(ZIP4LIST) - -ZIP5TARGET=dev_broffice_intro -ZIP5DEPS=$(ZIP5LIST) - -ZIP6TARGET=broffice_intro -ZIP6DEPS=$(ZIP6LIST) - -ZIP7TARGET=nologo_broffice_intro -ZIP7DEPS=$(ZIP7LIST) - -ZIP8TARGET=nologo_dev_broffice_intro -ZIP8DEPS=$(ZIP8LIST) - .INCLUDE : target.mk ALLTAR : $(foreach,i,$(DEFAULT_FLAVOURS) $(COMMONBIN)$/$i$/intro.zip) -# now duplicate for deliver... -# Because of issue 78837 we cannot use a % rule here (Commented out below) -# but have to write individual rules. -#$(COMMONBIN)$/%$/intro.zip : $(COMMONBIN)$/%_intro.zip - -$(COMMONBIN)$/dev$/intro.zip : $(COMMONBIN)$/dev_intro.zip - @@-$(MKDIR) $(@:d) - @$(COPY) $< $@ - -$(COMMONBIN)$/dev_nologo$/intro.zip : $(COMMONBIN)$/dev_nologo_intro.zip - @@-$(MKDIR) $(@:d) - @$(COPY) $< $@ - -$(COMMONBIN)$/nologo$/intro.zip : $(COMMONBIN)$/nologo_intro.zip - @@-$(MKDIR) $(@:d) - @$(COPY) $< $@ - -$(COMMONBIN)$/broffice$/intro.zip : $(COMMONBIN)$/broffice_intro.zip +$(COMMONBIN)$/brand_dev$/intro.zip : $(COMMONBIN)$/brand_dev.zip @@-$(MKDIR) $(@:d) @$(COPY) $< $@ -$(COMMONBIN)$/dev_broffice$/intro.zip : $(COMMONBIN)$/dev_broffice_intro.zip - @@-$(MKDIR) $(@:d) - @$(COPY) $< $@ - -$(COMMONBIN)$/nologo_broffice$/intro.zip : $(COMMONBIN)$/nologo_broffice_intro.zip - @@-$(MKDIR) $(@:d) - @$(COPY) $< $@ - -$(COMMONBIN)$/nologo_dev_broffice$/intro.zip : $(COMMONBIN)$/nologo_dev_broffice_intro.zip - @@-$(MKDIR) $(@:d) - @$(COPY) $< $@ - -$(COMMONBIN)$/intro$/intro.zip : $(COMMONBIN)$/intro_intro.zip +$(COMMONBIN)$/brand$/intro.zip : $(COMMONBIN)$/brand.zip @@-$(MKDIR) $(@:d) @$(COPY) $< $@ |