diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-29 14:17:28 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-30 00:01:34 +0100 |
| commit | a4d8d71c974f4660f6ee772f59e6f1474069ed3b (patch) | |
| tree | 6bcee5b7abe11a3fdee081a4643af50552ef2b19 | |
| parent | c7dd8ccea8b2fc08dd599565409be84941c41705 (diff) | |
sysui: stop delivering icons that are used from SRCDIR already
Change-Id: I0dfbc23c03f9efe7b0020f15eb7f5312da3e6a80
| -rw-r--r-- | desktop/WinResTarget_sofficebin.mk | 24 | ||||
| -rw-r--r-- | sysui/Package_icons.mk | 31 |
2 files changed, 24 insertions, 31 deletions
diff --git a/desktop/WinResTarget_sofficebin.mk b/desktop/WinResTarget_sofficebin.mk index 39cfeada1204..d194ef5acbbd 100644 --- a/desktop/WinResTarget_sofficebin.mk +++ b/desktop/WinResTarget_sofficebin.mk @@ -24,6 +24,30 @@ $(eval $(call gb_WinResTarget_add_defs,sofficebin/officeloader,\ $(eval $(call gb_WinResTarget_add_dependencies,sofficebin/officeloader,\ sysui/desktop/icons/main_app.ico \ + sysui/desktop/icons/oasis-database.ico \ + sysui/desktop/icons/oasis-drawing-template.ico \ + sysui/desktop/icons/oasis-drawing.ico \ + sysui/desktop/icons/oasis-formula.ico \ + sysui/desktop/icons/oasis-master-document.ico \ + sysui/desktop/icons/oasis-presentation-template.ico \ + sysui/desktop/icons/oasis-presentation.ico \ + sysui/desktop/icons/oasis-spreadsheet-template.ico \ + sysui/desktop/icons/oasis-spreadsheet.ico \ + sysui/desktop/icons/oasis-text-template.ico \ + sysui/desktop/icons/oasis-text.ico \ + sysui/desktop/icons/oasis-web-template.ico \ + sysui/desktop/icons/database.ico \ + sysui/desktop/icons/drawing-template.ico \ + sysui/desktop/icons/drawing.ico \ + sysui/desktop/icons/formula.ico \ + sysui/desktop/icons/master-document.ico \ + sysui/desktop/icons/presentation-template.ico \ + sysui/desktop/icons/presentation.ico \ + sysui/desktop/icons/spreadsheet-template.ico \ + sysui/desktop/icons/spreadsheet.ico \ + sysui/desktop/icons/text-template.ico \ + sysui/desktop/icons/text.ico \ + sysui/desktop/icons/oxt-extension.ico \ )) $(eval $(call gb_WinResTarget_set_rcfile,sofficebin/officeloader,desktop/util/officeloader)) diff --git a/sysui/Package_icons.mk b/sysui/Package_icons.mk index 1b1c6a2463ce..eeca0967b5f6 100644 --- a/sysui/Package_icons.mk +++ b/sysui/Package_icons.mk @@ -14,42 +14,11 @@ $(eval $(call gb_Package_set_outdir,sysui/icons,$(OUTDIR))) $(eval $(call gb_Package_add_file,sysui/icons,bin/soffice.ico,main_app.ico)) $(eval $(call gb_Package_add_files,sysui/icons,res/icons,\ - oasis-database.ico \ - oasis-drawing-template.ico \ - oasis-drawing.ico \ oasis-empty-template.ico \ oasis-empty-document.ico \ - oasis-formula.ico \ - oasis-master-document.ico \ - oasis-presentation-template.ico \ - oasis-presentation.ico \ - oasis-spreadsheet-template.ico \ - oasis-spreadsheet.ico \ - oasis-text-template.ico \ - oasis-text.ico \ - oasis-web-template.ico \ - database.ico \ - drawing-template.ico \ - drawing.ico \ empty-template.ico \ empty-document.ico \ - formula.ico \ - master-document.ico \ - presentation-template.ico \ - presentation.ico \ - spreadsheet-template.ico \ - spreadsheet.ico \ - text-template.ico \ - text.ico \ - impress_app.ico \ - calc_app.ico \ - draw_app.ico \ - base_app.ico \ - writer_app.ico \ - math_app.ico \ - main_app.ico \ open.ico \ - oxt-extension.ico \ )) # vim: set noet sw=4 ts=4: |