diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-08-31 00:25:58 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-08-31 23:46:24 +0200 |
| commit | b09c5286b84e712a524e3fd5ded904ba9e0f8e84 (patch) | |
| tree | ab152c735ab9e4146f45799182143eac6e98e9fd /Repository.mk | |
| parent | af5a380bc19f599307b3bc524a31c380d456249e (diff) | |
scp2: convert BINARYTABLE MSI CustomAction dlls to AutoInstall
Second attempt, this time using a new type LIBO_LIB_FILE_BINARYTABLE
in scp2/macros.inc; for the resulting MSI file Orca lists the same
files in "Binary" table now.
Change-Id: I550ede75f16a46da9dd7377594aa28b7c06f0348
Diffstat (limited to 'Repository.mk')
| -rw-r--r-- | Repository.mk | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/Repository.mk b/Repository.mk index 00e29b5a9150..d1f2db0b1b95 100644 --- a/Repository.mk +++ b/Repository.mk @@ -569,24 +569,38 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ )) ifeq ($(OS),WNT) +$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,activexbinarytable, \ + $(if $(DISABLE_ACTIVEX),,\ + regactivex \ + ) \ +)) + +$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooobinarytable, \ + $(if $(WINDOWS_SDK_HOME),\ + instooofiltmsi \ + qslnkmsi \ + reg4allmsdoc \ + sdqsmsi \ + sellangmsi \ + sn_tools \ + ) \ +)) + + +$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,winexplorerextbinarytable, \ + shlxtmsi \ +)) + $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ fop \ - instooofiltmsi \ jfregca \ ooofilt \ ooofilt_x64 \ propertyhdl \ propertyhdl_x64 \ - qslnkmsi \ - reg4allmsdoc \ - regactivex \ regpatchactivex \ - sdqsmsi \ - sellangmsi \ shlxthdl \ shlxthdl_x64 \ - shlxtmsi \ - sn_tools \ so_activex \ so_activex_x64 \ sysdtrans \ |