diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-06-25 12:27:04 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-06-25 12:46:17 +0200 |
| commit | f0de66d9a541505e14261ffac08e021bce6b67ba (patch) | |
| tree | 98cae733fd0b6787947e3beb9832c0e5ca5fcdf4 | |
| parent | 463e59d680467a7b0d30ae956935a444c513de9e (diff) | |
fdo#51115: fix sdext extensions on Windows:
The sdext extensions contain the .lib link stub instead of DLLs;
add gb_Extension_add_library to get the correct DLL filename on Windows,
and use it in presenter screen, presentation minimizer and
PDF import extensions.
Change-Id: Ie8113a6002f9038e4df798edc255208977ba9497
| -rw-r--r-- | sdext/Extension_minimizer.mk | 4 | ||||
| -rw-r--r-- | sdext/Extension_pdfimport.mk | 5 | ||||
| -rw-r--r-- | sdext/Extension_presenter.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/Extension.mk | 10 |
4 files changed, 18 insertions, 5 deletions
diff --git a/sdext/Extension_minimizer.mk b/sdext/Extension_minimizer.mk index 400c2902bbb2..2e4d1ff27b86 100644 --- a/sdext/Extension_minimizer.mk +++ b/sdext/Extension_minimizer.mk @@ -31,8 +31,8 @@ $(eval $(call gb_Extension_Extension,presentation-minimizer,sdext/source/minimiz $(eval $(call gb_Extension_set_platform,presentation-minimizer,$(sdext_PLATFORM))) -$(eval $(call gb_Extension_add_files,presentation-minimizer,,\ - $(call gb_Library_get_target,SunPresentationMinimizer) \ +$(eval $(call gb_Extension_add_libraries,presentation-minimizer,\ + SunPresentationMinimizer \ )) $(eval $(call gb_Extension_add_file,presentation-minimizer,components.rdb,$(call gb_Rdb_get_target,minimizer))) diff --git a/sdext/Extension_pdfimport.mk b/sdext/Extension_pdfimport.mk index 0ecdff1630d2..27841f558f62 100644 --- a/sdext/Extension_pdfimport.mk +++ b/sdext/Extension_pdfimport.mk @@ -33,9 +33,12 @@ $(eval $(call gb_Extension_set_platform,pdfimport,$(sdext_PLATFORM))) $(eval $(call gb_Extension_add_file,pdfimport,components.rdb,$(call gb_Rdb_get_target,pdfimport))) +$(eval $(call gb_Extension_add_libraries,pdfimport,\ + pdfimport \ +)) + $(eval $(call gb_Extension_add_files,pdfimport,,\ $(call gb_Executable_get_target,xpdfimport) \ - $(call gb_Library_get_target,pdfimport) \ $(SRCDIR)/sdext/source/pdfimport/config/pdf_import_filter.xcu \ $(SRCDIR)/sdext/source/pdfimport/config/pdf_types.xcu \ $(SRCDIR)/sdext/source/pdfimport/dialogs/xpdfimport_err.pdf \ diff --git a/sdext/Extension_presenter.mk b/sdext/Extension_presenter.mk index 1311310d2c39..2a83712f3285 100644 --- a/sdext/Extension_presenter.mk +++ b/sdext/Extension_presenter.mk @@ -31,8 +31,8 @@ $(eval $(call gb_Extension_Extension,presenter-screen,sdext/source/presenter)) $(eval $(call gb_Extension_set_platform,presenter-screen,$(sdext_PLATFORM))) -$(eval $(call gb_Extension_add_files,presenter-screen,,\ - $(call gb_Library_get_target,PresenterScreen) \ +$(eval $(call gb_Extension_add_libraries,presenter-screen,\ + PresenterScreen \ )) $(eval $(call gb_Extension_add_file,presenter-screen,components.rdb,$(call gb_Rdb_get_target,presenter))) diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index 583a9a77569f..a959a8f34eed 100644 --- a/solenv/gbuild/Extension.mk +++ b/solenv/gbuild/Extension.mk @@ -156,6 +156,16 @@ $(foreach file,$(3),$(call gb_Extension_add_file,$(1),$(if $(strip $(2)),$(strip endef +# add a library from the solver; DO NOT use gb_Library_get_target +define gb_Extension_add_library +$(call gb_Extension_add_file,$(1),$(call gb_Library_get_runtime_filename,$(2)),\ + $(gb_Helper_OUTDIRLIBDIR)/$(call gb_Library_get_runtime_filename,$(2))) +endef + +define gb_Extension_add_libraries +$(foreach lib,$(2),$(call gb_Extension_add_library,$(1),$(lib))) +endef + # localize .properties file # source file is copied to $(WORKDIR) define gb_Extension_localize_properties |