diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-08-02 20:26:26 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-08-02 22:23:49 +0200 |
| commit | 4bab1f2dea44e54b72096eba0f5bc7a0a71c5589 (patch) | |
| tree | 392f7027d7b5b6649e15af4b79e8baba9f1fda85 /Repository.mk | |
| parent | 544fa45eadf9656f9cf55c0880eff6f5f88921a3 (diff) | |
scp2: move activex libs to AutoInstall
Change-Id: I08fac26859d97e3d7a60d3ba443c2d2ca039789b
Diffstat (limited to 'Repository.mk')
| -rw-r--r-- | Repository.mk | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/Repository.mk b/Repository.mk index 10c8f62b4393..b2030852bdb0 100644 --- a/Repository.mk +++ b/Repository.mk @@ -607,6 +607,20 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,activexbina ) \ )) +$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,activex, \ + $(if $(DISABLE_ACTIVEX),,\ + so_activex \ + ) \ +)) + +ifneq ($(BUILD_X64),) +$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,activexwin64, \ + $(if $(DISABLE_ACTIVEX),,\ + so_activex_x64 \ + ) \ +)) +endif + $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooobinarytable, \ $(if $(WINDOWS_SDK_HOME),\ instooofiltmsi \ @@ -636,8 +650,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ fop \ jfregca \ regpatchactivex \ - so_activex \ - so_activex_x64 \ thidxmsi \ )) endif |