diff options
author | Michael Stahl <mstahl@redhat.com> | 2013-10-30 16:42:30 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2013-10-31 10:42:22 +0100 |
commit | 862b9390b4fbfae37d01e06c954dd72eb9a008e1 (patch) | |
tree | ef05314b5d0d5b36a3a79245bcb7d2e08a5d0e0d /setup_native | |
parent | ded43f722664799c8bcd035289f60d37020f3c5d (diff) |
setup_native: find all static files in source/packinfo
... and move the OSX specific files there too so we don't need several
include paths.
Change-Id: I9368e12d4cf85da3795939b51540eaf7f5d0a7d3
Diffstat (limited to 'setup_native')
-rw-r--r-- | setup_native/Package_misc.mk | 4 | ||||
-rw-r--r-- | setup_native/Package_packinfo.mk | 18 | ||||
-rw-r--r-- | setup_native/source/packinfo/DS_Store (renamed from setup_native/source/mac/ooo/DS_Store) | bin | 15364 -> 15364 bytes | |||
-rw-r--r-- | setup_native/source/packinfo/DS_Store_Dev (renamed from setup_native/source/mac/ooo/DS_Store_Dev) | bin | 15364 -> 15364 bytes | |||
-rw-r--r-- | setup_native/source/packinfo/DS_Store_Langpack (renamed from setup_native/source/mac/ooo/DS_Store_Langpack) | bin | 12292 -> 12292 bytes | |||
-rw-r--r-- | setup_native/source/packinfo/osxdndinstall.png (renamed from setup_native/source/mac/ooo/osxdndinstall.png) | bin | 11442 -> 11442 bytes |
6 files changed, 0 insertions, 22 deletions
diff --git a/setup_native/Package_misc.mk b/setup_native/Package_misc.mk index d154c887e69d..e03e5ca582d5 100644 --- a/setup_native/Package_misc.mk +++ b/setup_native/Package_misc.mk @@ -11,10 +11,6 @@ $(eval $(call gb_Package_Package,setup_native/misc,$(SRCDIR)/setup_native/source $(eval $(call gb_Package_set_outdir,setup_native/misc,$(OUTDIR))) -$(eval $(call gb_Package_add_file,setup_native/misc,bin/osl/DS_Store,mac/ooo/DS_Store)) -$(eval $(call gb_Package_add_file,setup_native/misc,bin/osl/DS_Store_Dev,mac/ooo/DS_Store_Dev)) -$(eval $(call gb_Package_add_file,setup_native/misc,bin/osl/DS_Store_Langpack,mac/ooo/DS_Store_Langpack)) -$(eval $(call gb_Package_add_file,setup_native/misc,bin/osl/osxdndinstall.png,mac/ooo/osxdndinstall.png)) $(eval $(call gb_Package_add_file,setup_native/misc,bin/desktophelper.txt,win32/desktophelper.txt)) # vim: set noet sw=4 ts=4: diff --git a/setup_native/Package_packinfo.mk b/setup_native/Package_packinfo.mk index 7daaa2892a2b..72fc10bc989d 100644 --- a/setup_native/Package_packinfo.mk +++ b/setup_native/Package_packinfo.mk @@ -11,24 +11,6 @@ $(eval $(call gb_Package_Package,setup_native/packinfo,$(SRCDIR)/setup_native/so $(eval $(call gb_Package_set_outdir,setup_native/packinfo,$(OUTDIR))) -$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/solariscopyrightfile,solariscopyrightfile)) -$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/linuxcopyrightfile,linuxcopyrightfile)) -$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/libreoffice.pcp,libreoffice.pcp)) -$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/openofficelanguagepack.pcp,openofficelanguagepack.pcp)) -$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/ure.pcp,ure.pcp)) -$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/finals_instsetoo.txt,finals_instsetoo.txt)) $(eval $(call gb_Package_add_file,setup_native/packinfo,bin/package.txt,package.txt)) -$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/package_names.txt,package_names.txt)) -$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/package_names_ext.txt,package_names_ext.txt)) -$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/packinfo_accessories.txt,packinfo_accessories.txt)) -$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/packinfo_brand.txt,packinfo_brand.txt)) -$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/packinfo_extensions.txt,packinfo_extensions.txt)) -$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/packinfo_office.txt,packinfo_office.txt)) -$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/packinfo_office_help.txt,packinfo_office_help.txt)) -$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/packinfo_office_lang.txt,packinfo_office_lang.txt)) -$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/packinfo_sdkoo.txt,packinfo_sdkoo.txt)) -$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/packinfo_ure.txt,packinfo_ure.txt)) -$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/shellscripts_module.txt,shellscripts_module.txt)) -$(eval $(call gb_Package_add_file,setup_native/packinfo,bin/spellchecker_selection.txt,spellchecker_selection.txt)) # vim: set noet sw=4 ts=4: diff --git a/setup_native/source/mac/ooo/DS_Store b/setup_native/source/packinfo/DS_Store Binary files differindex fec0edc61bc5..fec0edc61bc5 100644 --- a/setup_native/source/mac/ooo/DS_Store +++ b/setup_native/source/packinfo/DS_Store diff --git a/setup_native/source/mac/ooo/DS_Store_Dev b/setup_native/source/packinfo/DS_Store_Dev Binary files differindex 2a6fcf9d71e5..2a6fcf9d71e5 100644 --- a/setup_native/source/mac/ooo/DS_Store_Dev +++ b/setup_native/source/packinfo/DS_Store_Dev diff --git a/setup_native/source/mac/ooo/DS_Store_Langpack b/setup_native/source/packinfo/DS_Store_Langpack Binary files differindex 3a8ad71a5660..3a8ad71a5660 100644 --- a/setup_native/source/mac/ooo/DS_Store_Langpack +++ b/setup_native/source/packinfo/DS_Store_Langpack diff --git a/setup_native/source/mac/ooo/osxdndinstall.png b/setup_native/source/packinfo/osxdndinstall.png Binary files differindex 1872f40e0aee..1872f40e0aee 100644 --- a/setup_native/source/mac/ooo/osxdndinstall.png +++ b/setup_native/source/packinfo/osxdndinstall.png |